diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-08-20 10:22:30 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-08-20 10:22:30 -0700 |
| commit | 9f2571cc01d41e571e1c3e45ae54040e330d4d4d (patch) | |
| tree | 7812dc2ae0c0019fa0561c0b85406fe64501ebdc | |
| parent | b4b2e2ed9f0669dc89f681b1e5bde887c39faf32 (diff) | |
| download | infinitytier-9f2571cc01d41e571e1c3e45ae54040e330d4d4d.tar.gz infinitytier-9f2571cc01d41e571e1c3e45ae54040e330d4d4d.zip | |
Some UI fixes for Windows.
| -rw-r--r-- | ZeroTierUI/mainwindow.ui | 8 | ||||
| -rw-r--r-- | ZeroTierUI/networkwidget.ui | 5 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/ZeroTierUI/mainwindow.ui b/ZeroTierUI/mainwindow.ui index d2fad811..0cedce31 100644 --- a/ZeroTierUI/mainwindow.ui +++ b/ZeroTierUI/mainwindow.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>720</width> - <height>300</height> + <width>850</width> + <height>400</height> </rect> </property> <property name="windowTitle"> @@ -229,8 +229,8 @@ <rect> <x>0</x> <y>0</y> - <width>720</width> - <height>22</height> + <width>850</width> + <height>34</height> </rect> </property> <property name="font"> diff --git a/ZeroTierUI/networkwidget.ui b/ZeroTierUI/networkwidget.ui index b7ba6d60..af025d5d 100644 --- a/ZeroTierUI/networkwidget.ui +++ b/ZeroTierUI/networkwidget.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>580</width> + <width>689</width> <height>253</height> </rect> </property> @@ -380,6 +380,9 @@ <bold>true</bold> </font> </property> + <property name="statusTip"> + <string>Your system's Ethernet MAC address.</string> + </property> <property name="text"> <string>?</string> </property> diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index 6c5e7a1c..6c6a0262 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -23,6 +23,8 @@ <ClCompile Include="..\..\main.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\..\node\C25519.cpp" /> <ClCompile Include="..\..\node\CertificateOfMembership.cpp" /> @@ -60,6 +62,8 @@ <ClCompile Include="..\..\selftest.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> </ClCompile> <ClCompile Include="ServiceBase.cpp" /> <ClCompile Include="ServiceInstaller.cpp" /> |