Merge lp:~3v1n0/unity-control-center/fix-ui-paddings into lp:unity-control-center
- fix-ui-paddings
- Merge into trunk
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Approved by: | Sebastien Bacher |
Approved revision: | 12913 |
Merged at revision: | 12891 |
Proposed branch: | lp:~3v1n0/unity-control-center/fix-ui-paddings |
Merge into: | lp:unity-control-center |
Diff against target: |
273 lines (+71/-79) 1 file modified
panels/appearance/appearance.ui (+71/-79) |
To merge this branch: | bzr merge lp:~3v1n0/unity-control-center/fix-ui-paddings |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Approve | ||
Review via email: mp+326973@code.launchpad.net |
Commit message
appearance: ensure we use everywhere consistent margins
Description of the change
We had multiple ways to set margings and they were set badly.
Also I forgot to commit a change in my previous MP which made some parts not looking properly.
To post a comment you must log in.
- 12913. By Marco Trevisan (Treviño)
-
appearance: ensure we use everywhere consistent margins
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'panels/appearance/appearance.ui' |
2 | --- panels/appearance/appearance.ui 2017-06-27 23:34:56 +0000 |
3 | +++ panels/appearance/appearance.ui 2017-07-07 00:46:35 +0000 |
4 | @@ -580,20 +580,23 @@ |
5 | <object class="GtkBox" id="unity-behavior"> |
6 | <property name="visible">True</property> |
7 | <property name="can_focus">False</property> |
8 | - <property name="margin_top">3</property> |
9 | - <property name="margin_bottom">3</property> |
10 | + <property name="margin_left">3</property> |
11 | + <property name="margin_right">3</property> |
12 | + <property name="margin_top">13</property> |
13 | + <property name="margin_bottom">13</property> |
14 | <property name="orientation">vertical</property> |
15 | <property name="spacing">3</property> |
16 | <child> |
17 | <object class="GtkBox" id="box1"> |
18 | <property name="visible">True</property> |
19 | <property name="can_focus">False</property> |
20 | + <property name="margin_left">10</property> |
21 | + <property name="margin_right">10</property> |
22 | <property name="orientation">vertical</property> |
23 | <child> |
24 | <object class="GtkBox" id="box3"> |
25 | <property name="visible">True</property> |
26 | <property name="can_focus">False</property> |
27 | - <property name="border_width">10</property> |
28 | <property name="spacing">12</property> |
29 | <child> |
30 | <object class="GtkBox" id="box4"> |
31 | @@ -787,7 +790,6 @@ |
32 | <packing> |
33 | <property name="expand">False</property> |
34 | <property name="fill">True</property> |
35 | - <property name="padding">5</property> |
36 | <property name="position">0</property> |
37 | </packing> |
38 | </child> |
39 | @@ -1084,34 +1086,19 @@ |
40 | <object class="GtkBox" id="unity_gfx_mode_box"> |
41 | <property name="visible">True</property> |
42 | <property name="can_focus">False</property> |
43 | - <property name="orientation">vertical</property> |
44 | + <property name="margin_left">10</property> |
45 | + <property name="margin_right">10</property> |
46 | + <property name="spacing">5</property> |
47 | <child> |
48 | - <object class="GtkBox" id="unity_gfx_mode_selector_box"> |
49 | + <object class="GtkBox"> |
50 | <property name="visible">True</property> |
51 | <property name="can_focus">False</property> |
52 | - <property name="margin_left">10</property> |
53 | - <property name="margin_right">10</property> |
54 | - <property name="spacing">5</property> |
55 | + <property name="orientation">vertical</property> |
56 | <child> |
57 | - <object class="GtkBox"> |
58 | + <object class="GtkLabel" id="label_gfx_mode"> |
59 | <property name="visible">True</property> |
60 | <property name="can_focus">False</property> |
61 | - <property name="orientation">vertical</property> |
62 | - <child> |
63 | - <object class="GtkLabel" id="label_gfx_mode"> |
64 | - <property name="visible">True</property> |
65 | - <property name="can_focus">False</property> |
66 | - <property name="label" translatable="yes">Visual effects:</property> |
67 | - </object> |
68 | - <packing> |
69 | - <property name="expand">False</property> |
70 | - <property name="fill">True</property> |
71 | - <property name="position">0</property> |
72 | - </packing> |
73 | - </child> |
74 | - <child> |
75 | - <placeholder/> |
76 | - </child> |
77 | + <property name="label" translatable="yes">Visual effects:</property> |
78 | </object> |
79 | <packing> |
80 | <property name="expand">False</property> |
81 | @@ -1120,66 +1107,53 @@ |
82 | </packing> |
83 | </child> |
84 | <child> |
85 | + <placeholder/> |
86 | + </child> |
87 | + </object> |
88 | + <packing> |
89 | + <property name="expand">False</property> |
90 | + <property name="fill">True</property> |
91 | + <property name="position">0</property> |
92 | + </packing> |
93 | + </child> |
94 | + <child> |
95 | + <object class="GtkBox"> |
96 | + <property name="visible">True</property> |
97 | + <property name="can_focus">False</property> |
98 | + <property name="orientation">vertical</property> |
99 | + <property name="spacing">2</property> |
100 | + <child> |
101 | <object class="GtkBox"> |
102 | <property name="visible">True</property> |
103 | <property name="can_focus">False</property> |
104 | - <property name="orientation">vertical</property> |
105 | - <property name="spacing">2</property> |
106 | + <property name="spacing">5</property> |
107 | <child> |
108 | - <object class="GtkBox"> |
109 | + <object class="GtkRadioButton" id="unity_gfx_mode_low_enable"> |
110 | + <property name="label" translatable="yes">Low</property> |
111 | <property name="visible">True</property> |
112 | - <property name="can_focus">False</property> |
113 | - <property name="spacing">5</property> |
114 | - <child> |
115 | - <object class="GtkRadioButton" id="unity_gfx_mode_low_enable"> |
116 | - <property name="label" translatable="yes">Low</property> |
117 | - <property name="visible">True</property> |
118 | - <property name="can_focus">True</property> |
119 | - <property name="receives_default">False</property> |
120 | - <property name="active">True</property> |
121 | - <property name="draw_indicator">True</property> |
122 | - </object> |
123 | - <packing> |
124 | - <property name="expand">False</property> |
125 | - <property name="fill">False</property> |
126 | - <property name="position">0</property> |
127 | - </packing> |
128 | - </child> |
129 | - <child> |
130 | - <object class="GtkRadioButton" id="unity_gfx_mode_full_enable"> |
131 | - <property name="label" translatable="yes">High</property> |
132 | - <property name="visible">True</property> |
133 | - <property name="can_focus">True</property> |
134 | - <property name="receives_default">False</property> |
135 | - <property name="draw_indicator">True</property> |
136 | - <property name="group">unity_gfx_mode_low_enable</property> |
137 | - </object> |
138 | - <packing> |
139 | - <property name="expand">False</property> |
140 | - <property name="fill">False</property> |
141 | - <property name="position">1</property> |
142 | - </packing> |
143 | - </child> |
144 | + <property name="can_focus">True</property> |
145 | + <property name="receives_default">False</property> |
146 | + <property name="active">True</property> |
147 | + <property name="draw_indicator">True</property> |
148 | </object> |
149 | <packing> |
150 | <property name="expand">False</property> |
151 | - <property name="fill">True</property> |
152 | + <property name="fill">False</property> |
153 | <property name="position">0</property> |
154 | </packing> |
155 | </child> |
156 | <child> |
157 | - <object class="GtkLabel"> |
158 | - <property name="name">5</property> |
159 | + <object class="GtkRadioButton" id="unity_gfx_mode_full_enable"> |
160 | + <property name="label" translatable="yes">High</property> |
161 | <property name="visible">True</property> |
162 | - <property name="can_focus">False</property> |
163 | - <property name="margin_top">5</property> |
164 | - <property name="label" translatable="yes"><small>Includes shadows and animations when opening, resizing and switching windows.</small></property> |
165 | - <property name="use_markup">True</property> |
166 | + <property name="can_focus">True</property> |
167 | + <property name="receives_default">False</property> |
168 | + <property name="draw_indicator">True</property> |
169 | + <property name="group">unity_gfx_mode_low_enable</property> |
170 | </object> |
171 | <packing> |
172 | <property name="expand">False</property> |
173 | <property name="fill">False</property> |
174 | - <property name="pack_type">end</property> |
175 | <property name="position">1</property> |
176 | </packing> |
177 | </child> |
178 | @@ -1187,21 +1161,38 @@ |
179 | <packing> |
180 | <property name="expand">False</property> |
181 | <property name="fill">True</property> |
182 | - <property name="position">4</property> |
183 | + <property name="position">0</property> |
184 | + </packing> |
185 | + </child> |
186 | + <child> |
187 | + <object class="GtkLabel"> |
188 | + <property name="name">5</property> |
189 | + <property name="visible">True</property> |
190 | + <property name="can_focus">False</property> |
191 | + <property name="margin_top">5</property> |
192 | + <property name="label" translatable="yes"><small>Includes shadows and animations when opening, resizing and switching windows.</small></property> |
193 | + <property name="use_markup">True</property> |
194 | + </object> |
195 | + <packing> |
196 | + <property name="expand">False</property> |
197 | + <property name="fill">False</property> |
198 | + <property name="pack_type">end</property> |
199 | + <property name="position">1</property> |
200 | </packing> |
201 | </child> |
202 | </object> |
203 | <packing> |
204 | <property name="expand">False</property> |
205 | <property name="fill">True</property> |
206 | - <property name="position">0</property> |
207 | + <property name="position">4</property> |
208 | </packing> |
209 | </child> |
210 | </object> |
211 | <packing> |
212 | <property name="expand">False</property> |
213 | <property name="fill">True</property> |
214 | - <property name="position">6</property> |
215 | + <property name="padding">5</property> |
216 | + <property name="position">8</property> |
217 | </packing> |
218 | </child> |
219 | <child> |
220 | @@ -1212,21 +1203,21 @@ |
221 | <packing> |
222 | <property name="expand">False</property> |
223 | <property name="fill">True</property> |
224 | - <property name="position">7</property> |
225 | + <property name="position">9</property> |
226 | </packing> |
227 | </child> |
228 | <child> |
229 | <object class="GtkLabel" id="unity-label-external-tool"> |
230 | <property name="can_focus">False</property> |
231 | - <property name="xpad">12</property> |
232 | + <property name="margin_left">10</property> |
233 | + <property name="margin_right">10</property> |
234 | <property name="label" translatable="yes">Some settings have been overriden by an external program, press "Restore Default Behaviors" to reset the behavior and return control to this panel.</property> |
235 | <property name="wrap">True</property> |
236 | - <property name="xalign">0</property> |
237 | </object> |
238 | <packing> |
239 | <property name="expand">False</property> |
240 | <property name="fill">True</property> |
241 | - <property name="position">8</property> |
242 | + <property name="position">10</property> |
243 | </packing> |
244 | </child> |
245 | <child> |
246 | @@ -1234,7 +1225,9 @@ |
247 | <property name="height_request">36</property> |
248 | <property name="visible">True</property> |
249 | <property name="can_focus">False</property> |
250 | - <property name="margin_top">10</property> |
251 | + <property name="margin_left">10</property> |
252 | + <property name="margin_right">10</property> |
253 | + <property name="margin_top">5</property> |
254 | <child> |
255 | <object class="GtkButton" id="button-restore-unitybehavior"> |
256 | <property name="label" translatable="yes">Restore Behavior Settings</property> |
257 | @@ -1246,7 +1239,6 @@ |
258 | <packing> |
259 | <property name="expand">False</property> |
260 | <property name="fill">True</property> |
261 | - <property name="padding">10</property> |
262 | <property name="position">0</property> |
263 | </packing> |
264 | </child> |
265 | @@ -1257,7 +1249,7 @@ |
266 | <packing> |
267 | <property name="expand">False</property> |
268 | <property name="fill">True</property> |
269 | - <property name="position">9</property> |
270 | + <property name="position">11</property> |
271 | </packing> |
272 | </child> |
273 | </object> |
better indeed, thanks