Browse Source

Some UI fixes for Windows.

Adam Ierymenko 11 years ago
parent
commit
9f2571cc01
3 changed files with 12 additions and 5 deletions
  1. 4 4
      ZeroTierUI/mainwindow.ui
  2. 4 1
      ZeroTierUI/networkwidget.ui
  3. 4 0
      windows/ZeroTierOne/ZeroTierOne.vcxproj

+ 4 - 4
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">

+ 4 - 1
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>

+ 4 - 0
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" />