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: mp+77539@code.launchpad.net |
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 | </packing> |
6 | </child> |
7 | <child> |
8 | - <object class="GtkAlignment" id="alignment4"> |
9 | + <object class="GtkGrid" id="grid1"> |
10 | <property name="visible">True</property> |
11 | <property name="can_focus">False</property> |
12 | - <property name="top_padding">6</property> |
13 | - <property name="bottom_padding">6</property> |
14 | - <property name="left_padding">6</property> |
15 | - <property name="right_padding">6</property> |
16 | + <property name="row_spacing">24</property> |
17 | + <property name="column_spacing">12</property> |
18 | + <property name="n_rows">2</property> |
19 | + <property name="n_columns">2</property> |
20 | <child> |
21 | - <object class="GtkTable" id="table3"> |
22 | + <object class="GtkLabel" id="label_broken_cache"> |
23 | <property name="visible">True</property> |
24 | <property name="can_focus">False</property> |
25 | - <property name="n_rows">2</property> |
26 | - <property name="n_columns">2</property> |
27 | - <child> |
28 | - <object class="GtkLabel" id="label_broken_cache"> |
29 | - <property name="visible">True</property> |
30 | - <property name="can_focus">False</property> |
31 | - <property name="xalign">0</property> |
32 | - <property name="label" translatable="yes"><span weight="bold" font_size="large">Items cannot be installed or removed |
33 | + <property name="xalign">0</property> |
34 | + <property name="label" translatable="yes"><span weight="bold" font_size="large">Items cannot be installed or removed |
35 | until the package catalog is repaired. Do you want to repair it now?</span></property> |
36 | - <property name="use_markup">True</property> |
37 | - <property name="wrap">True</property> |
38 | - </object> |
39 | - <packing> |
40 | - <property name="left_attach">1</property> |
41 | - <property name="right_attach">2</property> |
42 | - <property name="y_options"></property> |
43 | - <property name="x_padding">6</property> |
44 | - <property name="y_padding">6</property> |
45 | - </packing> |
46 | - </child> |
47 | - <child> |
48 | - <object class="GtkImage" id="image_package_icon2"> |
49 | - <property name="visible">True</property> |
50 | - <property name="can_focus">False</property> |
51 | - <property name="pixel_size">48</property> |
52 | - <property name="icon_name">softwarecenter</property> |
53 | - </object> |
54 | - <packing> |
55 | - <property name="x_options"></property> |
56 | - <property name="y_options"></property> |
57 | - <property name="x_padding">6</property> |
58 | - <property name="y_padding">6</property> |
59 | - </packing> |
60 | - </child> |
61 | - <child> |
62 | - <object class="GtkLabel" id="label_broken_cache1"> |
63 | - <property name="visible">True</property> |
64 | - <property name="can_focus">False</property> |
65 | - <property name="xalign">0</property> |
66 | - <property name="label" translatable="yes">Once Update Manager has finished the repairs, you can close it and return to the store.</property> |
67 | - <property name="use_markup">True</property> |
68 | - <property name="wrap">True</property> |
69 | - </object> |
70 | - <packing> |
71 | - <property name="left_attach">1</property> |
72 | - <property name="right_attach">2</property> |
73 | - <property name="top_attach">1</property> |
74 | - <property name="bottom_attach">2</property> |
75 | - <property name="y_options"></property> |
76 | - <property name="y_padding">6</property> |
77 | - </packing> |
78 | - </child> |
79 | - <child> |
80 | - <object class="GtkLabel" id="label1"> |
81 | - <property name="visible">True</property> |
82 | - <property name="can_focus">False</property> |
83 | - <property name="label" translatable="yes"> </property> |
84 | - </object> |
85 | - <packing> |
86 | - <property name="top_attach">1</property> |
87 | - <property name="bottom_attach">2</property> |
88 | - <property name="x_options"></property> |
89 | - <property name="y_options"></property> |
90 | - </packing> |
91 | - </child> |
92 | - </object> |
93 | + <property name="use_markup">True</property> |
94 | + <property name="wrap">True</property> |
95 | + </object> |
96 | + <packing> |
97 | + <property name="left_attach">1</property> |
98 | + <property name="top_attach">0</property> |
99 | + <property name="width">1</property> |
100 | + <property name="height">1</property> |
101 | + </packing> |
102 | + </child> |
103 | + <child> |
104 | + <object class="GtkImage" id="image_package_icon2"> |
105 | + <property name="visible">True</property> |
106 | + <property name="can_focus">False</property> |
107 | + <property name="pixel_size">48</property> |
108 | + <property name="icon_name">softwarecenter</property> |
109 | + </object> |
110 | + <packing> |
111 | + <property name="left_attach">0</property> |
112 | + <property name="top_attach">0</property> |
113 | + <property name="width">1</property> |
114 | + <property name="height">1</property> |
115 | + </packing> |
116 | + </child> |
117 | + <child> |
118 | + <object class="GtkLabel" id="label_broken_cache1"> |
119 | + <property name="visible">True</property> |
120 | + <property name="can_focus">False</property> |
121 | + <property name="xalign">0</property> |
122 | + <property name="label" translatable="yes">Once Update Manager has finished the repairs, you can close it and return to the store.</property> |
123 | + <property name="use_markup">True</property> |
124 | + <property name="wrap">True</property> |
125 | + </object> |
126 | + <packing> |
127 | + <property name="left_attach">1</property> |
128 | + <property name="top_attach">1</property> |
129 | + <property name="width">1</property> |
130 | + <property name="height">1</property> |
131 | + </packing> |
132 | + </child> |
133 | + <child> |
134 | + <object class="GtkLabel" id="label1"> |
135 | + <property name="visible">True</property> |
136 | + <property name="can_focus">False</property> |
137 | + <property name="label" translatable="yes"> </property> |
138 | + </object> |
139 | + <packing> |
140 | + <property name="left_attach">0</property> |
141 | + <property name="top_attach">1</property> |
142 | + <property name="width">1</property> |
143 | + <property name="height">1</property> |
144 | + </packing> |
145 | </child> |
146 | </object> |
147 | <packing> |
148 | - <property name="expand">False</property> |
149 | - <property name="fill">False</property> |
150 | + <property name="expand">True</property> |
151 | + <property name="fill">True</property> |
152 | <property name="position">1</property> |
153 | </packing> |
154 | </child> |
155 | @@ -302,10 +291,12 @@ |
156 | <property name="can_focus">False</property> |
157 | <property name="border_width">5</property> |
158 | <property name="title"> </property> |
159 | + <property name="resizable">False</property> |
160 | <property name="modal">True</property> |
161 | - <property name="window_position">center</property> |
162 | + <property name="window_position">center-on-parent</property> |
163 | <property name="type_hint">dialog</property> |
164 | <property name="skip_taskbar_hint">True</property> |
165 | + <property name="deletable">False</property> |
166 | <child internal-child="vbox"> |
167 | <object class="GtkBox" id="dialog-vbox6"> |
168 | <property name="visible">True</property> |
169 | @@ -356,95 +347,86 @@ |
170 | </packing> |
171 | </child> |
172 | <child> |
173 | - <object class="GtkAlignment" id="alignment2"> |
174 | + <object class="GtkGrid" id="grid2"> |
175 | <property name="visible">True</property> |
176 | <property name="can_focus">False</property> |
177 | - <property name="top_padding">6</property> |
178 | - <property name="bottom_padding">6</property> |
179 | - <property name="left_padding">6</property> |
180 | - <property name="right_padding">6</property> |
181 | - <child> |
182 | - <object class="GtkTable" id="table1"> |
183 | - <property name="visible">True</property> |
184 | - <property name="can_focus">False</property> |
185 | - <property name="n_rows">2</property> |
186 | - <property name="n_columns">2</property> |
187 | - <child> |
188 | - <object class="GtkImage" id="image_package_icon"> |
189 | - <property name="visible">True</property> |
190 | - <property name="can_focus">False</property> |
191 | - <property name="pixel_size">48</property> |
192 | - <property name="icon_name">applications-other</property> |
193 | - </object> |
194 | - <packing> |
195 | - <property name="x_options"></property> |
196 | - <property name="y_options"></property> |
197 | - <property name="x_padding">6</property> |
198 | - <property name="y_padding">6</property> |
199 | - </packing> |
200 | - </child> |
201 | - <child> |
202 | - <object class="GtkLabel" id="label_dependency_primary"> |
203 | - <property name="visible">True</property> |
204 | - <property name="can_focus">False</property> |
205 | - <property name="xalign">0</property> |
206 | - <property name="use_markup">True</property> |
207 | - <property name="wrap">True</property> |
208 | - </object> |
209 | - <packing> |
210 | - <property name="left_attach">1</property> |
211 | - <property name="right_attach">2</property> |
212 | - <property name="x_options">GTK_FILL</property> |
213 | - <property name="y_options"></property> |
214 | - <property name="x_padding">6</property> |
215 | - <property name="y_padding">6</property> |
216 | - </packing> |
217 | - </child> |
218 | - <child> |
219 | - <object class="GtkViewport" id="viewport1"> |
220 | - <property name="visible">True</property> |
221 | - <property name="can_focus">False</property> |
222 | - <property name="resize_mode">queue</property> |
223 | + <property name="row_spacing">6</property> |
224 | + <property name="column_spacing">6</property> |
225 | + <property name="n_rows">2</property> |
226 | + <property name="n_columns">2</property> |
227 | + <child> |
228 | + <object class="GtkImage" id="image_package_icon"> |
229 | + <property name="visible">True</property> |
230 | + <property name="can_focus">False</property> |
231 | + <property name="pixel_size">48</property> |
232 | + <property name="icon_name">applications-other</property> |
233 | + </object> |
234 | + <packing> |
235 | + <property name="left_attach">0</property> |
236 | + <property name="top_attach">0</property> |
237 | + <property name="width">1</property> |
238 | + <property name="height">1</property> |
239 | + </packing> |
240 | + </child> |
241 | + <child> |
242 | + <object class="GtkLabel" id="label_dependency_primary"> |
243 | + <property name="visible">True</property> |
244 | + <property name="can_focus">False</property> |
245 | + <property name="xalign">0</property> |
246 | + <property name="use_markup">True</property> |
247 | + <property name="wrap">True</property> |
248 | + </object> |
249 | + <packing> |
250 | + <property name="left_attach">1</property> |
251 | + <property name="top_attach">0</property> |
252 | + <property name="width">1</property> |
253 | + <property name="height">1</property> |
254 | + </packing> |
255 | + </child> |
256 | + <child> |
257 | + <object class="GtkViewport" id="viewport1"> |
258 | + <property name="visible">True</property> |
259 | + <property name="can_focus">False</property> |
260 | + <property name="resize_mode">queue</property> |
261 | + <child> |
262 | + <object class="GtkScrolledWindow" id="scrolledwindow_dependencies"> |
263 | + <property name="height_request">150</property> |
264 | + <property name="visible">True</property> |
265 | + <property name="can_focus">True</property> |
266 | + <property name="hscrollbar_policy">never</property> |
267 | + <property name="shadow_type">etched-in</property> |
268 | <child> |
269 | - <object class="GtkScrolledWindow" id="scrolledwindow_dependencies"> |
270 | - <property name="height_request">150</property> |
271 | - <property name="visible">True</property> |
272 | - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property> |
273 | - <property name="can_focus">True</property> |
274 | - <property name="hscrollbar_policy">never</property> |
275 | - <child> |
276 | - <placeholder/> |
277 | - </child> |
278 | - </object> |
279 | + <placeholder/> |
280 | </child> |
281 | </object> |
282 | - <packing> |
283 | - <property name="left_attach">1</property> |
284 | - <property name="right_attach">2</property> |
285 | - <property name="top_attach">1</property> |
286 | - <property name="bottom_attach">2</property> |
287 | - <property name="x_padding">6</property> |
288 | - <property name="y_padding">6</property> |
289 | - </packing> |
290 | - </child> |
291 | - <child> |
292 | - <object class="GtkLabel" id="label2"> |
293 | - <property name="visible">True</property> |
294 | - <property name="can_focus">False</property> |
295 | - <property name="label" translatable="yes"> </property> |
296 | - </object> |
297 | - <packing> |
298 | - <property name="top_attach">1</property> |
299 | - <property name="bottom_attach">2</property> |
300 | - <property name="x_options"></property> |
301 | - <property name="y_options"></property> |
302 | - </packing> |
303 | - </child> |
304 | - </object> |
305 | + </child> |
306 | + </object> |
307 | + <packing> |
308 | + <property name="left_attach">1</property> |
309 | + <property name="top_attach">1</property> |
310 | + <property name="width">1</property> |
311 | + <property name="height">1</property> |
312 | + </packing> |
313 | + </child> |
314 | + <child> |
315 | + <object class="GtkLabel" id="label2"> |
316 | + <property name="visible">True</property> |
317 | + <property name="can_focus">False</property> |
318 | + <property name="label" translatable="yes"> </property> |
319 | + </object> |
320 | + <packing> |
321 | + <property name="left_attach">1</property> |
322 | + <property name="top_attach">0</property> |
323 | + <property name="width">1</property> |
324 | + <property name="height">1</property> |
325 | + </packing> |
326 | + </child> |
327 | + <child> |
328 | + <placeholder/> |
329 | </child> |
330 | </object> |
331 | <packing> |
332 | - <property name="expand">False</property> |
333 | + <property name="expand">True</property> |
334 | <property name="fill">True</property> |
335 | <property name="position">1</property> |
336 | </packing> |
Agreed, this is a definite improvement. Nice work as always, thanks Matt!