Merge lp:~and471/indicator-network/edit-connection-dialog-prettification into lp:~indicator-applet-developers/indicator-network/indicator-network
- edit-connection-dialog-prettification
- 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 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Network Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
| Kalle Valo (kvalo) wrote : | # |
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 | 6 | <property name="title" translatable="yes">Edit Network</property> | 6 | <property name="title" translatable="yes">Edit Network</property> |
| 6 | 7 | <property name="window_position">center</property> | 7 | <property name="window_position">center</property> |
| 7 | 8 | <property name="default_width">440</property> | 8 | <property name="default_width">440</property> |
| 9 | 9 | <property name="default_height">415</property> | 9 | <property name="default_height">320</property> |
| 10 | 10 | <child> | 10 | <child> |
| 11 | 11 | <object class="GtkVBox" id="vbox1"> | 11 | <object class="GtkVBox" id="vbox1"> |
| 12 | 12 | <property name="visible">True</property> | 12 | <property name="visible">True</property> |
| 13 | @@ -29,6 +29,7 @@ | |||
| 14 | 29 | <property name="n_rows">2</property> | 29 | <property name="n_rows">2</property> |
| 15 | 30 | <property name="n_columns">2</property> | 30 | <property name="n_columns">2</property> |
| 16 | 31 | <property name="column_spacing">6</property> | 31 | <property name="column_spacing">6</property> |
| 17 | 32 | <property name="row_spacing">6</property> | ||
| 18 | 32 | <child> | 33 | <child> |
| 19 | 33 | <object class="GtkLabel" id="label4"> | 34 | <object class="GtkLabel" id="label4"> |
| 20 | 34 | <property name="visible">True</property> | 35 | <property name="visible">True</property> |
| 21 | @@ -43,10 +44,12 @@ | |||
| 22 | 43 | <child> | 44 | <child> |
| 23 | 44 | <object class="GtkLabel" id="label_name"> | 45 | <object class="GtkLabel" id="label_name"> |
| 24 | 45 | <property name="visible">True</property> | 46 | <property name="visible">True</property> |
| 25 | 47 | <property name="xalign">0</property> | ||
| 26 | 46 | </object> | 48 | </object> |
| 27 | 47 | <packing> | 49 | <packing> |
| 28 | 48 | <property name="left_attach">1</property> | 50 | <property name="left_attach">1</property> |
| 29 | 49 | <property name="right_attach">2</property> | 51 | <property name="right_attach">2</property> |
| 30 | 52 | <property name="y_options">GTK_FILL</property> | ||
| 31 | 50 | </packing> | 53 | </packing> |
| 32 | 51 | </child> | 54 | </child> |
| 33 | 52 | <child> | 55 | <child> |
| 34 | @@ -58,7 +61,6 @@ | |||
| 35 | 58 | <property name="draw_indicator">True</property> | 61 | <property name="draw_indicator">True</property> |
| 36 | 59 | </object> | 62 | </object> |
| 37 | 60 | <packing> | 63 | <packing> |
| 38 | 61 | <property name="left_attach">1</property> | ||
| 39 | 62 | <property name="right_attach">2</property> | 64 | <property name="right_attach">2</property> |
| 40 | 63 | <property name="top_attach">1</property> | 65 | <property name="top_attach">1</property> |
| 41 | 64 | <property name="bottom_attach">2</property> | 66 | <property name="bottom_attach">2</property> |
| 42 | @@ -66,9 +68,6 @@ | |||
| 43 | 66 | <property name="y_options"></property> | 68 | <property name="y_options"></property> |
| 44 | 67 | </packing> | 69 | </packing> |
| 45 | 68 | </child> | 70 | </child> |
| 46 | 69 | <child> | ||
| 47 | 70 | <placeholder/> | ||
| 48 | 71 | </child> | ||
| 49 | 72 | </object> | 71 | </object> |
| 50 | 73 | </child> | 72 | </child> |
| 51 | 74 | </object> | 73 | </object> |
| 52 | @@ -92,9 +91,10 @@ | |||
| 53 | 92 | <child> | 91 | <child> |
| 54 | 93 | <object class="GtkTable" id="table_wireless"> | 92 | <object class="GtkTable" id="table_wireless"> |
| 55 | 94 | <property name="visible">True</property> | 93 | <property name="visible">True</property> |
| 57 | 95 | <property name="n_rows">8</property> | 94 | <property name="n_rows">3</property> |
| 58 | 96 | <property name="n_columns">2</property> | 95 | <property name="n_columns">2</property> |
| 59 | 97 | <property name="column_spacing">6</property> | 96 | <property name="column_spacing">6</property> |
| 60 | 97 | <property name="row_spacing">6</property> | ||
| 61 | 98 | <child> | 98 | <child> |
| 62 | 99 | <object class="GtkLabel" id="label5"> | 99 | <object class="GtkLabel" id="label5"> |
| 63 | 100 | <property name="visible">True</property> | 100 | <property name="visible">True</property> |
| 64 | @@ -109,10 +109,12 @@ | |||
| 65 | 109 | <child> | 109 | <child> |
| 66 | 110 | <object class="GtkLabel" id="label_mode"> | 110 | <object class="GtkLabel" id="label_mode"> |
| 67 | 111 | <property name="visible">True</property> | 111 | <property name="visible">True</property> |
| 68 | 112 | <property name="xalign">0</property> | ||
| 69 | 112 | </object> | 113 | </object> |
| 70 | 113 | <packing> | 114 | <packing> |
| 71 | 114 | <property name="left_attach">1</property> | 115 | <property name="left_attach">1</property> |
| 72 | 115 | <property name="right_attach">2</property> | 116 | <property name="right_attach">2</property> |
| 73 | 117 | <property name="y_options">GTK_FILL</property> | ||
| 74 | 116 | </packing> | 118 | </packing> |
| 75 | 117 | </child> | 119 | </child> |
| 76 | 118 | <child> | 120 | <child> |
| 77 | @@ -144,12 +146,14 @@ | |||
| 78 | 144 | <child> | 146 | <child> |
| 79 | 145 | <object class="GtkLabel" id="label_security"> | 147 | <object class="GtkLabel" id="label_security"> |
| 80 | 146 | <property name="visible">True</property> | 148 | <property name="visible">True</property> |
| 81 | 149 | <property name="xalign">0</property> | ||
| 82 | 147 | </object> | 150 | </object> |
| 83 | 148 | <packing> | 151 | <packing> |
| 84 | 149 | <property name="left_attach">1</property> | 152 | <property name="left_attach">1</property> |
| 85 | 150 | <property name="right_attach">2</property> | 153 | <property name="right_attach">2</property> |
| 86 | 151 | <property name="top_attach">1</property> | 154 | <property name="top_attach">1</property> |
| 87 | 152 | <property name="bottom_attach">2</property> | 155 | <property name="bottom_attach">2</property> |
| 88 | 156 | <property name="y_options">GTK_FILL</property> | ||
| 89 | 153 | </packing> | 157 | </packing> |
| 90 | 154 | </child> | 158 | </child> |
| 91 | 155 | <child> | 159 | <child> |
| 92 | @@ -164,38 +168,9 @@ | |||
| 93 | 164 | <property name="right_attach">2</property> | 168 | <property name="right_attach">2</property> |
| 94 | 165 | <property name="top_attach">2</property> | 169 | <property name="top_attach">2</property> |
| 95 | 166 | <property name="bottom_attach">3</property> | 170 | <property name="bottom_attach">3</property> |
| 96 | 171 | <property name="y_options">GTK_FILL</property> | ||
| 97 | 167 | </packing> | 172 | </packing> |
| 98 | 168 | </child> | 173 | </child> |
| 99 | 169 | <child> | ||
| 100 | 170 | <placeholder/> | ||
| 101 | 171 | </child> | ||
| 102 | 172 | <child> | ||
| 103 | 173 | <placeholder/> | ||
| 104 | 174 | </child> | ||
| 105 | 175 | <child> | ||
| 106 | 176 | <placeholder/> | ||
| 107 | 177 | </child> | ||
| 108 | 178 | <child> | ||
| 109 | 179 | <placeholder/> | ||
| 110 | 180 | </child> | ||
| 111 | 181 | <child> | ||
| 112 | 182 | <placeholder/> | ||
| 113 | 183 | </child> | ||
| 114 | 184 | <child> | ||
| 115 | 185 | <placeholder/> | ||
| 116 | 186 | </child> | ||
| 117 | 187 | <child> | ||
| 118 | 188 | <placeholder/> | ||
| 119 | 189 | </child> | ||
| 120 | 190 | <child> | ||
| 121 | 191 | <placeholder/> | ||
| 122 | 192 | </child> | ||
| 123 | 193 | <child> | ||
| 124 | 194 | <placeholder/> | ||
| 125 | 195 | </child> | ||
| 126 | 196 | <child> | ||
| 127 | 197 | <placeholder/> | ||
| 128 | 198 | </child> | ||
| 129 | 199 | </object> | 174 | </object> |
| 130 | 200 | </child> | 175 | </child> |
| 131 | 201 | </object> | 176 | </object> |
| 132 | @@ -207,7 +182,6 @@ | |||
| 133 | 207 | <object class="GtkLabel" id="label2"> | 182 | <object class="GtkLabel" id="label2"> |
| 134 | 208 | <property name="visible">True</property> | 183 | <property name="visible">True</property> |
| 135 | 209 | <property name="label" translatable="yes">Wireless</property> | 184 | <property name="label" translatable="yes">Wireless</property> |
| 136 | 210 | <property name="ellipsize">start</property> | ||
| 137 | 211 | </object> | 185 | </object> |
| 138 | 212 | <packing> | 186 | <packing> |
| 139 | 213 | <property name="position">1</property> | 187 | <property name="position">1</property> |
| 140 | @@ -222,11 +196,12 @@ | |||
| 141 | 222 | <property name="left_padding">24</property> | 196 | <property name="left_padding">24</property> |
| 142 | 223 | <property name="right_padding">12</property> | 197 | <property name="right_padding">12</property> |
| 143 | 224 | <child> | 198 | <child> |
| 145 | 225 | <object class="GtkTable" id="table_ipv"> | 199 | <object class="GtkTable" id="table_ipv4"> |
| 146 | 226 | <property name="visible">True</property> | 200 | <property name="visible">True</property> |
| 148 | 227 | <property name="n_rows">8</property> | 201 | <property name="n_rows">4</property> |
| 149 | 228 | <property name="n_columns">2</property> | 202 | <property name="n_columns">2</property> |
| 150 | 229 | <property name="column_spacing">6</property> | 203 | <property name="column_spacing">6</property> |
| 151 | 204 | <property name="row_spacing">6</property> | ||
| 152 | 230 | <child> | 205 | <child> |
| 153 | 231 | <object class="GtkLabel" id="label10"> | 206 | <object class="GtkLabel" id="label10"> |
| 154 | 232 | <property name="visible">True</property> | 207 | <property name="visible">True</property> |
| 155 | @@ -288,6 +263,7 @@ | |||
| 156 | 288 | <property name="right_attach">2</property> | 263 | <property name="right_attach">2</property> |
| 157 | 289 | <property name="top_attach">1</property> | 264 | <property name="top_attach">1</property> |
| 158 | 290 | <property name="bottom_attach">2</property> | 265 | <property name="bottom_attach">2</property> |
| 159 | 266 | <property name="y_options">GTK_FILL</property> | ||
| 160 | 291 | </packing> | 267 | </packing> |
| 161 | 292 | </child> | 268 | </child> |
| 162 | 293 | <child> | 269 | <child> |
| 163 | @@ -301,6 +277,7 @@ | |||
| 164 | 301 | <property name="right_attach">2</property> | 277 | <property name="right_attach">2</property> |
| 165 | 302 | <property name="top_attach">2</property> | 278 | <property name="top_attach">2</property> |
| 166 | 303 | <property name="bottom_attach">3</property> | 279 | <property name="bottom_attach">3</property> |
| 167 | 280 | <property name="y_options">GTK_FILL</property> | ||
| 168 | 304 | </packing> | 281 | </packing> |
| 169 | 305 | </child> | 282 | </child> |
| 170 | 306 | <child> | 283 | <child> |
| 171 | @@ -314,6 +291,7 @@ | |||
| 172 | 314 | <property name="right_attach">2</property> | 291 | <property name="right_attach">2</property> |
| 173 | 315 | <property name="top_attach">3</property> | 292 | <property name="top_attach">3</property> |
| 174 | 316 | <property name="bottom_attach">4</property> | 293 | <property name="bottom_attach">4</property> |
| 175 | 294 | <property name="y_options">GTK_FILL</property> | ||
| 176 | 317 | </packing> | 295 | </packing> |
| 177 | 318 | </child> | 296 | </child> |
| 178 | 319 | <child> | 297 | <child> |
| 179 | @@ -323,32 +301,9 @@ | |||
| 180 | 323 | <packing> | 301 | <packing> |
| 181 | 324 | <property name="left_attach">1</property> | 302 | <property name="left_attach">1</property> |
| 182 | 325 | <property name="right_attach">2</property> | 303 | <property name="right_attach">2</property> |
| 183 | 304 | <property name="y_options">GTK_FILL</property> | ||
| 184 | 326 | </packing> | 305 | </packing> |
| 185 | 327 | </child> | 306 | </child> |
| 186 | 328 | <child> | ||
| 187 | 329 | <placeholder/> | ||
| 188 | 330 | </child> | ||
| 189 | 331 | <child> | ||
| 190 | 332 | <placeholder/> | ||
| 191 | 333 | </child> | ||
| 192 | 334 | <child> | ||
| 193 | 335 | <placeholder/> | ||
| 194 | 336 | </child> | ||
| 195 | 337 | <child> | ||
| 196 | 338 | <placeholder/> | ||
| 197 | 339 | </child> | ||
| 198 | 340 | <child> | ||
| 199 | 341 | <placeholder/> | ||
| 200 | 342 | </child> | ||
| 201 | 343 | <child> | ||
| 202 | 344 | <placeholder/> | ||
| 203 | 345 | </child> | ||
| 204 | 346 | <child> | ||
| 205 | 347 | <placeholder/> | ||
| 206 | 348 | </child> | ||
| 207 | 349 | <child> | ||
| 208 | 350 | <placeholder/> | ||
| 209 | 351 | </child> | ||
| 210 | 352 | </object> | 307 | </object> |
| 211 | 353 | </child> | 308 | </child> |
| 212 | 354 | </object> | 309 | </object> |
| 213 | @@ -376,9 +331,10 @@ | |||
| 214 | 376 | <child> | 331 | <child> |
| 215 | 377 | <object class="GtkTable" id="table_dns"> | 332 | <object class="GtkTable" id="table_dns"> |
| 216 | 378 | <property name="visible">True</property> | 333 | <property name="visible">True</property> |
| 218 | 379 | <property name="n_rows">8</property> | 334 | <property name="n_rows">2</property> |
| 219 | 380 | <property name="n_columns">2</property> | 335 | <property name="n_columns">2</property> |
| 220 | 381 | <property name="column_spacing">6</property> | 336 | <property name="column_spacing">6</property> |
| 221 | 337 | <property name="row_spacing">6</property> | ||
| 222 | 382 | <child> | 338 | <child> |
| 223 | 383 | <object class="GtkLabel" id="label6"> | 339 | <object class="GtkLabel" id="label6"> |
| 224 | 384 | <property name="visible">True</property> | 340 | <property name="visible">True</property> |
| 225 | @@ -412,10 +368,11 @@ | |||
| 226 | 412 | <packing> | 368 | <packing> |
| 227 | 413 | <property name="left_attach">1</property> | 369 | <property name="left_attach">1</property> |
| 228 | 414 | <property name="right_attach">2</property> | 370 | <property name="right_attach">2</property> |
| 229 | 371 | <property name="y_options">GTK_FILL</property> | ||
| 230 | 415 | </packing> | 372 | </packing> |
| 231 | 416 | </child> | 373 | </child> |
| 232 | 417 | <child> | 374 | <child> |
| 234 | 418 | <object class="GtkEntry" id="entry_domains"> | 375 | <object class="GtkEntry" id="entry_domains"> |
| 235 | 419 | <property name="visible">True</property> | 376 | <property name="visible">True</property> |
| 236 | 420 | <property name="can_focus">True</property> | 377 | <property name="can_focus">True</property> |
| 237 | 421 | <property name="invisible_char">●</property> | 378 | <property name="invisible_char">●</property> |
| 238 | @@ -425,44 +382,9 @@ | |||
| 239 | 425 | <property name="right_attach">2</property> | 382 | <property name="right_attach">2</property> |
| 240 | 426 | <property name="top_attach">1</property> | 383 | <property name="top_attach">1</property> |
| 241 | 427 | <property name="bottom_attach">2</property> | 384 | <property name="bottom_attach">2</property> |
| 242 | 385 | <property name="y_options">GTK_FILL</property> | ||
| 243 | 428 | </packing> | 386 | </packing> |
| 244 | 429 | </child> | 387 | </child> |
| 245 | 430 | <child> | ||
| 246 | 431 | <placeholder/> | ||
| 247 | 432 | </child> | ||
| 248 | 433 | <child> | ||
| 249 | 434 | <placeholder/> | ||
| 250 | 435 | </child> | ||
| 251 | 436 | <child> | ||
| 252 | 437 | <placeholder/> | ||
| 253 | 438 | </child> | ||
| 254 | 439 | <child> | ||
| 255 | 440 | <placeholder/> | ||
| 256 | 441 | </child> | ||
| 257 | 442 | <child> | ||
| 258 | 443 | <placeholder/> | ||
| 259 | 444 | </child> | ||
| 260 | 445 | <child> | ||
| 261 | 446 | <placeholder/> | ||
| 262 | 447 | </child> | ||
| 263 | 448 | <child> | ||
| 264 | 449 | <placeholder/> | ||
| 265 | 450 | </child> | ||
| 266 | 451 | <child> | ||
| 267 | 452 | <placeholder/> | ||
| 268 | 453 | </child> | ||
| 269 | 454 | <child> | ||
| 270 | 455 | <placeholder/> | ||
| 271 | 456 | </child> | ||
| 272 | 457 | <child> | ||
| 273 | 458 | <placeholder/> | ||
| 274 | 459 | </child> | ||
| 275 | 460 | <child> | ||
| 276 | 461 | <placeholder/> | ||
| 277 | 462 | </child> | ||
| 278 | 463 | <child> | ||
| 279 | 464 | <placeholder/> | ||
| 280 | 465 | </child> | ||
| 281 | 466 | </object> | 388 | </object> |
| 282 | 467 | </child> | 389 | </child> |
| 283 | 468 | </object> | 390 | </object> |
| 284 | @@ -490,9 +412,10 @@ | |||
| 285 | 490 | <child> | 412 | <child> |
| 286 | 491 | <object class="GtkTable" id="table_ipv6"> | 413 | <object class="GtkTable" id="table_ipv6"> |
| 287 | 492 | <property name="visible">True</property> | 414 | <property name="visible">True</property> |
| 289 | 493 | <property name="n_rows">8</property> | 415 | <property name="n_rows">4</property> |
| 290 | 494 | <property name="n_columns">2</property> | 416 | <property name="n_columns">2</property> |
| 291 | 495 | <property name="column_spacing">6</property> | 417 | <property name="column_spacing">6</property> |
| 292 | 418 | <property name="row_spacing">6</property> | ||
| 293 | 496 | <child> | 419 | <child> |
| 294 | 497 | <object class="GtkLabel" id="label11"> | 420 | <object class="GtkLabel" id="label11"> |
| 295 | 498 | <property name="visible">True</property> | 421 | <property name="visible">True</property> |
| 296 | @@ -554,6 +477,7 @@ | |||
| 297 | 554 | <property name="right_attach">2</property> | 477 | <property name="right_attach">2</property> |
| 298 | 555 | <property name="top_attach">1</property> | 478 | <property name="top_attach">1</property> |
| 299 | 556 | <property name="bottom_attach">2</property> | 479 | <property name="bottom_attach">2</property> |
| 300 | 480 | <property name="y_options">GTK_FILL</property> | ||
| 301 | 557 | </packing> | 481 | </packing> |
| 302 | 558 | </child> | 482 | </child> |
| 303 | 559 | <child> | 483 | <child> |
| 304 | @@ -567,6 +491,7 @@ | |||
| 305 | 567 | <property name="right_attach">2</property> | 491 | <property name="right_attach">2</property> |
| 306 | 568 | <property name="top_attach">2</property> | 492 | <property name="top_attach">2</property> |
| 307 | 569 | <property name="bottom_attach">3</property> | 493 | <property name="bottom_attach">3</property> |
| 308 | 494 | <property name="y_options">GTK_FILL</property> | ||
| 309 | 570 | </packing> | 495 | </packing> |
| 310 | 571 | </child> | 496 | </child> |
| 311 | 572 | <child> | 497 | <child> |
| 312 | @@ -580,6 +505,7 @@ | |||
| 313 | 580 | <property name="right_attach">2</property> | 505 | <property name="right_attach">2</property> |
| 314 | 581 | <property name="top_attach">3</property> | 506 | <property name="top_attach">3</property> |
| 315 | 582 | <property name="bottom_attach">4</property> | 507 | <property name="bottom_attach">4</property> |
| 316 | 508 | <property name="y_options">GTK_FILL</property> | ||
| 317 | 583 | </packing> | 509 | </packing> |
| 318 | 584 | </child> | 510 | </child> |
| 319 | 585 | <child> | 511 | <child> |
| 320 | @@ -589,32 +515,9 @@ | |||
| 321 | 589 | <packing> | 515 | <packing> |
| 322 | 590 | <property name="left_attach">1</property> | 516 | <property name="left_attach">1</property> |
| 323 | 591 | <property name="right_attach">2</property> | 517 | <property name="right_attach">2</property> |
| 324 | 518 | <property name="y_options">GTK_FILL</property> | ||
| 325 | 592 | </packing> | 519 | </packing> |
| 326 | 593 | </child> | 520 | </child> |
| 327 | 594 | <child> | ||
| 328 | 595 | <placeholder/> | ||
| 329 | 596 | </child> | ||
| 330 | 597 | <child> | ||
| 331 | 598 | <placeholder/> | ||
| 332 | 599 | </child> | ||
| 333 | 600 | <child> | ||
| 334 | 601 | <placeholder/> | ||
| 335 | 602 | </child> | ||
| 336 | 603 | <child> | ||
| 337 | 604 | <placeholder/> | ||
| 338 | 605 | </child> | ||
| 339 | 606 | <child> | ||
| 340 | 607 | <placeholder/> | ||
| 341 | 608 | </child> | ||
| 342 | 609 | <child> | ||
| 343 | 610 | <placeholder/> | ||
| 344 | 611 | </child> | ||
| 345 | 612 | <child> | ||
| 346 | 613 | <placeholder/> | ||
| 347 | 614 | </child> | ||
| 348 | 615 | <child> | ||
| 349 | 616 | <placeholder/> | ||
| 350 | 617 | </child> | ||
| 351 | 618 | </object> | 521 | </object> |
| 352 | 619 | </child> | 522 | </child> |
| 353 | 620 | </object> | 523 | </object> |
| 354 | @@ -642,9 +545,9 @@ | |||
| 355 | 642 | <child> | 545 | <child> |
| 356 | 643 | <object class="GtkTable" id="table_main5"> | 546 | <object class="GtkTable" id="table_main5"> |
| 357 | 644 | <property name="visible">True</property> | 547 | <property name="visible">True</property> |
| 358 | 645 | <property name="n_rows">8</property> | ||
| 359 | 646 | <property name="n_columns">2</property> | 548 | <property name="n_columns">2</property> |
| 360 | 647 | <property name="column_spacing">6</property> | 549 | <property name="column_spacing">6</property> |
| 361 | 550 | <property name="row_spacing">6</property> | ||
| 362 | 648 | <child> | 551 | <child> |
| 363 | 649 | <object class="GtkLabel" id="label12"> | 552 | <object class="GtkLabel" id="label12"> |
| 364 | 650 | <property name="visible">True</property> | 553 | <property name="visible">True</property> |
| 365 | @@ -665,50 +568,9 @@ | |||
| 366 | 665 | <packing> | 568 | <packing> |
| 367 | 666 | <property name="left_attach">1</property> | 569 | <property name="left_attach">1</property> |
| 368 | 667 | <property name="right_attach">2</property> | 570 | <property name="right_attach">2</property> |
| 369 | 571 | <property name="y_options">GTK_FILL</property> | ||
| 370 | 668 | </packing> | 572 | </packing> |
| 371 | 669 | </child> | 573 | </child> |
| 372 | 670 | <child> | ||
| 373 | 671 | <placeholder/> | ||
| 374 | 672 | </child> | ||
| 375 | 673 | <child> | ||
| 376 | 674 | <placeholder/> | ||
| 377 | 675 | </child> | ||
| 378 | 676 | <child> | ||
| 379 | 677 | <placeholder/> | ||
| 380 | 678 | </child> | ||
| 381 | 679 | <child> | ||
| 382 | 680 | <placeholder/> | ||
| 383 | 681 | </child> | ||
| 384 | 682 | <child> | ||
| 385 | 683 | <placeholder/> | ||
| 386 | 684 | </child> | ||
| 387 | 685 | <child> | ||
| 388 | 686 | <placeholder/> | ||
| 389 | 687 | </child> | ||
| 390 | 688 | <child> | ||
| 391 | 689 | <placeholder/> | ||
| 392 | 690 | </child> | ||
| 393 | 691 | <child> | ||
| 394 | 692 | <placeholder/> | ||
| 395 | 693 | </child> | ||
| 396 | 694 | <child> | ||
| 397 | 695 | <placeholder/> | ||
| 398 | 696 | </child> | ||
| 399 | 697 | <child> | ||
| 400 | 698 | <placeholder/> | ||
| 401 | 699 | </child> | ||
| 402 | 700 | <child> | ||
| 403 | 701 | <placeholder/> | ||
| 404 | 702 | </child> | ||
| 405 | 703 | <child> | ||
| 406 | 704 | <placeholder/> | ||
| 407 | 705 | </child> | ||
| 408 | 706 | <child> | ||
| 409 | 707 | <placeholder/> | ||
| 410 | 708 | </child> | ||
| 411 | 709 | <child> | ||
| 412 | 710 | <placeholder/> | ||
| 413 | 711 | </child> | ||
| 414 | 712 | </object> | 574 | </object> |
| 415 | 713 | </child> | 575 | </child> |
| 416 | 714 | </object> | 576 | </object> |
| 417 | @@ -822,4 +684,30 @@ | |||
| 418 | 822 | </row> | 684 | </row> |
| 419 | 823 | </data> | 685 | </data> |
| 420 | 824 | </object> | 686 | </object> |
| 421 | 687 | <object class="GtkSizeGroup" id="sizegroup_wireless"> | ||
| 422 | 688 | <property name="mode">vertical</property> | ||
| 423 | 689 | <widgets> | ||
| 424 | 690 | <widget name="label_mode"/> | ||
| 425 | 691 | <widget name="label_security"/> | ||
| 426 | 692 | <widget name="entry_passphrase"/> | ||
| 427 | 693 | </widgets> | ||
| 428 | 694 | </object> | ||
| 429 | 695 | <object class="GtkSizeGroup" id="sizegroup_ipv4"> | ||
| 430 | 696 | <property name="mode">vertical</property> | ||
| 431 | 697 | <widgets> | ||
| 432 | 698 | <widget name="entry_ipv4_address"/> | ||
| 433 | 699 | <widget name="entry_ipv4_netmask"/> | ||
| 434 | 700 | <widget name="entry_ipv4_gateway"/> | ||
| 435 | 701 | <widget name="combobox_ipv4_method"/> | ||
| 436 | 702 | </widgets> | ||
| 437 | 703 | </object> | ||
| 438 | 704 | <object class="GtkSizeGroup" id="sizegroup_ipv6"> | ||
| 439 | 705 | <property name="mode">vertical</property> | ||
| 440 | 706 | <widgets> | ||
| 441 | 707 | <widget name="entry_ipv6_address"/> | ||
| 442 | 708 | <widget name="entry_ipv6_prefix_length"/> | ||
| 443 | 709 | <widget name="entry_ipv6_gateway"/> | ||
| 444 | 710 | <widget name="combobox_ipv6_method"/> | ||
| 445 | 711 | </widgets> | ||
| 446 | 712 | </object> | ||
| 447 | 825 | </interface> | 713 | </interface> |
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