From 434a2f70710542cee07ead4f0add518edc08abf8 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Thu, 19 Dec 2013 18:15:34 -0800
Subject: [PATCH] Yet more UI work.

---
 ZeroTierUI/mainwindow.ui     | 18 ++++++++++--------
 ZeroTierUI/networkwidget.cpp |  4 +++-
 ZeroTierUI/networkwidget.ui  | 31 ++++++++++++++++---------------
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/ZeroTierUI/mainwindow.ui b/ZeroTierUI/mainwindow.ui
index 197f9bdb9..5bfd01b3f 100644
--- a/ZeroTierUI/mainwindow.ui
+++ b/ZeroTierUI/mainwindow.ui
@@ -41,13 +41,12 @@
       </property>
       <property name="styleSheet">
        <string notr="true">QListWidget#networkListWidget {
-	background-color: rgba(0,0,0,33);
+	background-color: transparent;
 }
 
 QListWidget#networkListWidget::Item {
 	background-color: palette(base);
-	padding: 0;
-	margin: 0 0 0.25em 0;
+	border: 0;
 }</string>
       </property>
       <property name="frameShape">
@@ -69,7 +68,7 @@ QListWidget#networkListWidget::Item {
        <enum>QAbstractItemView::ScrollPerPixel</enum>
       </property>
       <property name="spacing">
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="uniformItemSizes">
        <bool>true</bool>
@@ -118,6 +117,7 @@ QListWidget#networkListWidget::Item {
 	border: 0;
 	text-align: left;
 	padding: 0 5px 0 5px;
+	margin: 0;
 	background-color: transparent;
 }
 
@@ -159,7 +159,9 @@ s</string>
           <string>Your network connection status.</string>
          </property>
          <property name="styleSheet">
-          <string notr="true">padding: 0 0.75em 0 0.75em;</string>
+          <string notr="true">padding: 0 0.75em 0 0.75em;
+margin: 0 4px 0 0;
+</string>
          </property>
          <property name="text">
           <string>STATUS, etc.</string>
@@ -221,15 +223,15 @@ s</string>
 	padding: 0 0.8em 0 0.8em;
 	margin: 0;
 	border: 0;
-	background: transparent;
+	background-color: rgba(0,0,0,25);
 }
 
 QPushButton:focus {
-	background-color: rgba(0,0,0,25);
+	background-color: rgba(0,0,0,33);
 }
 
 QPushButton:hover {
-	background-color: rgba(0,0,0,25);
+	background-color: rgba(0,0,0,33);
 }
 
 QPushButton:pressed {
diff --git a/ZeroTierUI/networkwidget.cpp b/ZeroTierUI/networkwidget.cpp
index 2bbd23f74..ce182c114 100644
--- a/ZeroTierUI/networkwidget.cpp
+++ b/ZeroTierUI/networkwidget.cpp
@@ -44,9 +44,11 @@ void NetworkWidget::setStatus(const std::string &status,const std::string &age)
 void NetworkWidget::setNetworkName(const std::string &name)
 {
 	if (name == "?") {
-		ui->nameLabel->setText((QString("( ")+this->networkId().c_str())+" )");
+		ui->nameLabel->setText("... waiting ...");
+		ui->nameLabel->setEnabled(false);
 	} else {
 		ui->nameLabel->setText(QString(name.c_str()));
+		ui->nameLabel->setEnabled(true);
 	}
 }
 
diff --git a/ZeroTierUI/networkwidget.ui b/ZeroTierUI/networkwidget.ui
index 52cb95790..a23f25b4d 100644
--- a/ZeroTierUI/networkwidget.ui
+++ b/ZeroTierUI/networkwidget.ui
@@ -27,13 +27,13 @@
     <number>0</number>
    </property>
    <property name="leftMargin">
-    <number>5</number>
+    <number>2</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
-    <number>5</number>
+    <number>2</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
@@ -137,7 +137,7 @@
          <item row="2" column="1">
           <widget class="QPushButton" name="networkIdPushButton">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -145,6 +145,7 @@
            <property name="font">
             <font>
              <family>Courier</family>
+             <pointsize>14</pointsize>
              <weight>75</weight>
              <bold>true</bold>
             </font>
@@ -158,6 +159,7 @@
 	padding: 0;
 	margin: 0;
 	text-align: left;
+	vertical-align: middle;
 	background-color: transparent;
 }
 
@@ -379,7 +381,6 @@ QPushButton:pressed {
         </property>
         <property name="font">
          <font>
-          <pointsize>12</pointsize>
           <underline>false</underline>
          </font>
         </property>
@@ -396,6 +397,12 @@ QPushButton:pressed {
       </item>
       <item>
        <widget class="QListWidget" name="ipListWidget">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -480,29 +487,23 @@ QListWidget:hover {
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="font">
-            <font>
-             <pointsize>12</pointsize>
-            </font>
-           </property>
            <property name="statusTip">
             <string>Leave this network.</string>
            </property>
            <property name="styleSheet">
             <string notr="true">QPushButton {
-	border: 0;
 	padding: 0.25em;
-	margin: 0;
-	text-align: right;
-	background-color: transparent;
+	border: 0;
+	margin: 2px 0 2px 0;
+	background-color: rgba(0,0,0,25);
 }
 
 QPushButton:focus {
-	background-color: rgba(0,0,0,25);
+	background-color: rgba(0,0,0,33);
 }
 
 QPushButton:hover {
-	background-color: rgba(0,0,0,25);
+	background-color: rgba(0,0,0,33);
 }
 
 QPushButton:pressed {