Merge lp:~attente/unity-control-center/region-panel-deprecation-warnings into lp:unity-control-center
- region-panel-deprecation-warnings
- Merge into trunk
Proposed by
William Hua
| Status: | Merged |
|---|---|
| Approved by: | Sebastien Bacher |
| Approved revision: | 12812 |
| Merged at revision: | 12813 |
| Proposed branch: | lp:~attente/unity-control-center/region-panel-deprecation-warnings |
| Merge into: | lp:unity-control-center |
| Diff against target: |
171 lines (+10/-22) 3 files modified
panels/region/gnome-region-panel.ui (+4/-6) panels/region/unity-region-panel-fcitx.ui (+1/-5) panels/region/unity-region-panel-ibus.ui (+5/-11) |
| To merge this branch: | bzr merge lp:~attente/unity-control-center/region-panel-deprecation-warnings |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastien Bacher | Approve | ||
|
Review via email:
|
|||
Commit message
Fix deprecation warnings in region panel.
Description of the change
Fix deprecation warnings in region panel.
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 'panels/region/gnome-region-panel.ui' | |||
| 2 | --- panels/region/gnome-region-panel.ui 2014-03-12 17:29:59 +0000 | |||
| 3 | +++ panels/region/gnome-region-panel.ui 2015-03-31 17:31:23 +0000 | |||
| 4 | @@ -246,8 +246,8 @@ | |||
| 5 | 246 | <object class="GtkGrid" id="table1"> | 246 | <object class="GtkGrid" id="table1"> |
| 6 | 247 | <property name="visible">True</property> | 247 | <property name="visible">True</property> |
| 7 | 248 | <property name="can_focus">False</property> | 248 | <property name="can_focus">False</property> |
| 10 | 249 | <property name="margin_left">12</property> | 249 | <property name="margin_start">12</property> |
| 11 | 250 | <property name="margin_right">12</property> | 250 | <property name="margin_end">12</property> |
| 12 | 251 | <property name="margin_top">12</property> | 251 | <property name="margin_top">12</property> |
| 13 | 252 | <property name="margin_bottom">12</property> | 252 | <property name="margin_bottom">12</property> |
| 14 | 253 | <property name="row_spacing">6</property> | 253 | <property name="row_spacing">6</property> |
| 15 | @@ -1001,7 +1001,6 @@ | |||
| 16 | 1001 | <object class="GtkRadioButton" id="per-window-radio-false"> | 1001 | <object class="GtkRadioButton" id="per-window-radio-false"> |
| 17 | 1002 | <property name="visible">True</property> | 1002 | <property name="visible">True</property> |
| 18 | 1003 | <property name="can_focus">True</property> | 1003 | <property name="can_focus">True</property> |
| 19 | 1004 | <property name="xalign">0</property> | ||
| 20 | 1005 | <property name="label" translatable="yes">Use the same source for all windows</property> | 1004 | <property name="label" translatable="yes">Use the same source for all windows</property> |
| 21 | 1006 | </object> | 1005 | </object> |
| 22 | 1007 | <packing> | 1006 | <packing> |
| 23 | @@ -1015,7 +1014,6 @@ | |||
| 24 | 1015 | <object class="GtkRadioButton" id="per-window-radio-true"> | 1014 | <object class="GtkRadioButton" id="per-window-radio-true"> |
| 25 | 1016 | <property name="visible">True</property> | 1015 | <property name="visible">True</property> |
| 26 | 1017 | <property name="can_focus">True</property> | 1016 | <property name="can_focus">True</property> |
| 27 | 1018 | <property name="xalign">0</property> | ||
| 28 | 1019 | <property name="label" translatable="yes">Allow different sources for each window</property> | 1017 | <property name="label" translatable="yes">Allow different sources for each window</property> |
| 29 | 1020 | <property name="group">per-window-radio-false</property> | 1018 | <property name="group">per-window-radio-false</property> |
| 30 | 1021 | </object> | 1019 | </object> |
| 31 | @@ -1115,7 +1113,7 @@ | |||
| 32 | 1115 | <object class="GtkTable" id="table4"> | 1113 | <object class="GtkTable" id="table4"> |
| 33 | 1116 | <property name="visible">True</property> | 1114 | <property name="visible">True</property> |
| 34 | 1117 | <property name="can_focus">False</property> | 1115 | <property name="can_focus">False</property> |
| 36 | 1118 | <property name="margin_left">12</property> | 1116 | <property name="margin_start">12</property> |
| 37 | 1119 | <property name="margin_top">12</property> | 1117 | <property name="margin_top">12</property> |
| 38 | 1120 | <property name="n_rows">3</property> | 1118 | <property name="n_rows">3</property> |
| 39 | 1121 | <property name="n_columns">2</property> | 1119 | <property name="n_columns">2</property> |
| 40 | @@ -1245,7 +1243,7 @@ | |||
| 41 | 1245 | <object class="GtkTable" id="table5"> | 1243 | <object class="GtkTable" id="table5"> |
| 42 | 1246 | <property name="visible">True</property> | 1244 | <property name="visible">True</property> |
| 43 | 1247 | <property name="can_focus">False</property> | 1245 | <property name="can_focus">False</property> |
| 45 | 1248 | <property name="margin_left">12</property> | 1246 | <property name="margin_start">12</property> |
| 46 | 1249 | <property name="margin_top">12</property> | 1247 | <property name="margin_top">12</property> |
| 47 | 1250 | <property name="n_rows">3</property> | 1248 | <property name="n_rows">3</property> |
| 48 | 1251 | <property name="n_columns">2</property> | 1249 | <property name="n_columns">2</property> |
| 49 | 1252 | 1250 | ||
| 50 | === modified file 'panels/region/unity-region-panel-fcitx.ui' | |||
| 51 | --- panels/region/unity-region-panel-fcitx.ui 2014-09-17 15:21:07 +0000 | |||
| 52 | +++ panels/region/unity-region-panel-fcitx.ui 2015-03-31 17:31:23 +0000 | |||
| 53 | @@ -115,7 +115,7 @@ | |||
| 54 | 115 | <object class="GtkVBox" id="vbox6"> | 115 | <object class="GtkVBox" id="vbox6"> |
| 55 | 116 | <property name="visible">True</property> | 116 | <property name="visible">True</property> |
| 56 | 117 | <property name="can_focus">False</property> | 117 | <property name="can_focus">False</property> |
| 58 | 118 | <property name="margin_right">5</property> | 118 | <property name="margin_end">5</property> |
| 59 | 119 | <child> | 119 | <child> |
| 60 | 120 | <object class="GtkLabel" id="label2"> | 120 | <object class="GtkLabel" id="label2"> |
| 61 | 121 | <property name="visible">True</property> | 121 | <property name="visible">True</property> |
| 62 | @@ -433,7 +433,6 @@ | |||
| 63 | 433 | <property name="visible">True</property> | 433 | <property name="visible">True</property> |
| 64 | 434 | <property name="can_focus">False</property> | 434 | <property name="can_focus">False</property> |
| 65 | 435 | <property name="receives_default">False</property> | 435 | <property name="receives_default">False</property> |
| 66 | 436 | <property name="xalign">0</property> | ||
| 67 | 437 | <property name="active">False</property> | 436 | <property name="active">False</property> |
| 68 | 438 | <property name="draw_indicator">True</property> | 437 | <property name="draw_indicator">True</property> |
| 69 | 439 | </object> | 438 | </object> |
| 70 | @@ -449,7 +448,6 @@ | |||
| 71 | 449 | <property name="visible">True</property> | 448 | <property name="visible">True</property> |
| 72 | 450 | <property name="can_focus">False</property> | 449 | <property name="can_focus">False</property> |
| 73 | 451 | <property name="receives_default">False</property> | 450 | <property name="receives_default">False</property> |
| 74 | 452 | <property name="xalign">0</property> | ||
| 75 | 453 | <property name="active">True</property> | 451 | <property name="active">True</property> |
| 76 | 454 | <property name="draw_indicator">True</property> | 452 | <property name="draw_indicator">True</property> |
| 77 | 455 | <property name="group">share-state-all-radio</property> | 453 | <property name="group">share-state-all-radio</property> |
| 78 | @@ -466,7 +464,6 @@ | |||
| 79 | 466 | <property name="visible">True</property> | 464 | <property name="visible">True</property> |
| 80 | 467 | <property name="can_focus">False</property> | 465 | <property name="can_focus">False</property> |
| 81 | 468 | <property name="receives_default">False</property> | 466 | <property name="receives_default">False</property> |
| 82 | 469 | <property name="xalign">0</property> | ||
| 83 | 470 | <property name="active">False</property> | 467 | <property name="active">False</property> |
| 84 | 471 | <property name="draw_indicator">True</property> | 468 | <property name="draw_indicator">True</property> |
| 85 | 472 | <property name="group">share-state-all-radio</property> | 469 | <property name="group">share-state-all-radio</property> |
| 86 | @@ -510,7 +507,6 @@ | |||
| 87 | 510 | <property name="can_focus">False</property> | 507 | <property name="can_focus">False</property> |
| 88 | 511 | <property name="receives_default">False</property> | 508 | <property name="receives_default">False</property> |
| 89 | 512 | <property name="hexpand">True</property> | 509 | <property name="hexpand">True</property> |
| 90 | 513 | <property name="xalign">0</property> | ||
| 91 | 514 | <property name="draw_indicator">True</property> | 510 | <property name="draw_indicator">True</property> |
| 92 | 515 | </object> | 511 | </object> |
| 93 | 516 | <packing> | 512 | <packing> |
| 94 | 517 | 513 | ||
| 95 | === modified file 'panels/region/unity-region-panel-ibus.ui' | |||
| 96 | --- panels/region/unity-region-panel-ibus.ui 2014-09-15 20:22:00 +0000 | |||
| 97 | +++ panels/region/unity-region-panel-ibus.ui 2015-03-31 17:31:23 +0000 | |||
| 98 | @@ -115,7 +115,7 @@ | |||
| 99 | 115 | <object class="GtkVBox" id="vbox6"> | 115 | <object class="GtkVBox" id="vbox6"> |
| 100 | 116 | <property name="visible">True</property> | 116 | <property name="visible">True</property> |
| 101 | 117 | <property name="can_focus">False</property> | 117 | <property name="can_focus">False</property> |
| 103 | 118 | <property name="margin_right">5</property> | 118 | <property name="margin_end">5</property> |
| 104 | 119 | <child> | 119 | <child> |
| 105 | 120 | <object class="GtkLabel" id="label2"> | 120 | <object class="GtkLabel" id="label2"> |
| 106 | 121 | <property name="visible">True</property> | 121 | <property name="visible">True</property> |
| 107 | @@ -433,7 +433,6 @@ | |||
| 108 | 433 | <property name="visible">True</property> | 433 | <property name="visible">True</property> |
| 109 | 434 | <property name="can_focus">False</property> | 434 | <property name="can_focus">False</property> |
| 110 | 435 | <property name="receives_default">False</property> | 435 | <property name="receives_default">False</property> |
| 111 | 436 | <property name="xalign">0</property> | ||
| 112 | 437 | <property name="active">True</property> | 436 | <property name="active">True</property> |
| 113 | 438 | <property name="draw_indicator">True</property> | 437 | <property name="draw_indicator">True</property> |
| 114 | 439 | </object> | 438 | </object> |
| 115 | @@ -449,7 +448,6 @@ | |||
| 116 | 449 | <property name="visible">True</property> | 448 | <property name="visible">True</property> |
| 117 | 450 | <property name="can_focus">False</property> | 449 | <property name="can_focus">False</property> |
| 118 | 451 | <property name="receives_default">False</property> | 450 | <property name="receives_default">False</property> |
| 119 | 452 | <property name="xalign">0</property> | ||
| 120 | 453 | <property name="active">True</property> | 451 | <property name="active">True</property> |
| 121 | 454 | <property name="draw_indicator">True</property> | 452 | <property name="draw_indicator">True</property> |
| 122 | 455 | <property name="group">same-source-radio</property> | 453 | <property name="group">same-source-radio</property> |
| 123 | @@ -466,8 +464,7 @@ | |||
| 124 | 466 | <property name="visible">True</property> | 464 | <property name="visible">True</property> |
| 125 | 467 | <property name="can_focus">False</property> | 465 | <property name="can_focus">False</property> |
| 126 | 468 | <property name="receives_default">False</property> | 466 | <property name="receives_default">False</property> |
| 129 | 469 | <property name="margin_left">25</property> | 467 | <property name="margin_start">25</property> |
| 128 | 470 | <property name="xalign">0</property> | ||
| 130 | 471 | <property name="active">True</property> | 468 | <property name="active">True</property> |
| 131 | 472 | <property name="draw_indicator">True</property> | 469 | <property name="draw_indicator">True</property> |
| 132 | 473 | </object> | 470 | </object> |
| 133 | @@ -483,9 +480,8 @@ | |||
| 134 | 483 | <property name="visible">True</property> | 480 | <property name="visible">True</property> |
| 135 | 484 | <property name="can_focus">False</property> | 481 | <property name="can_focus">False</property> |
| 136 | 485 | <property name="receives_default">False</property> | 482 | <property name="receives_default">False</property> |
| 138 | 486 | <property name="margin_left">25</property> | 483 | <property name="margin_start">25</property> |
| 139 | 487 | <property name="margin_bottom">15</property> | 484 | <property name="margin_bottom">15</property> |
| 140 | 488 | <property name="xalign">0</property> | ||
| 141 | 489 | <property name="active">True</property> | 485 | <property name="active">True</property> |
| 142 | 490 | <property name="draw_indicator">True</property> | 486 | <property name="draw_indicator">True</property> |
| 143 | 491 | <property name="group">default-source-radio</property> | 487 | <property name="group">default-source-radio</property> |
| 144 | @@ -512,7 +508,7 @@ | |||
| 145 | 512 | <property name="visible">True</property> | 508 | <property name="visible">True</property> |
| 146 | 513 | <property name="can_focus">False</property> | 509 | <property name="can_focus">False</property> |
| 147 | 514 | <property name="halign">end</property> | 510 | <property name="halign">end</property> |
| 149 | 515 | <property name="margin_right">10</property> | 511 | <property name="margin_end">10</property> |
| 150 | 516 | <property name="margin_bottom">10</property> | 512 | <property name="margin_bottom">10</property> |
| 151 | 517 | <property name="hexpand">True</property> | 513 | <property name="hexpand">True</property> |
| 152 | 518 | <property name="label" translatable="yes">Show input candidates:</property> | 514 | <property name="label" translatable="yes">Show input candidates:</property> |
| 153 | @@ -566,9 +562,8 @@ | |||
| 154 | 566 | <property name="can_focus">False</property> | 562 | <property name="can_focus">False</property> |
| 155 | 567 | <property name="receives_default">False</property> | 563 | <property name="receives_default">False</property> |
| 156 | 568 | <property name="halign">end</property> | 564 | <property name="halign">end</property> |
| 158 | 569 | <property name="margin_right">10</property> | 565 | <property name="margin_end">10</property> |
| 159 | 570 | <property name="hexpand">True</property> | 566 | <property name="hexpand">True</property> |
| 160 | 571 | <property name="xalign">0</property> | ||
| 161 | 572 | <property name="draw_indicator">True</property> | 567 | <property name="draw_indicator">True</property> |
| 162 | 573 | </object> | 568 | </object> |
| 163 | 574 | <packing> | 569 | <packing> |
| 164 | @@ -611,7 +606,6 @@ | |||
| 165 | 611 | <property name="can_focus">False</property> | 606 | <property name="can_focus">False</property> |
| 166 | 612 | <property name="receives_default">False</property> | 607 | <property name="receives_default">False</property> |
| 167 | 613 | <property name="hexpand">True</property> | 608 | <property name="hexpand">True</property> |
| 168 | 614 | <property name="xalign">0</property> | ||
| 169 | 615 | <property name="draw_indicator">True</property> | 609 | <property name="draw_indicator">True</property> |
| 170 | 616 | </object> | 610 | </object> |
| 171 | 617 | <packing> | 611 | <packing> |
thanks