Network Menu

Merge lp:~and471/indicator-network/edit-connection-dialog-prettification into lp:~indicator-applet-developers/indicator-network/indicator-network

  1. edit-connection-dialog-prettification
  2. Merge into indicator-network
Proposed by Andrew
Status: Merged
Merged at revision: 147
Proposed branch: lp:~and471/indicator-network/edit-connection-dialog-prettification
Merge into: lp:~indicator-applet-developers/indicator-network/indicator-network
Diff against target: 447 lines (+57/-169)
1 file modified
src/settings/ui/edit_connection_dialog.ui (+57/-169)
To merge this branch: bzr merge lp:~and471/indicator-network/edit-connection-dialog-prettification
Reviewer Review Type Date Requested Status
Indicator Network Developers Pending
Review via email: mp+50018@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Kalle Valo (kvalo) wrote :

Andy, you are my hero! The dialog looks pretty again :)

We need to look at tab ordering at some point (eg. ipv4 and ipv6 should
be next to each other), but let's worry about that later.

Merged. Thank you.

--
Kalle Valo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/settings/ui/edit_connection_dialog.ui'
2--- src/settings/ui/edit_connection_dialog.ui 2011-02-15 11:27:57 +0000
3+++ src/settings/ui/edit_connection_dialog.ui 2011-02-16 17:41:49 +0000
4@@ -6,7 +6,7 @@
5 <property name="title" translatable="yes">Edit Network</property>
6 <property name="window_position">center</property>
7 <property name="default_width">440</property>
8- <property name="default_height">415</property>
9+ <property name="default_height">320</property>
10 <child>
11 <object class="GtkVBox" id="vbox1">
12 <property name="visible">True</property>
13@@ -29,6 +29,7 @@
14 <property name="n_rows">2</property>
15 <property name="n_columns">2</property>
16 <property name="column_spacing">6</property>
17+ <property name="row_spacing">6</property>
18 <child>
19 <object class="GtkLabel" id="label4">
20 <property name="visible">True</property>
21@@ -43,10 +44,12 @@
22 <child>
23 <object class="GtkLabel" id="label_name">
24 <property name="visible">True</property>
25+ <property name="xalign">0</property>
26 </object>
27 <packing>
28 <property name="left_attach">1</property>
29 <property name="right_attach">2</property>
30+ <property name="y_options">GTK_FILL</property>
31 </packing>
32 </child>
33 <child>
34@@ -58,7 +61,6 @@
35 <property name="draw_indicator">True</property>
36 </object>
37 <packing>
38- <property name="left_attach">1</property>
39 <property name="right_attach">2</property>
40 <property name="top_attach">1</property>
41 <property name="bottom_attach">2</property>
42@@ -66,9 +68,6 @@
43 <property name="y_options"></property>
44 </packing>
45 </child>
46- <child>
47- <placeholder/>
48- </child>
49 </object>
50 </child>
51 </object>
52@@ -92,9 +91,10 @@
53 <child>
54 <object class="GtkTable" id="table_wireless">
55 <property name="visible">True</property>
56- <property name="n_rows">8</property>
57+ <property name="n_rows">3</property>
58 <property name="n_columns">2</property>
59 <property name="column_spacing">6</property>
60+ <property name="row_spacing">6</property>
61 <child>
62 <object class="GtkLabel" id="label5">
63 <property name="visible">True</property>
64@@ -109,10 +109,12 @@
65 <child>
66 <object class="GtkLabel" id="label_mode">
67 <property name="visible">True</property>
68+ <property name="xalign">0</property>
69 </object>
70 <packing>
71 <property name="left_attach">1</property>
72 <property name="right_attach">2</property>
73+ <property name="y_options">GTK_FILL</property>
74 </packing>
75 </child>
76 <child>
77@@ -144,12 +146,14 @@
78 <child>
79 <object class="GtkLabel" id="label_security">
80 <property name="visible">True</property>
81+ <property name="xalign">0</property>
82 </object>
83 <packing>
84 <property name="left_attach">1</property>
85 <property name="right_attach">2</property>
86 <property name="top_attach">1</property>
87 <property name="bottom_attach">2</property>
88+ <property name="y_options">GTK_FILL</property>
89 </packing>
90 </child>
91 <child>
92@@ -164,38 +168,9 @@
93 <property name="right_attach">2</property>
94 <property name="top_attach">2</property>
95 <property name="bottom_attach">3</property>
96+ <property name="y_options">GTK_FILL</property>
97 </packing>
98 </child>
99- <child>
100- <placeholder/>
101- </child>
102- <child>
103- <placeholder/>
104- </child>
105- <child>
106- <placeholder/>
107- </child>
108- <child>
109- <placeholder/>
110- </child>
111- <child>
112- <placeholder/>
113- </child>
114- <child>
115- <placeholder/>
116- </child>
117- <child>
118- <placeholder/>
119- </child>
120- <child>
121- <placeholder/>
122- </child>
123- <child>
124- <placeholder/>
125- </child>
126- <child>
127- <placeholder/>
128- </child>
129 </object>
130 </child>
131 </object>
132@@ -207,7 +182,6 @@
133 <object class="GtkLabel" id="label2">
134 <property name="visible">True</property>
135 <property name="label" translatable="yes">Wireless</property>
136- <property name="ellipsize">start</property>
137 </object>
138 <packing>
139 <property name="position">1</property>
140@@ -222,11 +196,12 @@
141 <property name="left_padding">24</property>
142 <property name="right_padding">12</property>
143 <child>
144- <object class="GtkTable" id="table_ipv">
145+ <object class="GtkTable" id="table_ipv4">
146 <property name="visible">True</property>
147- <property name="n_rows">8</property>
148+ <property name="n_rows">4</property>
149 <property name="n_columns">2</property>
150 <property name="column_spacing">6</property>
151+ <property name="row_spacing">6</property>
152 <child>
153 <object class="GtkLabel" id="label10">
154 <property name="visible">True</property>
155@@ -288,6 +263,7 @@
156 <property name="right_attach">2</property>
157 <property name="top_attach">1</property>
158 <property name="bottom_attach">2</property>
159+ <property name="y_options">GTK_FILL</property>
160 </packing>
161 </child>
162 <child>
163@@ -301,6 +277,7 @@
164 <property name="right_attach">2</property>
165 <property name="top_attach">2</property>
166 <property name="bottom_attach">3</property>
167+ <property name="y_options">GTK_FILL</property>
168 </packing>
169 </child>
170 <child>
171@@ -314,6 +291,7 @@
172 <property name="right_attach">2</property>
173 <property name="top_attach">3</property>
174 <property name="bottom_attach">4</property>
175+ <property name="y_options">GTK_FILL</property>
176 </packing>
177 </child>
178 <child>
179@@ -323,32 +301,9 @@
180 <packing>
181 <property name="left_attach">1</property>
182 <property name="right_attach">2</property>
183+ <property name="y_options">GTK_FILL</property>
184 </packing>
185 </child>
186- <child>
187- <placeholder/>
188- </child>
189- <child>
190- <placeholder/>
191- </child>
192- <child>
193- <placeholder/>
194- </child>
195- <child>
196- <placeholder/>
197- </child>
198- <child>
199- <placeholder/>
200- </child>
201- <child>
202- <placeholder/>
203- </child>
204- <child>
205- <placeholder/>
206- </child>
207- <child>
208- <placeholder/>
209- </child>
210 </object>
211 </child>
212 </object>
213@@ -376,9 +331,10 @@
214 <child>
215 <object class="GtkTable" id="table_dns">
216 <property name="visible">True</property>
217- <property name="n_rows">8</property>
218+ <property name="n_rows">2</property>
219 <property name="n_columns">2</property>
220 <property name="column_spacing">6</property>
221+ <property name="row_spacing">6</property>
222 <child>
223 <object class="GtkLabel" id="label6">
224 <property name="visible">True</property>
225@@ -412,10 +368,11 @@
226 <packing>
227 <property name="left_attach">1</property>
228 <property name="right_attach">2</property>
229+ <property name="y_options">GTK_FILL</property>
230 </packing>
231 </child>
232 <child>
233- <object class="GtkEntry" id="entry_domains">
234+ <object class="GtkEntry" id="entry_domains">
235 <property name="visible">True</property>
236 <property name="can_focus">True</property>
237 <property name="invisible_char">●</property>
238@@ -425,44 +382,9 @@
239 <property name="right_attach">2</property>
240 <property name="top_attach">1</property>
241 <property name="bottom_attach">2</property>
242+ <property name="y_options">GTK_FILL</property>
243 </packing>
244 </child>
245- <child>
246- <placeholder/>
247- </child>
248- <child>
249- <placeholder/>
250- </child>
251- <child>
252- <placeholder/>
253- </child>
254- <child>
255- <placeholder/>
256- </child>
257- <child>
258- <placeholder/>
259- </child>
260- <child>
261- <placeholder/>
262- </child>
263- <child>
264- <placeholder/>
265- </child>
266- <child>
267- <placeholder/>
268- </child>
269- <child>
270- <placeholder/>
271- </child>
272- <child>
273- <placeholder/>
274- </child>
275- <child>
276- <placeholder/>
277- </child>
278- <child>
279- <placeholder/>
280- </child>
281 </object>
282 </child>
283 </object>
284@@ -490,9 +412,10 @@
285 <child>
286 <object class="GtkTable" id="table_ipv6">
287 <property name="visible">True</property>
288- <property name="n_rows">8</property>
289+ <property name="n_rows">4</property>
290 <property name="n_columns">2</property>
291 <property name="column_spacing">6</property>
292+ <property name="row_spacing">6</property>
293 <child>
294 <object class="GtkLabel" id="label11">
295 <property name="visible">True</property>
296@@ -554,6 +477,7 @@
297 <property name="right_attach">2</property>
298 <property name="top_attach">1</property>
299 <property name="bottom_attach">2</property>
300+ <property name="y_options">GTK_FILL</property>
301 </packing>
302 </child>
303 <child>
304@@ -567,6 +491,7 @@
305 <property name="right_attach">2</property>
306 <property name="top_attach">2</property>
307 <property name="bottom_attach">3</property>
308+ <property name="y_options">GTK_FILL</property>
309 </packing>
310 </child>
311 <child>
312@@ -580,6 +505,7 @@
313 <property name="right_attach">2</property>
314 <property name="top_attach">3</property>
315 <property name="bottom_attach">4</property>
316+ <property name="y_options">GTK_FILL</property>
317 </packing>
318 </child>
319 <child>
320@@ -589,32 +515,9 @@
321 <packing>
322 <property name="left_attach">1</property>
323 <property name="right_attach">2</property>
324+ <property name="y_options">GTK_FILL</property>
325 </packing>
326 </child>
327- <child>
328- <placeholder/>
329- </child>
330- <child>
331- <placeholder/>
332- </child>
333- <child>
334- <placeholder/>
335- </child>
336- <child>
337- <placeholder/>
338- </child>
339- <child>
340- <placeholder/>
341- </child>
342- <child>
343- <placeholder/>
344- </child>
345- <child>
346- <placeholder/>
347- </child>
348- <child>
349- <placeholder/>
350- </child>
351 </object>
352 </child>
353 </object>
354@@ -642,9 +545,9 @@
355 <child>
356 <object class="GtkTable" id="table_main5">
357 <property name="visible">True</property>
358- <property name="n_rows">8</property>
359 <property name="n_columns">2</property>
360 <property name="column_spacing">6</property>
361+ <property name="row_spacing">6</property>
362 <child>
363 <object class="GtkLabel" id="label12">
364 <property name="visible">True</property>
365@@ -665,50 +568,9 @@
366 <packing>
367 <property name="left_attach">1</property>
368 <property name="right_attach">2</property>
369+ <property name="y_options">GTK_FILL</property>
370 </packing>
371 </child>
372- <child>
373- <placeholder/>
374- </child>
375- <child>
376- <placeholder/>
377- </child>
378- <child>
379- <placeholder/>
380- </child>
381- <child>
382- <placeholder/>
383- </child>
384- <child>
385- <placeholder/>
386- </child>
387- <child>
388- <placeholder/>
389- </child>
390- <child>
391- <placeholder/>
392- </child>
393- <child>
394- <placeholder/>
395- </child>
396- <child>
397- <placeholder/>
398- </child>
399- <child>
400- <placeholder/>
401- </child>
402- <child>
403- <placeholder/>
404- </child>
405- <child>
406- <placeholder/>
407- </child>
408- <child>
409- <placeholder/>
410- </child>
411- <child>
412- <placeholder/>
413- </child>
414 </object>
415 </child>
416 </object>
417@@ -822,4 +684,30 @@
418 </row>
419 </data>
420 </object>
421+ <object class="GtkSizeGroup" id="sizegroup_wireless">
422+ <property name="mode">vertical</property>
423+ <widgets>
424+ <widget name="label_mode"/>
425+ <widget name="label_security"/>
426+ <widget name="entry_passphrase"/>
427+ </widgets>
428+ </object>
429+ <object class="GtkSizeGroup" id="sizegroup_ipv4">
430+ <property name="mode">vertical</property>
431+ <widgets>
432+ <widget name="entry_ipv4_address"/>
433+ <widget name="entry_ipv4_netmask"/>
434+ <widget name="entry_ipv4_gateway"/>
435+ <widget name="combobox_ipv4_method"/>
436+ </widgets>
437+ </object>
438+ <object class="GtkSizeGroup" id="sizegroup_ipv6">
439+ <property name="mode">vertical</property>
440+ <widgets>
441+ <widget name="entry_ipv6_address"/>
442+ <widget name="entry_ipv6_prefix_length"/>
443+ <widget name="entry_ipv6_gateway"/>
444+ <widget name="combobox_ipv6_method"/>
445+ </widgets>
446+ </object>
447 </interface>

Subscribers

People subscribed via source and target branches