Changed the order of the advanced ui to make more sense

4 files changed, 138 insertions, 138 deletions

diff --git a/noncore/net/networksetup/interfaces/interfaceadvanced.ui b/noncore/net/networksetup/interfaces/interfaceadvanced.ui
index 0ec67c2..9d9f98e 100644
--- a/noncore/net/networksetup/interfaces/interfaceadvanced.ui
+++ b/noncore/net/networksetup/interfaces/interfaceadvanced.ui
@@ -9,13 +9,13 @@
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
             <width>214</width>
-            <height>286</height>
+            <height>290</height>
         </rect>
     </property>
     <property stdset="1">
         <name>maximumSize</name>
         <size>
             <width>240</width>
@@ -32,23 +32,12 @@
             <number>11</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="1"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel1</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>MAC Address</string>
-            </property>
-        </widget>
         <widget row="0"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>interfaceName</cstring>
             </property>
@@ -62,54 +51,35 @@
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>eth0</string>
             </property>
         </widget>
-        <widget row="2"  column="0" >
+        <widget row="1"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel3</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>IP Address</string>
             </property>
         </widget>
-        <widget row="1"  column="1" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>macAddressLabel</cstring>
-            </property>
-            <property stdset="1">
-                <name>frameShape</name>
-                <enum>Panel</enum>
-            </property>
-            <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Sunken</enum>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>00:00:00:00:00:00</string>
-            </property>
-        </widget>
         <widget row="0"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel7</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Interface</string>
             </property>
         </widget>
-        <widget row="4"  column="0" >
+        <widget row="2"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel4</cstring>
             </property>
             <property stdset="1">
@@ -118,13 +88,13 @@
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Subnet Mask</string>
             </property>
         </widget>
-        <widget row="2"  column="1" >
+        <widget row="1"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>ipAddressLabel</cstring>
             </property>
             <property stdset="1">
@@ -137,13 +107,13 @@
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>0.0.0.0</string>
             </property>
         </widget>
-        <widget row="4"  column="1" >
+        <widget row="2"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>subnetMaskLabel</cstring>
             </property>
             <property stdset="1">
@@ -156,38 +126,33 @@
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>0.0.0.0</string>
             </property>
         </widget>
-        <widget row="3"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
+        <spacer row="6"  column="1" >
+            <property>
                 <name>name</name>
-                <cstring>TextLabel2</cstring>
+                <cstring>Spacer2</cstring>
             </property>
             <property stdset="1">
-                <name>text</name>
-                <string>Broadcast</string>
-            </property>
-        </widget>
-        <widget row="3"  column="1" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>broadcastLabel</cstring>
+                <name>orientation</name>
+                <enum>Vertical</enum>
             </property>
             <property stdset="1">
-                <name>frameShape</name>
-                <enum>Panel</enum>
+                <name>sizeType</name>
+                <enum>Expanding</enum>
             </property>
-            <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Sunken</enum>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
             </property>
-        </widget>
+        </spacer>
         <widget row="5"  column="0"  rowspan="1"  colspan="2" >
             <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>dhcpInformation</cstring>
             </property>
@@ -293,33 +258,68 @@
                         <name>text</name>
                         <string></string>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <spacer row="6"  column="1" >
-            <property>
+        <widget row="4"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
                 <name>name</name>
-                <cstring>Spacer2</cstring>
+                <cstring>TextLabel2</cstring>
             </property>
             <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
+                <name>text</name>
+                <string>Broadcast</string>
             </property>
+        </widget>
+        <widget row="4"  column="1" >
+            <class>QLabel</class>
             <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
+                <name>name</name>
+                <cstring>broadcastLabel</cstring>
             </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
+            <property stdset="1">
+                <name>frameShape</name>
+                <enum>Panel</enum>
             </property>
-        </spacer>
+            <property stdset="1">
+                <name>frameShadow</name>
+                <enum>Sunken</enum>
+            </property>
+        </widget>
+        <widget row="3"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>TextLabel1</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>MAC Address</string>
+            </property>
+        </widget>
+        <widget row="3"  column="1" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>macAddressLabel</cstring>
+            </property>
+            <property stdset="1">
+                <name>frameShape</name>
+                <enum>Panel</enum>
+            </property>
+            <property stdset="1">
+                <name>frameShadow</name>
+                <enum>Sunken</enum>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>00:00:00:00:00:00</string>
+            </property>
+        </widget>
     </grid>
 </widget>
 <customwidgets>
     <customwidget>
         <class>QWidget</class>
         <header location="local">qwidget.h</header>
diff --git a/noncore/net/networksetup/interfaces/interfaceinformation.ui b/noncore/net/networksetup/interfaces/interfaceinformation.ui
index 2838d19..e49e09f 100644
--- a/noncore/net/networksetup/interfaces/interfaceinformation.ui
+++ b/noncore/net/networksetup/interfaces/interfaceinformation.ui
@@ -290,13 +290,13 @@
                     <property stdset="1">
                         <name>name</name>
                         <cstring>advancedButton</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>View &amp;Advanced Information</string>
+                        <string>&amp;View Advanced Information</string>
                     </property>
                 </widget>
             </hbox>
         </widget>
         <widget row="5"  column="0"  rowspan="1"  colspan="2" >
             <class>Line</class>
diff --git a/noncore/settings/networksettings/interfaces/interfaceadvanced.ui b/noncore/settings/networksettings/interfaces/interfaceadvanced.ui
index 0ec67c2..9d9f98e 100644
--- a/noncore/settings/networksettings/interfaces/interfaceadvanced.ui
+++ b/noncore/settings/networksettings/interfaces/interfaceadvanced.ui
@@ -9,13 +9,13 @@
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
             <width>214</width>
-            <height>286</height>
+            <height>290</height>
         </rect>
     </property>
     <property stdset="1">
         <name>maximumSize</name>
         <size>
             <width>240</width>
@@ -32,23 +32,12 @@
             <number>11</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="1"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel1</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>MAC Address</string>
-            </property>
-        </widget>
         <widget row="0"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>interfaceName</cstring>
             </property>
@@ -62,54 +51,35 @@
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>eth0</string>
             </property>
         </widget>
-        <widget row="2"  column="0" >
+        <widget row="1"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel3</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>IP Address</string>
             </property>
         </widget>
-        <widget row="1"  column="1" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>macAddressLabel</cstring>
-            </property>
-            <property stdset="1">
-                <name>frameShape</name>
-                <enum>Panel</enum>
-            </property>
-            <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Sunken</enum>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>00:00:00:00:00:00</string>
-            </property>
-        </widget>
         <widget row="0"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel7</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Interface</string>
             </property>
         </widget>
-        <widget row="4"  column="0" >
+        <widget row="2"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel4</cstring>
             </property>
             <property stdset="1">
@@ -118,13 +88,13 @@
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Subnet Mask</string>
             </property>
         </widget>
-        <widget row="2"  column="1" >
+        <widget row="1"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>ipAddressLabel</cstring>
             </property>
             <property stdset="1">
@@ -137,13 +107,13 @@
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>0.0.0.0</string>
             </property>
         </widget>
-        <widget row="4"  column="1" >
+        <widget row="2"  column="1" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>subnetMaskLabel</cstring>
             </property>
             <property stdset="1">
@@ -156,38 +126,33 @@
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>0.0.0.0</string>
             </property>
         </widget>
-        <widget row="3"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
+        <spacer row="6"  column="1" >
+            <property>
                 <name>name</name>
-                <cstring>TextLabel2</cstring>
+                <cstring>Spacer2</cstring>
             </property>
             <property stdset="1">
-                <name>text</name>
-                <string>Broadcast</string>
-            </property>
-        </widget>
-        <widget row="3"  column="1" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>broadcastLabel</cstring>
+                <name>orientation</name>
+                <enum>Vertical</enum>
             </property>
             <property stdset="1">
-                <name>frameShape</name>
-                <enum>Panel</enum>
+                <name>sizeType</name>
+                <enum>Expanding</enum>
             </property>
-            <property stdset="1">
-                <name>frameShadow</name>
-                <enum>Sunken</enum>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
             </property>
-        </widget>
+        </spacer>
         <widget row="5"  column="0"  rowspan="1"  colspan="2" >
             <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>dhcpInformation</cstring>
             </property>
@@ -293,33 +258,68 @@
                         <name>text</name>
                         <string></string>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <spacer row="6"  column="1" >
-            <property>
+        <widget row="4"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
                 <name>name</name>
-                <cstring>Spacer2</cstring>
+                <cstring>TextLabel2</cstring>
             </property>
             <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
+                <name>text</name>
+                <string>Broadcast</string>
             </property>
+        </widget>
+        <widget row="4"  column="1" >
+            <class>QLabel</class>
             <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
+                <name>name</name>
+                <cstring>broadcastLabel</cstring>
             </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
+            <property stdset="1">
+                <name>frameShape</name>
+                <enum>Panel</enum>
             </property>
-        </spacer>
+            <property stdset="1">
+                <name>frameShadow</name>
+                <enum>Sunken</enum>
+            </property>
+        </widget>
+        <widget row="3"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>TextLabel1</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>MAC Address</string>
+            </property>
+        </widget>
+        <widget row="3"  column="1" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>macAddressLabel</cstring>
+            </property>
+            <property stdset="1">
+                <name>frameShape</name>
+                <enum>Panel</enum>
+            </property>
+            <property stdset="1">
+                <name>frameShadow</name>
+                <enum>Sunken</enum>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>00:00:00:00:00:00</string>
+            </property>
+        </widget>
     </grid>
 </widget>
 <customwidgets>
     <customwidget>
         <class>QWidget</class>
         <header location="local">qwidget.h</header>
diff --git a/noncore/settings/networksettings/interfaces/interfaceinformation.ui b/noncore/settings/networksettings/interfaces/interfaceinformation.ui
index 2838d19..e49e09f 100644
--- a/noncore/settings/networksettings/interfaces/interfaceinformation.ui
+++ b/noncore/settings/networksettings/interfaces/interfaceinformation.ui
@@ -290,13 +290,13 @@
                     <property stdset="1">
                         <name>name</name>
                         <cstring>advancedButton</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>View &amp;Advanced Information</string>
+                        <string>&amp;View Advanced Information</string>
                     </property>
                 </widget>
             </hbox>
         </widget>
         <widget row="5"  column="0"  rowspan="1"  colspan="2" >
             <class>Line</class>