Some UI appearance improvements.

5 files changed, 12 insertions, 42 deletions

diff --git a/ZeroTierUI/aboutwindow.cpp b/ZeroTierUI/aboutwindow.cpp
index 1a2b2290..b5e9454f 100644
--- a/ZeroTierUI/aboutwindow.cpp
+++ b/ZeroTierUI/aboutwindow.cpp
@@ -9,23 +9,9 @@ AboutWindow::AboutWindow(QWidget *parent) :
 	ui(new Ui::AboutWindow)
 {
 	ui->setupUi(this);
-#ifndef __APPLE__
-	ui->uninstallButton->hide();
-#endif
 }
 
 AboutWindow::~AboutWindow()
 {
 	delete ui;
 }
-
-void AboutWindow::on_uninstallButton_clicked()
-{
-	// Apple only... other OSes have more intrinsic mechanisms for uninstalling.
-	QMessageBox::information(
-				this,
-				"Uninstalling ZeroTier One",
-				QString("Uninstalling ZeroTier One is easy!\n\nJust remove ZeroTier One from your Applications folder and the service will automatically shut down within a few seconds. Then, on your next reboot, all other support files will be automatically deleted.\n\nIf you wish to uninstall the service and support files now, you can run the 'uninstall.sh' script found in ") + ZeroTier::ZT_DEFAULTS.defaultHomePath.c_str() + " using the 'sudo' command in a terminal.",
-				QMessageBox::Ok,
-				QMessageBox::NoButton);
-}
diff --git a/ZeroTierUI/aboutwindow.h b/ZeroTierUI/aboutwindow.h
index 6c883b9b..93845a04 100644
--- a/ZeroTierUI/aboutwindow.h
+++ b/ZeroTierUI/aboutwindow.h
@@ -15,9 +15,6 @@ public:
 	explicit AboutWindow(QWidget *parent = 0);
 	virtual ~AboutWindow();
 
-private slots:
-	void on_uninstallButton_clicked();
-
 private:
 	Ui::AboutWindow *ui;
 };
diff --git a/ZeroTierUI/aboutwindow.ui b/ZeroTierUI/aboutwindow.ui
index 84aab434..ae758558 100644
--- a/ZeroTierUI/aboutwindow.ui
+++ b/ZeroTierUI/aboutwindow.ui
@@ -197,16 +197,6 @@ Version: 1.0</string>
               </property>
              </spacer>
             </item>
-            <item>
-             <widget class="QPushButton" name="uninstallButton">
-              <property name="text">
-               <string>Uninstall</string>
-              </property>
-              <property name="autoDefault">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
            </layout>
           </widget>
          </item>
diff --git a/ZeroTierUI/mainwindow.ui b/ZeroTierUI/mainwindow.ui
index c5103624..cbd240a2 100644
--- a/ZeroTierUI/mainwindow.ui
+++ b/ZeroTierUI/mainwindow.ui
@@ -39,6 +39,9 @@
       <property name="focusPolicy">
        <enum>Qt::NoFocus</enum>
       </property>
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
       <property name="horizontalScrollBarPolicy">
        <enum>Qt::ScrollBarAlwaysOff</enum>
       </property>
@@ -48,14 +51,11 @@
       <property name="editTriggers">
        <set>QAbstractItemView::NoEditTriggers</set>
       </property>
-      <property name="alternatingRowColors">
-       <bool>true</bool>
-      </property>
       <property name="selectionMode">
-       <enum>QAbstractItemView::NoSelection</enum>
+       <enum>QAbstractItemView::SingleSelection</enum>
       </property>
       <property name="selectionBehavior">
-       <enum>QAbstractItemView::SelectRows</enum>
+       <enum>QAbstractItemView::SelectItems</enum>
       </property>
       <property name="verticalScrollMode">
        <enum>QAbstractItemView::ScrollPerPixel</enum>
@@ -134,8 +134,11 @@
          <property name="toolTip">
           <string>Enter Hexadecimal Network ID</string>
          </property>
+         <property name="maxLength">
+          <number>16</number>
+         </property>
          <property name="frame">
-          <bool>true</bool>
+          <bool>false</bool>
          </property>
          <property name="placeholderText">
           <string>(Numeric ID of Network to Join)</string>
@@ -162,12 +165,6 @@
          <property name="toolTip">
           <string>Join Network</string>
          </property>
-         <property name="autoFillBackground">
-          <bool>false</bool>
-         </property>
-         <property name="styleSheet">
-          <string notr="true"/>
-         </property>
          <property name="text">
           <string>Join</string>
          </property>
diff --git a/ZeroTierUI/networkwidget.ui b/ZeroTierUI/networkwidget.ui
index 9d0df100..f515f2d8 100644
--- a/ZeroTierUI/networkwidget.ui
+++ b/ZeroTierUI/networkwidget.ui
@@ -19,9 +19,6 @@
   <property name="windowTitle">
    <string>Network</string>
   </property>
-  <property name="styleSheet">
-   <string notr="true"/>
-  </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <property name="spacing">
     <number>6</number>
@@ -341,6 +338,9 @@
         <property name="toolTip">
          <string>Double-click to Copy IP Address to Clipboard.</string>
         </property>
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
         <property name="editTriggers">
          <set>QAbstractItemView::NoEditTriggers</set>
         </property>