summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2002-12-16 17:11:27 (UTC)
committer benmeyer <benmeyer>2002-12-16 17:11:27 (UTC)
commit0228363d2dead01a93a4ae151f415cff4393a2b0 (patch) (unidiff)
treefce64cdbe38ba2778ecf258e94e7df23a61c5c5f
parent065a640e8ace53f7c02bda42bb5d18907922a942 (diff)
downloadopie-0228363d2dead01a93a4ae151f415cff4393a2b0.zip
opie-0228363d2dead01a93a4ae151f415cff4393a2b0.tar.gz
opie-0228363d2dead01a93a4ae151f415cff4393a2b0.tar.bz2
Changed the order of the advanced ui to make more sense
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/interfaces/interfaceadvanced.ui136
-rw-r--r--noncore/net/networksetup/interfaces/interfaceinformation.ui2
-rw-r--r--noncore/settings/networksettings/interfaces/interfaceadvanced.ui136
-rw-r--r--noncore/settings/networksettings/interfaces/interfaceinformation.ui2
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
@@ -11,9 +11,9 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>214</width> 14 <width>214</width>
15 <height>286</height> 15 <height>290</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>maximumSize</name> 19 <name>maximumSize</name>
@@ -34,19 +34,8 @@
34 <property stdset="1"> 34 <property stdset="1">
35 <name>spacing</name> 35 <name>spacing</name>
36 <number>6</number> 36 <number>6</number>
37 </property> 37 </property>
38 <widget row="1" column="0" >
39 <class>QLabel</class>
40 <property stdset="1">
41 <name>name</name>
42 <cstring>TextLabel1</cstring>
43 </property>
44 <property stdset="1">
45 <name>text</name>
46 <string>MAC Address</string>
47 </property>
48 </widget>
49 <widget row="0" column="1" > 38 <widget row="0" column="1" >
50 <class>QLabel</class> 39 <class>QLabel</class>
51 <property stdset="1"> 40 <property stdset="1">
52 <name>name</name> 41 <name>name</name>
@@ -64,9 +53,9 @@
64 <name>text</name> 53 <name>text</name>
65 <string>eth0</string> 54 <string>eth0</string>
66 </property> 55 </property>
67 </widget> 56 </widget>
68 <widget row="2" column="0" > 57 <widget row="1" column="0" >
69 <class>QLabel</class> 58 <class>QLabel</class>
70 <property stdset="1"> 59 <property stdset="1">
71 <name>name</name> 60 <name>name</name>
72 <cstring>TextLabel3</cstring> 61 <cstring>TextLabel3</cstring>
@@ -75,27 +64,8 @@
75 <name>text</name> 64 <name>text</name>
76 <string>IP Address</string> 65 <string>IP Address</string>
77 </property> 66 </property>
78 </widget> 67 </widget>
79 <widget row="1" column="1" >
80 <class>QLabel</class>
81 <property stdset="1">
82 <name>name</name>
83 <cstring>macAddressLabel</cstring>
84 </property>
85 <property stdset="1">
86 <name>frameShape</name>
87 <enum>Panel</enum>
88 </property>
89 <property stdset="1">
90 <name>frameShadow</name>
91 <enum>Sunken</enum>
92 </property>
93 <property stdset="1">
94 <name>text</name>
95 <string>00:00:00:00:00:00</string>
96 </property>
97 </widget>
98 <widget row="0" column="0" > 68 <widget row="0" column="0" >
99 <class>QLabel</class> 69 <class>QLabel</class>
100 <property stdset="1"> 70 <property stdset="1">
101 <name>name</name> 71 <name>name</name>
@@ -105,9 +75,9 @@
105 <name>text</name> 75 <name>text</name>
106 <string>Interface</string> 76 <string>Interface</string>
107 </property> 77 </property>
108 </widget> 78 </widget>
109 <widget row="4" column="0" > 79 <widget row="2" column="0" >
110 <class>QLabel</class> 80 <class>QLabel</class>
111 <property stdset="1"> 81 <property stdset="1">
112 <name>name</name> 82 <name>name</name>
113 <cstring>TextLabel4</cstring> 83 <cstring>TextLabel4</cstring>
@@ -120,9 +90,9 @@
120 <name>text</name> 90 <name>text</name>
121 <string>Subnet Mask</string> 91 <string>Subnet Mask</string>
122 </property> 92 </property>
123 </widget> 93 </widget>
124 <widget row="2" column="1" > 94 <widget row="1" column="1" >
125 <class>QLabel</class> 95 <class>QLabel</class>
126 <property stdset="1"> 96 <property stdset="1">
127 <name>name</name> 97 <name>name</name>
128 <cstring>ipAddressLabel</cstring> 98 <cstring>ipAddressLabel</cstring>
@@ -139,9 +109,9 @@
139 <name>text</name> 109 <name>text</name>
140 <string>0.0.0.0</string> 110 <string>0.0.0.0</string>
141 </property> 111 </property>
142 </widget> 112 </widget>
143 <widget row="4" column="1" > 113 <widget row="2" column="1" >
144 <class>QLabel</class> 114 <class>QLabel</class>
145 <property stdset="1"> 115 <property stdset="1">
146 <name>name</name> 116 <name>name</name>
147 <cstring>subnetMaskLabel</cstring> 117 <cstring>subnetMaskLabel</cstring>
@@ -158,34 +128,29 @@
158 <name>text</name> 128 <name>text</name>
159 <string>0.0.0.0</string> 129 <string>0.0.0.0</string>
160 </property> 130 </property>
161 </widget> 131 </widget>
162 <widget row="3" column="0" > 132 <spacer row="6" column="1" >
163 <class>QLabel</class> 133 <property>
164 <property stdset="1">
165 <name>name</name> 134 <name>name</name>
166 <cstring>TextLabel2</cstring> 135 <cstring>Spacer2</cstring>
167 </property> 136 </property>
168 <property stdset="1"> 137 <property stdset="1">
169 <name>text</name> 138 <name>orientation</name>
170 <string>Broadcast</string> 139 <enum>Vertical</enum>
171 </property>
172 </widget>
173 <widget row="3" column="1" >
174 <class>QLabel</class>
175 <property stdset="1">
176 <name>name</name>
177 <cstring>broadcastLabel</cstring>
178 </property> 140 </property>
179 <property stdset="1"> 141 <property stdset="1">
180 <name>frameShape</name> 142 <name>sizeType</name>
181 <enum>Panel</enum> 143 <enum>Expanding</enum>
182 </property> 144 </property>
183 <property stdset="1"> 145 <property>
184 <name>frameShadow</name> 146 <name>sizeHint</name>
185 <enum>Sunken</enum> 147 <size>
148 <width>20</width>
149 <height>20</height>
150 </size>
186 </property> 151 </property>
187 </widget> 152 </spacer>
188 <widget row="5" column="0" rowspan="1" colspan="2" > 153 <widget row="5" column="0" rowspan="1" colspan="2" >
189 <class>QGroupBox</class> 154 <class>QGroupBox</class>
190 <property stdset="1"> 155 <property stdset="1">
191 <name>name</name> 156 <name>name</name>
@@ -295,29 +260,64 @@
295 </property> 260 </property>
296 </widget> 261 </widget>
297 </grid> 262 </grid>
298 </widget> 263 </widget>
299 <spacer row="6" column="1" > 264 <widget row="4" column="0" >
300 <property> 265 <class>QLabel</class>
266 <property stdset="1">
301 <name>name</name> 267 <name>name</name>
302 <cstring>Spacer2</cstring> 268 <cstring>TextLabel2</cstring>
303 </property> 269 </property>
304 <property stdset="1"> 270 <property stdset="1">
305 <name>orientation</name> 271 <name>text</name>
306 <enum>Vertical</enum> 272 <string>Broadcast</string>
307 </property> 273 </property>
274 </widget>
275 <widget row="4" column="1" >
276 <class>QLabel</class>
308 <property stdset="1"> 277 <property stdset="1">
309 <name>sizeType</name> 278 <name>name</name>
310 <enum>Expanding</enum> 279 <cstring>broadcastLabel</cstring>
311 </property> 280 </property>
312 <property> 281 <property stdset="1">
313 <name>sizeHint</name> 282 <name>frameShape</name>
314 <size> 283 <enum>Panel</enum>
315 <width>20</width>
316 <height>20</height>
317 </size>
318 </property> 284 </property>
319 </spacer> 285 <property stdset="1">
286 <name>frameShadow</name>
287 <enum>Sunken</enum>
288 </property>
289 </widget>
290 <widget row="3" column="0" >
291 <class>QLabel</class>
292 <property stdset="1">
293 <name>name</name>
294 <cstring>TextLabel1</cstring>
295 </property>
296 <property stdset="1">
297 <name>text</name>
298 <string>MAC Address</string>
299 </property>
300 </widget>
301 <widget row="3" column="1" >
302 <class>QLabel</class>
303 <property stdset="1">
304 <name>name</name>
305 <cstring>macAddressLabel</cstring>
306 </property>
307 <property stdset="1">
308 <name>frameShape</name>
309 <enum>Panel</enum>
310 </property>
311 <property stdset="1">
312 <name>frameShadow</name>
313 <enum>Sunken</enum>
314 </property>
315 <property stdset="1">
316 <name>text</name>
317 <string>00:00:00:00:00:00</string>
318 </property>
319 </widget>
320 </grid> 320 </grid>
321</widget> 321</widget>
322<customwidgets> 322<customwidgets>
323 <customwidget> 323 <customwidget>
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
@@ -292,9 +292,9 @@
292 <cstring>advancedButton</cstring> 292 <cstring>advancedButton</cstring>
293 </property> 293 </property>
294 <property stdset="1"> 294 <property stdset="1">
295 <name>text</name> 295 <name>text</name>
296 <string>View &amp;Advanced Information</string> 296 <string>&amp;View Advanced Information</string>
297 </property> 297 </property>
298 </widget> 298 </widget>
299 </hbox> 299 </hbox>
300 </widget> 300 </widget>
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
@@ -11,9 +11,9 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>214</width> 14 <width>214</width>
15 <height>286</height> 15 <height>290</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>maximumSize</name> 19 <name>maximumSize</name>
@@ -34,19 +34,8 @@
34 <property stdset="1"> 34 <property stdset="1">
35 <name>spacing</name> 35 <name>spacing</name>
36 <number>6</number> 36 <number>6</number>
37 </property> 37 </property>
38 <widget row="1" column="0" >
39 <class>QLabel</class>
40 <property stdset="1">
41 <name>name</name>
42 <cstring>TextLabel1</cstring>
43 </property>
44 <property stdset="1">
45 <name>text</name>
46 <string>MAC Address</string>
47 </property>
48 </widget>
49 <widget row="0" column="1" > 38 <widget row="0" column="1" >
50 <class>QLabel</class> 39 <class>QLabel</class>
51 <property stdset="1"> 40 <property stdset="1">
52 <name>name</name> 41 <name>name</name>
@@ -64,9 +53,9 @@
64 <name>text</name> 53 <name>text</name>
65 <string>eth0</string> 54 <string>eth0</string>
66 </property> 55 </property>
67 </widget> 56 </widget>
68 <widget row="2" column="0" > 57 <widget row="1" column="0" >
69 <class>QLabel</class> 58 <class>QLabel</class>
70 <property stdset="1"> 59 <property stdset="1">
71 <name>name</name> 60 <name>name</name>
72 <cstring>TextLabel3</cstring> 61 <cstring>TextLabel3</cstring>
@@ -75,27 +64,8 @@
75 <name>text</name> 64 <name>text</name>
76 <string>IP Address</string> 65 <string>IP Address</string>
77 </property> 66 </property>
78 </widget> 67 </widget>
79 <widget row="1" column="1" >
80 <class>QLabel</class>
81 <property stdset="1">
82 <name>name</name>
83 <cstring>macAddressLabel</cstring>
84 </property>
85 <property stdset="1">
86 <name>frameShape</name>
87 <enum>Panel</enum>
88 </property>
89 <property stdset="1">
90 <name>frameShadow</name>
91 <enum>Sunken</enum>
92 </property>
93 <property stdset="1">
94 <name>text</name>
95 <string>00:00:00:00:00:00</string>
96 </property>
97 </widget>
98 <widget row="0" column="0" > 68 <widget row="0" column="0" >
99 <class>QLabel</class> 69 <class>QLabel</class>
100 <property stdset="1"> 70 <property stdset="1">
101 <name>name</name> 71 <name>name</name>
@@ -105,9 +75,9 @@
105 <name>text</name> 75 <name>text</name>
106 <string>Interface</string> 76 <string>Interface</string>
107 </property> 77 </property>
108 </widget> 78 </widget>
109 <widget row="4" column="0" > 79 <widget row="2" column="0" >
110 <class>QLabel</class> 80 <class>QLabel</class>
111 <property stdset="1"> 81 <property stdset="1">
112 <name>name</name> 82 <name>name</name>
113 <cstring>TextLabel4</cstring> 83 <cstring>TextLabel4</cstring>
@@ -120,9 +90,9 @@
120 <name>text</name> 90 <name>text</name>
121 <string>Subnet Mask</string> 91 <string>Subnet Mask</string>
122 </property> 92 </property>
123 </widget> 93 </widget>
124 <widget row="2" column="1" > 94 <widget row="1" column="1" >
125 <class>QLabel</class> 95 <class>QLabel</class>
126 <property stdset="1"> 96 <property stdset="1">
127 <name>name</name> 97 <name>name</name>
128 <cstring>ipAddressLabel</cstring> 98 <cstring>ipAddressLabel</cstring>
@@ -139,9 +109,9 @@
139 <name>text</name> 109 <name>text</name>
140 <string>0.0.0.0</string> 110 <string>0.0.0.0</string>
141 </property> 111 </property>
142 </widget> 112 </widget>
143 <widget row="4" column="1" > 113 <widget row="2" column="1" >
144 <class>QLabel</class> 114 <class>QLabel</class>
145 <property stdset="1"> 115 <property stdset="1">
146 <name>name</name> 116 <name>name</name>
147 <cstring>subnetMaskLabel</cstring> 117 <cstring>subnetMaskLabel</cstring>
@@ -158,34 +128,29 @@
158 <name>text</name> 128 <name>text</name>
159 <string>0.0.0.0</string> 129 <string>0.0.0.0</string>
160 </property> 130 </property>
161 </widget> 131 </widget>
162 <widget row="3" column="0" > 132 <spacer row="6" column="1" >
163 <class>QLabel</class> 133 <property>
164 <property stdset="1">
165 <name>name</name> 134 <name>name</name>
166 <cstring>TextLabel2</cstring> 135 <cstring>Spacer2</cstring>
167 </property> 136 </property>
168 <property stdset="1"> 137 <property stdset="1">
169 <name>text</name> 138 <name>orientation</name>
170 <string>Broadcast</string> 139 <enum>Vertical</enum>
171 </property>
172 </widget>
173 <widget row="3" column="1" >
174 <class>QLabel</class>
175 <property stdset="1">
176 <name>name</name>
177 <cstring>broadcastLabel</cstring>
178 </property> 140 </property>
179 <property stdset="1"> 141 <property stdset="1">
180 <name>frameShape</name> 142 <name>sizeType</name>
181 <enum>Panel</enum> 143 <enum>Expanding</enum>
182 </property> 144 </property>
183 <property stdset="1"> 145 <property>
184 <name>frameShadow</name> 146 <name>sizeHint</name>
185 <enum>Sunken</enum> 147 <size>
148 <width>20</width>
149 <height>20</height>
150 </size>
186 </property> 151 </property>
187 </widget> 152 </spacer>
188 <widget row="5" column="0" rowspan="1" colspan="2" > 153 <widget row="5" column="0" rowspan="1" colspan="2" >
189 <class>QGroupBox</class> 154 <class>QGroupBox</class>
190 <property stdset="1"> 155 <property stdset="1">
191 <name>name</name> 156 <name>name</name>
@@ -295,29 +260,64 @@
295 </property> 260 </property>
296 </widget> 261 </widget>
297 </grid> 262 </grid>
298 </widget> 263 </widget>
299 <spacer row="6" column="1" > 264 <widget row="4" column="0" >
300 <property> 265 <class>QLabel</class>
266 <property stdset="1">
301 <name>name</name> 267 <name>name</name>
302 <cstring>Spacer2</cstring> 268 <cstring>TextLabel2</cstring>
303 </property> 269 </property>
304 <property stdset="1"> 270 <property stdset="1">
305 <name>orientation</name> 271 <name>text</name>
306 <enum>Vertical</enum> 272 <string>Broadcast</string>
307 </property> 273 </property>
274 </widget>
275 <widget row="4" column="1" >
276 <class>QLabel</class>
308 <property stdset="1"> 277 <property stdset="1">
309 <name>sizeType</name> 278 <name>name</name>
310 <enum>Expanding</enum> 279 <cstring>broadcastLabel</cstring>
311 </property> 280 </property>
312 <property> 281 <property stdset="1">
313 <name>sizeHint</name> 282 <name>frameShape</name>
314 <size> 283 <enum>Panel</enum>
315 <width>20</width>
316 <height>20</height>
317 </size>
318 </property> 284 </property>
319 </spacer> 285 <property stdset="1">
286 <name>frameShadow</name>
287 <enum>Sunken</enum>
288 </property>
289 </widget>
290 <widget row="3" column="0" >
291 <class>QLabel</class>
292 <property stdset="1">
293 <name>name</name>
294 <cstring>TextLabel1</cstring>
295 </property>
296 <property stdset="1">
297 <name>text</name>
298 <string>MAC Address</string>
299 </property>
300 </widget>
301 <widget row="3" column="1" >
302 <class>QLabel</class>
303 <property stdset="1">
304 <name>name</name>
305 <cstring>macAddressLabel</cstring>
306 </property>
307 <property stdset="1">
308 <name>frameShape</name>
309 <enum>Panel</enum>
310 </property>
311 <property stdset="1">
312 <name>frameShadow</name>
313 <enum>Sunken</enum>
314 </property>
315 <property stdset="1">
316 <name>text</name>
317 <string>00:00:00:00:00:00</string>
318 </property>
319 </widget>
320 </grid> 320 </grid>
321</widget> 321</widget>
322<customwidgets> 322<customwidgets>
323 <customwidget> 323 <customwidget>
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
@@ -292,9 +292,9 @@
292 <cstring>advancedButton</cstring> 292 <cstring>advancedButton</cstring>
293 </property> 293 </property>
294 <property stdset="1"> 294 <property stdset="1">
295 <name>text</name> 295 <name>text</name>
296 <string>View &amp;Advanced Information</string> 296 <string>&amp;View Advanced Information</string>
297 </property> 297 </property>
298 </widget> 298 </widget>
299 </hbox> 299 </hbox>
300 </widget> 300 </widget>