[PC-BSD Commits] r9773 - pcbsd/current/src-qt4/pc-netmanager/src/wificonfig

[svn at pcbsd.org]

Author: kenmoore
Date: 2011-03-24 08:07:05 -0700 (Thu, 24 Mar 2011)
New Revision: 9773

Modified:
   pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfig.qrc
   pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.ui
Log:
Clean up the new wifi config GUI a bit


Modified: pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfig.qrc
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfig.qrc	2011-03-24 09:01:56 UTC (rev 9772)
+++ pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfig.qrc	2011-03-24 15:07:05 UTC (rev 9773)
@@ -1,5 +1,6 @@
 <RCC>
   <qresource>
+    <file>scan-wifi.png</file>
     <file>configure.png</file>
     <file>object-locked.png</file>
     <file>object-unlocked.png</file>

Modified: pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.ui
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.ui	2011-03-24 09:01:56 UTC (rev 9772)
+++ pcbsd/current/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.ui	2011-03-24 15:07:05 UTC (rev 9773)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>350</width>
-    <height>540</height>
+    <width>341</width>
+    <height>440</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -251,8 +251,8 @@
               <string>Scan</string>
              </property>
              <property name="icon">
-              <iconset>
-               <normaloff>../../../../../../../../../home/moore/pcbsdwork/current/src-qt4/pc-netmanager/src/wificonfig/scan-wifi.png</normaloff>../../../../../../../../../home/moore/pcbsdwork/current/src-qt4/pc-netmanager/src/wificonfig/scan-wifi.png</iconset>
+              <iconset resource="wificonfig.qrc">
+               <normaloff>:/scan-wifi.png</normaloff>:/scan-wifi.png</iconset>
              </property>
             </widget>
            </item>
@@ -280,7 +280,53 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="0">
+      </layout>
+     </widget>
+     <widget class="QWidget" name="TabPage">
+      <attribute name="title">
+       <string>Advanced</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <item>
+          <widget class="QCheckBox" name="checkMAC">
+           <property name="text">
+            <string>Use hardware defau&lt MAC address</string>
+           </property>
+           <property name="shortcut">
+            <string>Alt+L</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="groupMAC">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="title">
+            <string>Custom MAC address</string>
+           </property>
+           <layout class="QGridLayout">
+            <item row="1" column="0">
+             <widget class="QLineEdit" name="lineMAC"/>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="Line" name="line_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <widget class="QCheckBox" name="checkDHCP">
@@ -297,7 +343,7 @@
            <property name="title">
             <string>Assign static IP address</string>
            </property>
-           <layout class="QGridLayout">
+           <layout class="QGridLayout" name="_2">
             <item row="0" column="0">
              <widget class="QLabel" name="textLabel3">
               <property name="text">
@@ -349,49 +395,7 @@
          </item>
         </layout>
        </item>
-       <item row="6" column="0">
-        <widget class="Line" name="line_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="TabPage">
-      <attribute name="title">
-       <string>Advanced</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_1">
-       <item row="0" column="0">
-        <widget class="QCheckBox" name="checkMAC">
-         <property name="text">
-          <string>Use hardware defau&lt MAC address</string>
-         </property>
-         <property name="shortcut">
-          <string>Alt+L</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="groupMAC">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="title">
-          <string>Custom MAC address</string>
-         </property>
-         <layout class="QGridLayout">
-          <item row="0" column="0">
-           <widget class="QLineEdit" name="lineMAC"/>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="2" column="0">
+       <item>
         <spacer name="spacer7">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -801,14 +805,10 @@
   <tabstop>pushDown</tabstop>
   <tabstop>pushEditWifi</tabstop>
   <tabstop>pushRemoveWifi</tabstop>
-  <tabstop>lineIP</tabstop>
-  <tabstop>lineNetmask</tabstop>
   <tabstop>checkDisableWireless</tabstop>
   <tabstop>pushOK</tabstop>
   <tabstop>pushApply</tabstop>
   <tabstop>buttonCancel</tabstop>
-  <tabstop>lineMAC</tabstop>
-  <tabstop>checkMAC</tabstop>
  </tabstops>
  <includes>
   <include location="local">qmessagebox.h</include>
@@ -892,22 +892,6 @@
    </hints>
   </connection>
   <connection>
-   <sender>checkDHCP</sender>
-   <signal>clicked()</signal>
-   <receiver>wificonfigwidgetbase</receiver>
-   <slot>slotCheckDHCPBox()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
    <sender>checkMAC</sender>
    <signal>clicked()</signal>
    <receiver>wificonfigwidgetbase</receiver>
@@ -924,38 +908,6 @@
    </hints>
   </connection>
   <connection>
-   <sender>lineIP</sender>
-   <signal>textChanged(QString)</signal>
-   <receiver>wificonfigwidgetbase</receiver>
-   <slot>slotCheckGlobalText()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>lineNetmask</sender>
-   <signal>textChanged(QString)</signal>
-   <receiver>wificonfigwidgetbase</receiver>
-   <slot>slotCheckGlobalText()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
    <sender>lineMAC</sender>
    <signal>textChanged(QString)</signal>
    <receiver>wificonfigwidgetbase</receiver>