Merge lp:~mmcg069/software-center/dialog-fixes into lp:software-center
- dialog-fixes
- Merge into trunk
Proposed by
Matthew Paul Thomas
| Status: | Merged |
|---|---|
| Merged at revision: | 2463 |
| Proposed branch: | lp:~mmcg069/software-center/dialog-fixes |
| Merge into: | lp:software-center |
| Diff against target: |
336 lines (+137/-155) 1 file modified
data/ui/gtk3/dialogs.ui (+137/-155) |
| To merge this branch: | bzr merge lp:~mmcg069/software-center/dialog-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gary Lasker (community) | Approve | ||
| Michael Vogt | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
Does not fix bug 825959 or bug 844014, but lessens the severity of both bugs.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'data/ui/gtk3/dialogs.ui' | |||
| 2 | --- data/ui/gtk3/dialogs.ui 2011-09-07 16:57:48 +0000 | |||
| 3 | +++ data/ui/gtk3/dialogs.ui 2011-09-29 14:16:00 +0000 | |||
| 4 | @@ -59,88 +59,77 @@ | |||
| 5 | 59 | </packing> | 59 | </packing> |
| 6 | 60 | </child> | 60 | </child> |
| 7 | 61 | <child> | 61 | <child> |
| 9 | 62 | <object class="GtkAlignment" id="alignment4"> | 62 | <object class="GtkGrid" id="grid1"> |
| 10 | 63 | <property name="visible">True</property> | 63 | <property name="visible">True</property> |
| 11 | 64 | <property name="can_focus">False</property> | 64 | <property name="can_focus">False</property> |
| 16 | 65 | <property name="top_padding">6</property> | 65 | <property name="row_spacing">24</property> |
| 17 | 66 | <property name="bottom_padding">6</property> | 66 | <property name="column_spacing">12</property> |
| 18 | 67 | <property name="left_padding">6</property> | 67 | <property name="n_rows">2</property> |
| 19 | 68 | <property name="right_padding">6</property> | 68 | <property name="n_columns">2</property> |
| 20 | 69 | <child> | 69 | <child> |
| 22 | 70 | <object class="GtkTable" id="table3"> | 70 | <object class="GtkLabel" id="label_broken_cache"> |
| 23 | 71 | <property name="visible">True</property> | 71 | <property name="visible">True</property> |
| 24 | 72 | <property name="can_focus">False</property> | 72 | <property name="can_focus">False</property> |
| 33 | 73 | <property name="n_rows">2</property> | 73 | <property name="xalign">0</property> |
| 34 | 74 | <property name="n_columns">2</property> | 74 | <property name="label" translatable="yes"><span weight="bold" font_size="large">Items cannot be installed or removed |
| 27 | 75 | <child> | ||
| 28 | 76 | <object class="GtkLabel" id="label_broken_cache"> | ||
| 29 | 77 | <property name="visible">True</property> | ||
| 30 | 78 | <property name="can_focus">False</property> | ||
| 31 | 79 | <property name="xalign">0</property> | ||
| 32 | 80 | <property name="label" translatable="yes"><span weight="bold" font_size="large">Items cannot be installed or removed | ||
| 35 | 81 | until the package catalog is repaired. Do you want to repair it now?</span></property> | 75 | until the package catalog is repaired. Do you want to repair it now?</span></property> |
| 93 | 82 | <property name="use_markup">True</property> | 76 | <property name="use_markup">True</property> |
| 94 | 83 | <property name="wrap">True</property> | 77 | <property name="wrap">True</property> |
| 95 | 84 | </object> | 78 | </object> |
| 96 | 85 | <packing> | 79 | <packing> |
| 97 | 86 | <property name="left_attach">1</property> | 80 | <property name="left_attach">1</property> |
| 98 | 87 | <property name="right_attach">2</property> | 81 | <property name="top_attach">0</property> |
| 99 | 88 | <property name="y_options"></property> | 82 | <property name="width">1</property> |
| 100 | 89 | <property name="x_padding">6</property> | 83 | <property name="height">1</property> |
| 101 | 90 | <property name="y_padding">6</property> | 84 | </packing> |
| 102 | 91 | </packing> | 85 | </child> |
| 103 | 92 | </child> | 86 | <child> |
| 104 | 93 | <child> | 87 | <object class="GtkImage" id="image_package_icon2"> |
| 105 | 94 | <object class="GtkImage" id="image_package_icon2"> | 88 | <property name="visible">True</property> |
| 106 | 95 | <property name="visible">True</property> | 89 | <property name="can_focus">False</property> |
| 107 | 96 | <property name="can_focus">False</property> | 90 | <property name="pixel_size">48</property> |
| 108 | 97 | <property name="pixel_size">48</property> | 91 | <property name="icon_name">softwarecenter</property> |
| 109 | 98 | <property name="icon_name">softwarecenter</property> | 92 | </object> |
| 110 | 99 | </object> | 93 | <packing> |
| 111 | 100 | <packing> | 94 | <property name="left_attach">0</property> |
| 112 | 101 | <property name="x_options"></property> | 95 | <property name="top_attach">0</property> |
| 113 | 102 | <property name="y_options"></property> | 96 | <property name="width">1</property> |
| 114 | 103 | <property name="x_padding">6</property> | 97 | <property name="height">1</property> |
| 115 | 104 | <property name="y_padding">6</property> | 98 | </packing> |
| 116 | 105 | </packing> | 99 | </child> |
| 117 | 106 | </child> | 100 | <child> |
| 118 | 107 | <child> | 101 | <object class="GtkLabel" id="label_broken_cache1"> |
| 119 | 108 | <object class="GtkLabel" id="label_broken_cache1"> | 102 | <property name="visible">True</property> |
| 120 | 109 | <property name="visible">True</property> | 103 | <property name="can_focus">False</property> |
| 121 | 110 | <property name="can_focus">False</property> | 104 | <property name="xalign">0</property> |
| 122 | 111 | <property name="xalign">0</property> | 105 | <property name="label" translatable="yes">Once Update Manager has finished the repairs, you can close it and return to the store.</property> |
| 123 | 112 | <property name="label" translatable="yes">Once Update Manager has finished the repairs, you can close it and return to the store.</property> | 106 | <property name="use_markup">True</property> |
| 124 | 113 | <property name="use_markup">True</property> | 107 | <property name="wrap">True</property> |
| 125 | 114 | <property name="wrap">True</property> | 108 | </object> |
| 126 | 115 | </object> | 109 | <packing> |
| 127 | 116 | <packing> | 110 | <property name="left_attach">1</property> |
| 128 | 117 | <property name="left_attach">1</property> | 111 | <property name="top_attach">1</property> |
| 129 | 118 | <property name="right_attach">2</property> | 112 | <property name="width">1</property> |
| 130 | 119 | <property name="top_attach">1</property> | 113 | <property name="height">1</property> |
| 131 | 120 | <property name="bottom_attach">2</property> | 114 | </packing> |
| 132 | 121 | <property name="y_options"></property> | 115 | </child> |
| 133 | 122 | <property name="y_padding">6</property> | 116 | <child> |
| 134 | 123 | </packing> | 117 | <object class="GtkLabel" id="label1"> |
| 135 | 124 | </child> | 118 | <property name="visible">True</property> |
| 136 | 125 | <child> | 119 | <property name="can_focus">False</property> |
| 137 | 126 | <object class="GtkLabel" id="label1"> | 120 | <property name="label" translatable="yes"> </property> |
| 138 | 127 | <property name="visible">True</property> | 121 | </object> |
| 139 | 128 | <property name="can_focus">False</property> | 122 | <packing> |
| 140 | 129 | <property name="label" translatable="yes"> </property> | 123 | <property name="left_attach">0</property> |
| 141 | 130 | </object> | 124 | <property name="top_attach">1</property> |
| 142 | 131 | <packing> | 125 | <property name="width">1</property> |
| 143 | 132 | <property name="top_attach">1</property> | 126 | <property name="height">1</property> |
| 144 | 133 | <property name="bottom_attach">2</property> | 127 | </packing> |
| 88 | 134 | <property name="x_options"></property> | ||
| 89 | 135 | <property name="y_options"></property> | ||
| 90 | 136 | </packing> | ||
| 91 | 137 | </child> | ||
| 92 | 138 | </object> | ||
| 145 | 139 | </child> | 128 | </child> |
| 146 | 140 | </object> | 129 | </object> |
| 147 | 141 | <packing> | 130 | <packing> |
| 150 | 142 | <property name="expand">False</property> | 131 | <property name="expand">True</property> |
| 151 | 143 | <property name="fill">False</property> | 132 | <property name="fill">True</property> |
| 152 | 144 | <property name="position">1</property> | 133 | <property name="position">1</property> |
| 153 | 145 | </packing> | 134 | </packing> |
| 154 | 146 | </child> | 135 | </child> |
| 155 | @@ -302,10 +291,12 @@ | |||
| 156 | 302 | <property name="can_focus">False</property> | 291 | <property name="can_focus">False</property> |
| 157 | 303 | <property name="border_width">5</property> | 292 | <property name="border_width">5</property> |
| 158 | 304 | <property name="title"> </property> | 293 | <property name="title"> </property> |
| 159 | 294 | <property name="resizable">False</property> | ||
| 160 | 305 | <property name="modal">True</property> | 295 | <property name="modal">True</property> |
| 162 | 306 | <property name="window_position">center</property> | 296 | <property name="window_position">center-on-parent</property> |
| 163 | 307 | <property name="type_hint">dialog</property> | 297 | <property name="type_hint">dialog</property> |
| 164 | 308 | <property name="skip_taskbar_hint">True</property> | 298 | <property name="skip_taskbar_hint">True</property> |
| 165 | 299 | <property name="deletable">False</property> | ||
| 166 | 309 | <child internal-child="vbox"> | 300 | <child internal-child="vbox"> |
| 167 | 310 | <object class="GtkBox" id="dialog-vbox6"> | 301 | <object class="GtkBox" id="dialog-vbox6"> |
| 168 | 311 | <property name="visible">True</property> | 302 | <property name="visible">True</property> |
| 169 | @@ -356,95 +347,86 @@ | |||
| 170 | 356 | </packing> | 347 | </packing> |
| 171 | 357 | </child> | 348 | </child> |
| 172 | 358 | <child> | 349 | <child> |
| 174 | 359 | <object class="GtkAlignment" id="alignment2"> | 350 | <object class="GtkGrid" id="grid2"> |
| 175 | 360 | <property name="visible">True</property> | 351 | <property name="visible">True</property> |
| 176 | 361 | <property name="can_focus">False</property> | 352 | <property name="can_focus">False</property> |
| 223 | 362 | <property name="top_padding">6</property> | 353 | <property name="row_spacing">6</property> |
| 224 | 363 | <property name="bottom_padding">6</property> | 354 | <property name="column_spacing">6</property> |
| 225 | 364 | <property name="left_padding">6</property> | 355 | <property name="n_rows">2</property> |
| 226 | 365 | <property name="right_padding">6</property> | 356 | <property name="n_columns">2</property> |
| 227 | 366 | <child> | 357 | <child> |
| 228 | 367 | <object class="GtkTable" id="table1"> | 358 | <object class="GtkImage" id="image_package_icon"> |
| 229 | 368 | <property name="visible">True</property> | 359 | <property name="visible">True</property> |
| 230 | 369 | <property name="can_focus">False</property> | 360 | <property name="can_focus">False</property> |
| 231 | 370 | <property name="n_rows">2</property> | 361 | <property name="pixel_size">48</property> |
| 232 | 371 | <property name="n_columns">2</property> | 362 | <property name="icon_name">applications-other</property> |
| 233 | 372 | <child> | 363 | </object> |
| 234 | 373 | <object class="GtkImage" id="image_package_icon"> | 364 | <packing> |
| 235 | 374 | <property name="visible">True</property> | 365 | <property name="left_attach">0</property> |
| 236 | 375 | <property name="can_focus">False</property> | 366 | <property name="top_attach">0</property> |
| 237 | 376 | <property name="pixel_size">48</property> | 367 | <property name="width">1</property> |
| 238 | 377 | <property name="icon_name">applications-other</property> | 368 | <property name="height">1</property> |
| 239 | 378 | </object> | 369 | </packing> |
| 240 | 379 | <packing> | 370 | </child> |
| 241 | 380 | <property name="x_options"></property> | 371 | <child> |
| 242 | 381 | <property name="y_options"></property> | 372 | <object class="GtkLabel" id="label_dependency_primary"> |
| 243 | 382 | <property name="x_padding">6</property> | 373 | <property name="visible">True</property> |
| 244 | 383 | <property name="y_padding">6</property> | 374 | <property name="can_focus">False</property> |
| 245 | 384 | </packing> | 375 | <property name="xalign">0</property> |
| 246 | 385 | </child> | 376 | <property name="use_markup">True</property> |
| 247 | 386 | <child> | 377 | <property name="wrap">True</property> |
| 248 | 387 | <object class="GtkLabel" id="label_dependency_primary"> | 378 | </object> |
| 249 | 388 | <property name="visible">True</property> | 379 | <packing> |
| 250 | 389 | <property name="can_focus">False</property> | 380 | <property name="left_attach">1</property> |
| 251 | 390 | <property name="xalign">0</property> | 381 | <property name="top_attach">0</property> |
| 252 | 391 | <property name="use_markup">True</property> | 382 | <property name="width">1</property> |
| 253 | 392 | <property name="wrap">True</property> | 383 | <property name="height">1</property> |
| 254 | 393 | </object> | 384 | </packing> |
| 255 | 394 | <packing> | 385 | </child> |
| 256 | 395 | <property name="left_attach">1</property> | 386 | <child> |
| 257 | 396 | <property name="right_attach">2</property> | 387 | <object class="GtkViewport" id="viewport1"> |
| 258 | 397 | <property name="x_options">GTK_FILL</property> | 388 | <property name="visible">True</property> |
| 259 | 398 | <property name="y_options"></property> | 389 | <property name="can_focus">False</property> |
| 260 | 399 | <property name="x_padding">6</property> | 390 | <property name="resize_mode">queue</property> |
| 261 | 400 | <property name="y_padding">6</property> | 391 | <child> |
| 262 | 401 | </packing> | 392 | <object class="GtkScrolledWindow" id="scrolledwindow_dependencies"> |
| 263 | 402 | </child> | 393 | <property name="height_request">150</property> |
| 264 | 403 | <child> | 394 | <property name="visible">True</property> |
| 265 | 404 | <object class="GtkViewport" id="viewport1"> | 395 | <property name="can_focus">True</property> |
| 266 | 405 | <property name="visible">True</property> | 396 | <property name="hscrollbar_policy">never</property> |
| 267 | 406 | <property name="can_focus">False</property> | 397 | <property name="shadow_type">etched-in</property> |
| 222 | 407 | <property name="resize_mode">queue</property> | ||
| 268 | 408 | <child> | 398 | <child> |
| 279 | 409 | <object class="GtkScrolledWindow" id="scrolledwindow_dependencies"> | 399 | <placeholder/> |
| 270 | 410 | <property name="height_request">150</property> | ||
| 271 | 411 | <property name="visible">True</property> | ||
| 272 | 412 | <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> | ||
| 273 | 413 | <property name="can_focus">True</property> | ||
| 274 | 414 | <property name="hscrollbar_policy">never</property> | ||
| 275 | 415 | <child> | ||
| 276 | 416 | <placeholder/> | ||
| 277 | 417 | </child> | ||
| 278 | 418 | </object> | ||
| 280 | 419 | </child> | 400 | </child> |
| 281 | 420 | </object> | 401 | </object> |
| 305 | 421 | <packing> | 402 | </child> |
| 306 | 422 | <property name="left_attach">1</property> | 403 | </object> |
| 307 | 423 | <property name="right_attach">2</property> | 404 | <packing> |
| 308 | 424 | <property name="top_attach">1</property> | 405 | <property name="left_attach">1</property> |
| 309 | 425 | <property name="bottom_attach">2</property> | 406 | <property name="top_attach">1</property> |
| 310 | 426 | <property name="x_padding">6</property> | 407 | <property name="width">1</property> |
| 311 | 427 | <property name="y_padding">6</property> | 408 | <property name="height">1</property> |
| 312 | 428 | </packing> | 409 | </packing> |
| 313 | 429 | </child> | 410 | </child> |
| 314 | 430 | <child> | 411 | <child> |
| 315 | 431 | <object class="GtkLabel" id="label2"> | 412 | <object class="GtkLabel" id="label2"> |
| 316 | 432 | <property name="visible">True</property> | 413 | <property name="visible">True</property> |
| 317 | 433 | <property name="can_focus">False</property> | 414 | <property name="can_focus">False</property> |
| 318 | 434 | <property name="label" translatable="yes"> </property> | 415 | <property name="label" translatable="yes"> </property> |
| 319 | 435 | </object> | 416 | </object> |
| 320 | 436 | <packing> | 417 | <packing> |
| 321 | 437 | <property name="top_attach">1</property> | 418 | <property name="left_attach">1</property> |
| 322 | 438 | <property name="bottom_attach">2</property> | 419 | <property name="top_attach">0</property> |
| 323 | 439 | <property name="x_options"></property> | 420 | <property name="width">1</property> |
| 324 | 440 | <property name="y_options"></property> | 421 | <property name="height">1</property> |
| 325 | 441 | </packing> | 422 | </packing> |
| 326 | 442 | </child> | 423 | </child> |
| 327 | 443 | </object> | 424 | <child> |
| 328 | 425 | <placeholder/> | ||
| 329 | 444 | </child> | 426 | </child> |
| 330 | 445 | </object> | 427 | </object> |
| 331 | 446 | <packing> | 428 | <packing> |
| 333 | 447 | <property name="expand">False</property> | 429 | <property name="expand">True</property> |
| 334 | 448 | <property name="fill">True</property> | 430 | <property name="fill">True</property> |
| 335 | 449 | <property name="position">1</property> | 431 | <property name="position">1</property> |
| 336 | 450 | </packing> | 432 | </packing> |
Agreed, this is a definite improvement. Nice work as always, thanks Matt!