diff options
| -rwxr-xr-x | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.linux | 3 | ||||
| -rw-r--r-- | Makefile.mac | 3 | ||||
| -rw-r--r-- | ZeroTierUI/mainwindow.ui | 182 | ||||
| -rw-r--r-- | ZeroTierUI/resources.qrc | 6 | ||||
| -rw-r--r-- | ZeroTierUI/zt1icon.png | bin | 0 -> 44700 bytes |
6 files changed, 173 insertions, 22 deletions
@@ -1,4 +1,5 @@ /zerotier-* +/build-ZeroTierUI-* /ZeroTierUI/*.user /Makefile *.o diff --git a/Makefile.linux b/Makefile.linux index 83953ac1..10036118 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -42,7 +42,6 @@ installer: one FORCE ./buildinstaller.sh clean: - rm -f $(OBJS) file2lz4c zerotier-* zt1-*-install - rm -rf installer-build + rm -rf $(OBJS) file2lz4c zerotier-* zt1-*-install installer-build build-ZeroTierUI-* FORCE: diff --git a/Makefile.mac b/Makefile.mac index 5b3f1b7a..23c59a89 100644 --- a/Makefile.mac +++ b/Makefile.mac @@ -41,7 +41,6 @@ file2lz4c: ext/lz4/lz4hc.o FORCE $(CXX) $(CXXFLAGS) -o file2lz4c file2lz4c.cpp node/Utils.cpp node/Salsa20.cpp ext/lz4/lz4hc.o clean: - rm -rf *.dSYM - rm -f $(OBJS) file2lz4c zerotier-* + rm -rf *.dSYM build-ZeroTierUI-* $(OBJS) file2lz4c zerotier-* FORCE: diff --git a/ZeroTierUI/mainwindow.ui b/ZeroTierUI/mainwindow.ui index 60fa1f82..d7a654fd 100644 --- a/ZeroTierUI/mainwindow.ui +++ b/ZeroTierUI/mainwindow.ui @@ -13,23 +13,148 @@ <property name="windowTitle"> <string>ZeroTier One</string> </property> + <property name="windowIcon"> + <iconset resource="resources.qrc"> + <normaloff>:/img/zt1icon.png</normaloff>:/img/zt1icon.png</iconset> + </property> <widget class="QWidget" name="centralWidget"> <layout class="QVBoxLayout" name="verticalLayout"> <property name="leftMargin"> - <number>0</number> + <number>6</number> </property> <property name="topMargin"> - <number>0</number> + <number>6</number> </property> <property name="rightMargin"> - <number>0</number> + <number>6</number> </property> <property name="bottomMargin"> - <number>0</number> + <number>6</number> </property> + <item> + <widget class="QScrollArea" name="networksScrollArea"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="horizontalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="widgetResizable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>654</width> + <height>222</height> + </rect> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + </layout> + </widget> + </widget> + </item> + <item> + <widget class="QWidget" name="bottomContainerWidget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0"> + <property name="leftMargin"> + <number>2</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>2</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="statusLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>OFFLINE (0 direct peers)</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="networkIdLineEdit"> + <property name="font"> + <font> + <family>Courier</family> + <pointsize>12</pointsize> + </font> + </property> + <property name="frame"> + <bool>true</bool> + </property> + <property name="placeholderText"> + <string>[Network ID, e.g. 8056c2e21c000001]</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="joinNetworkButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <weight>75</weight> + <bold>true</bold> + <underline>false</underline> + </font> + </property> + <property name="autoFillBackground"> + <bool>false</bool> + </property> + <property name="text"> + <string>+ Join</string> + </property> + <property name="default"> + <bool>false</bool> + </property> + <property name="flat"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> </layout> </widget> - <widget class="QStatusBar" name="statusBar"/> <widget class="QMenuBar" name="menuBar"> <property name="geometry"> <rect> @@ -39,22 +164,23 @@ <height>22</height> </rect> </property> - <widget class="QMenu" name="menuFile"> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <widget class="QMenu" name="menuHelp"> <property name="title"> - <string>File</string> + <string>Help</string> </property> - <addaction name="actionJoin_Network"/> - <addaction name="separator"/> - <addaction name="actionExit"/> + <addaction name="actionAbout_2"/> </widget> - <widget class="QMenu" name="menuHelp"> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> - </property> + <widget class="QMenu" name="menuFile"> <property name="title"> - <string>Help</string> + <string>File</string> </property> - <addaction name="actionAbout"/> + <addaction name="actionJoin_Network_2"/> + <addaction name="actionShow_Detailed_Status"/> + <addaction name="separator"/> + <addaction name="actionExit_2"/> </widget> <addaction name="menuFile"/> <addaction name="menuHelp"/> @@ -74,8 +200,30 @@ <string>About</string> </property> </action> + <action name="actionAbout_2"> + <property name="text"> + <string>About</string> + </property> + </action> + <action name="actionJoin_Network_2"> + <property name="text"> + <string>Join Network</string> + </property> + </action> + <action name="actionShow_Detailed_Status"> + <property name="text"> + <string>Show Detailed Status</string> + </property> + </action> + <action name="actionExit_2"> + <property name="text"> + <string>Exit</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> - <resources/> + <resources> + <include location="resources.qrc"/> + </resources> <connections/> </ui> diff --git a/ZeroTierUI/resources.qrc b/ZeroTierUI/resources.qrc index 2496c877..a788ae7f 100644 --- a/ZeroTierUI/resources.qrc +++ b/ZeroTierUI/resources.qrc @@ -1 +1,5 @@ -<RCC/>
\ No newline at end of file +<RCC> + <qresource prefix="/img"> + <file>zt1icon.png</file> + </qresource> +</RCC> diff --git a/ZeroTierUI/zt1icon.png b/ZeroTierUI/zt1icon.png Binary files differnew file mode 100644 index 00000000..bc265167 --- /dev/null +++ b/ZeroTierUI/zt1icon.png |
