ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-24 07:06:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Yet more UI work.

Browse Source
This commit is contained in:
Adam Ierymenko 2013-12-19 18:15:34 -08:00
parent 704ee6f6c7
commit 434a2f7071
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ZeroTierUI/mainwindow.ui
View File

@ -41,13 +41,12 @@
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QListWidget#networkListWidget { <string notr="true">QListWidget#networkListWidget {
background-color: rgba(0,0,0,33); background-color: transparent;
} }
QListWidget#networkListWidget::Item { QListWidget#networkListWidget::Item {
background-color: palette(base); background-color: palette(base);
padding: 0; border: 0;
margin: 0 0 0.25em 0;
}</string> }</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
@ -69,7 +68,7 @@ QListWidget#networkListWidget::Item {
<enum>QAbstractItemView::ScrollPerPixel</enum> <enum>QAbstractItemView::ScrollPerPixel</enum>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>0</number> <number>2</number>
</property> </property>
<property name="uniformItemSizes"> <property name="uniformItemSizes">
<bool>true</bool> <bool>true</bool>
@ -118,6 +117,7 @@ QListWidget#networkListWidget::Item {
border: 0; border: 0;
text-align: left; text-align: left;
padding: 0 5px 0 5px; padding: 0 5px 0 5px;
margin: 0;
background-color: transparent; background-color: transparent;
} }
@ -159,7 +159,9 @@ s</string>
<string>Your network connection status.</string> <string>Your network connection status.</string>
</property> </property>
<property name="styleSheet"> <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>
<property name="text"> <property name="text">
<string>STATUS, etc.</string> <string>STATUS, etc.</string>
@ -221,15 +223,15 @@ s</string>
padding: 0 0.8em 0 0.8em; padding: 0 0.8em 0 0.8em;
margin: 0; margin: 0;
border: 0; border: 0;
background: transparent; background-color: rgba(0,0,0,25);
} }
QPushButton:focus { QPushButton:focus {
background-color: rgba(0,0,0,25); background-color: rgba(0,0,0,33);
} }
QPushButton:hover { QPushButton:hover {
background-color: rgba(0,0,0,25); background-color: rgba(0,0,0,33);
} }
QPushButton:pressed { QPushButton:pressed {

4
ZeroTierUI/networkwidget.cpp
View File

@ -44,9 +44,11 @@ void NetworkWidget::setStatus(const std::string &status,const std::string &age)
void NetworkWidget::setNetworkName(const std::string &name) void NetworkWidget::setNetworkName(const std::string &name)
{ {
if (name == "?") { if (name == "?") {
ui->nameLabel->setText((QString("( ")+this->networkId().c_str())+" )"); ui->nameLabel->setText("... waiting ...");
ui->nameLabel->setEnabled(false);
} else { } else {
ui->nameLabel->setText(QString(name.c_str())); ui->nameLabel->setText(QString(name.c_str()));
ui->nameLabel->setEnabled(true);
} }
} }

31
ZeroTierUI/networkwidget.ui
View File

@ -27,13 +27,13 @@
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>5</number> <number>2</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>5</number> <number>2</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
@ -137,7 +137,7 @@
<item row="2" column="1"> <item row="2" column="1">
<widget class="QPushButton" name="networkIdPushButton"> <widget class="QPushButton" name="networkIdPushButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -145,6 +145,7 @@
<property name="font"> <property name="font">
<font> <font>
<family>Courier</family> <family>Courier</family>
<pointsize>14</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
@ -158,6 +159,7 @@
padding: 0; padding: 0;
margin: 0; margin: 0;
text-align: left; text-align: left;
vertical-align: middle;
background-color: transparent; background-color: transparent;
} }
@ -379,7 +381,6 @@ QPushButton:pressed {
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>12</pointsize>
<underline>false</underline> <underline>false</underline>
</font> </font>
</property> </property>
@ -396,6 +397,12 @@ QPushButton:pressed {
</item> </item>
<item> <item>
<widget class="QListWidget" name="ipListWidget"> <widget class="QListWidget" name="ipListWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -480,29 +487,23 @@ QListWidget:hover {
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="statusTip"> <property name="statusTip">
<string>Leave this network.</string> <string>Leave this network.</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QPushButton { <string notr="true">QPushButton {
border: 0;
padding: 0.25em; padding: 0.25em;
margin: 0; border: 0;
text-align: right; margin: 2px 0 2px 0;
background-color: transparent; background-color: rgba(0,0,0,25);
} }
QPushButton:focus { QPushButton:focus {
background-color: rgba(0,0,0,25); background-color: rgba(0,0,0,33);
} }
QPushButton:hover { QPushButton:hover {
background-color: rgba(0,0,0,25); background-color: rgba(0,0,0,33);
} }
QPushButton:pressed { QPushButton:pressed {