Merge lp:~attente/unity-control-center/region-panel-deprecation-warnings into lp:unity-control-center

Proposed by William Hua on 2015-03-31
Status: Merged
Approved by: Sebastien Bacher on 2015-04-03
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
Reviewer Review Type Date Requested Status
Sebastien Bacher 2015-03-31 Approve on 2015-04-03
Review via email: mp+254806@code.launchpad.net

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.
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

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 <object class="GtkGrid" id="table1">
6 <property name="visible">True</property>
7 <property name="can_focus">False</property>
8- <property name="margin_left">12</property>
9- <property name="margin_right">12</property>
10+ <property name="margin_start">12</property>
11+ <property name="margin_end">12</property>
12 <property name="margin_top">12</property>
13 <property name="margin_bottom">12</property>
14 <property name="row_spacing">6</property>
15@@ -1001,7 +1001,6 @@
16 <object class="GtkRadioButton" id="per-window-radio-false">
17 <property name="visible">True</property>
18 <property name="can_focus">True</property>
19- <property name="xalign">0</property>
20 <property name="label" translatable="yes">Use the same source for all windows</property>
21 </object>
22 <packing>
23@@ -1015,7 +1014,6 @@
24 <object class="GtkRadioButton" id="per-window-radio-true">
25 <property name="visible">True</property>
26 <property name="can_focus">True</property>
27- <property name="xalign">0</property>
28 <property name="label" translatable="yes">Allow different sources for each window</property>
29 <property name="group">per-window-radio-false</property>
30 </object>
31@@ -1115,7 +1113,7 @@
32 <object class="GtkTable" id="table4">
33 <property name="visible">True</property>
34 <property name="can_focus">False</property>
35- <property name="margin_left">12</property>
36+ <property name="margin_start">12</property>
37 <property name="margin_top">12</property>
38 <property name="n_rows">3</property>
39 <property name="n_columns">2</property>
40@@ -1245,7 +1243,7 @@
41 <object class="GtkTable" id="table5">
42 <property name="visible">True</property>
43 <property name="can_focus">False</property>
44- <property name="margin_left">12</property>
45+ <property name="margin_start">12</property>
46 <property name="margin_top">12</property>
47 <property name="n_rows">3</property>
48 <property name="n_columns">2</property>
49
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 <object class="GtkVBox" id="vbox6">
55 <property name="visible">True</property>
56 <property name="can_focus">False</property>
57- <property name="margin_right">5</property>
58+ <property name="margin_end">5</property>
59 <child>
60 <object class="GtkLabel" id="label2">
61 <property name="visible">True</property>
62@@ -433,7 +433,6 @@
63 <property name="visible">True</property>
64 <property name="can_focus">False</property>
65 <property name="receives_default">False</property>
66- <property name="xalign">0</property>
67 <property name="active">False</property>
68 <property name="draw_indicator">True</property>
69 </object>
70@@ -449,7 +448,6 @@
71 <property name="visible">True</property>
72 <property name="can_focus">False</property>
73 <property name="receives_default">False</property>
74- <property name="xalign">0</property>
75 <property name="active">True</property>
76 <property name="draw_indicator">True</property>
77 <property name="group">share-state-all-radio</property>
78@@ -466,7 +464,6 @@
79 <property name="visible">True</property>
80 <property name="can_focus">False</property>
81 <property name="receives_default">False</property>
82- <property name="xalign">0</property>
83 <property name="active">False</property>
84 <property name="draw_indicator">True</property>
85 <property name="group">share-state-all-radio</property>
86@@ -510,7 +507,6 @@
87 <property name="can_focus">False</property>
88 <property name="receives_default">False</property>
89 <property name="hexpand">True</property>
90- <property name="xalign">0</property>
91 <property name="draw_indicator">True</property>
92 </object>
93 <packing>
94
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 <object class="GtkVBox" id="vbox6">
100 <property name="visible">True</property>
101 <property name="can_focus">False</property>
102- <property name="margin_right">5</property>
103+ <property name="margin_end">5</property>
104 <child>
105 <object class="GtkLabel" id="label2">
106 <property name="visible">True</property>
107@@ -433,7 +433,6 @@
108 <property name="visible">True</property>
109 <property name="can_focus">False</property>
110 <property name="receives_default">False</property>
111- <property name="xalign">0</property>
112 <property name="active">True</property>
113 <property name="draw_indicator">True</property>
114 </object>
115@@ -449,7 +448,6 @@
116 <property name="visible">True</property>
117 <property name="can_focus">False</property>
118 <property name="receives_default">False</property>
119- <property name="xalign">0</property>
120 <property name="active">True</property>
121 <property name="draw_indicator">True</property>
122 <property name="group">same-source-radio</property>
123@@ -466,8 +464,7 @@
124 <property name="visible">True</property>
125 <property name="can_focus">False</property>
126 <property name="receives_default">False</property>
127- <property name="margin_left">25</property>
128- <property name="xalign">0</property>
129+ <property name="margin_start">25</property>
130 <property name="active">True</property>
131 <property name="draw_indicator">True</property>
132 </object>
133@@ -483,9 +480,8 @@
134 <property name="visible">True</property>
135 <property name="can_focus">False</property>
136 <property name="receives_default">False</property>
137- <property name="margin_left">25</property>
138+ <property name="margin_start">25</property>
139 <property name="margin_bottom">15</property>
140- <property name="xalign">0</property>
141 <property name="active">True</property>
142 <property name="draw_indicator">True</property>
143 <property name="group">default-source-radio</property>
144@@ -512,7 +508,7 @@
145 <property name="visible">True</property>
146 <property name="can_focus">False</property>
147 <property name="halign">end</property>
148- <property name="margin_right">10</property>
149+ <property name="margin_end">10</property>
150 <property name="margin_bottom">10</property>
151 <property name="hexpand">True</property>
152 <property name="label" translatable="yes">Show input candidates:</property>
153@@ -566,9 +562,8 @@
154 <property name="can_focus">False</property>
155 <property name="receives_default">False</property>
156 <property name="halign">end</property>
157- <property name="margin_right">10</property>
158+ <property name="margin_end">10</property>
159 <property name="hexpand">True</property>
160- <property name="xalign">0</property>
161 <property name="draw_indicator">True</property>
162 </object>
163 <packing>
164@@ -611,7 +606,6 @@
165 <property name="can_focus">False</property>
166 <property name="receives_default">False</property>
167 <property name="hexpand">True</property>
168- <property name="xalign">0</property>
169 <property name="draw_indicator">True</property>
170 </object>
171 <packing>

Subscribers

People subscribed via source and target branches