Merge lp:~fitojb/gdebi/lp1427638 into lp:gdebi

Proposed by Adolfo Jayme on 2016-02-22
Status: Needs review
Proposed branch: lp:~fitojb/gdebi/lp1427638
Merge into: lp:gdebi
Diff against target: 569 lines (+176/-175)
1 file modified
data/gdebi.ui (+176/-175)
To merge this branch: bzr merge lp:~fitojb/gdebi/lp1427638
Reviewer Review Type Date Requested Status
gdebi-developers 2016-12-12 Pending
gdebi-developers 2016-02-22 Pending
Review via email: mp+286770@code.launchpad.net

Commit message

Allow VBox to expand so it displays its contents fully.

Description of the change

Add missing “expand” property to box so that its contents is visible and it fills the dialog.

I apologize for the overly big diff, but I’ve used Glade’s most current version to add the missing property, and Glade is known to reorder things as it pleases. No behavior is changed outside of this bug’s fix (the relevant hunk is @@ -289,7 +290,7 @@).

To post a comment you must log in.
Adolfo Jayme (fitojb) wrote :

Ping?

Adolfo Jayme (fitojb) wrote :

Any chance of having this reviewed, please?

Adolfo Jayme (fitojb) wrote :

A code review should not be sitting two years untouched. This is utterly pathetic.

Unmerged revisions

493. By Adolfo Jayme on 2016-02-22

Add missing “expand” property to box so that its contents is visible

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/gdebi.ui'
2--- data/gdebi.ui 2012-10-05 10:21:31 +0000
3+++ data/gdebi.ui 2016-02-22 05:44:48 +0000
4@@ -1,6 +1,7 @@
5 <?xml version="1.0" encoding="UTF-8"?>
6+<!-- Generated with glade 3.19.0 -->
7 <interface>
8- <!-- interface-requires gtk+ 3.0 -->
9+ <requires lib="gtk+" version="3.0"/>
10 <object class="GtkAccelGroup" id="accelgroup1"/>
11 <object class="GtkAboutDialog" id="dialog_about">
12 <property name="can_focus">False</property>
13@@ -255,9 +256,9 @@
14 <object class="GtkLabel" id="label10">
15 <property name="visible">True</property>
16 <property name="can_focus">False</property>
17- <property name="xalign">0</property>
18 <property name="label" translatable="yes">&lt;b&gt;To install the following changes are required:&lt;/b&gt;</property>
19 <property name="use_markup">True</property>
20+ <property name="xalign">0</property>
21 </object>
22 <packing>
23 <property name="expand">False</property>
24@@ -289,7 +290,7 @@
25 </child>
26 </object>
27 <packing>
28- <property name="expand">False</property>
29+ <property name="expand">True</property>
30 <property name="fill">True</property>
31 <property name="position">1</property>
32 </packing>
33@@ -410,141 +411,6 @@
34 <action-widget response="-7">button_cancel_download</action-widget>
35 </action-widgets>
36 </object>
37- <object class="GtkDialog" id="dialog_hig">
38- <property name="can_focus">False</property>
39- <property name="border_width">6</property>
40- <property name="resizable">False</property>
41- <property name="window_position">center-on-parent</property>
42- <property name="type_hint">dialog</property>
43- <property name="skip_taskbar_hint">True</property>
44- <property name="skip_pager_hint">True</property>
45- <child internal-child="vbox">
46- <object class="GtkBox" id="vbox7">
47- <property name="visible">True</property>
48- <property name="can_focus">False</property>
49- <property name="orientation">vertical</property>
50- <property name="spacing">12</property>
51- <child internal-child="action_area">
52- <object class="GtkButtonBox" id="hbuttonbox1">
53- <property name="visible">True</property>
54- <property name="can_focus">False</property>
55- <property name="layout_style">end</property>
56- <child>
57- <object class="GtkButton" id="button2">
58- <property name="label">gtk-close</property>
59- <property name="visible">True</property>
60- <property name="can_focus">True</property>
61- <property name="can_default">True</property>
62- <property name="receives_default">False</property>
63- <property name="use_stock">True</property>
64- </object>
65- <packing>
66- <property name="expand">False</property>
67- <property name="fill">False</property>
68- <property name="position">0</property>
69- </packing>
70- </child>
71- </object>
72- <packing>
73- <property name="expand">False</property>
74- <property name="fill">True</property>
75- <property name="pack_type">end</property>
76- <property name="position">0</property>
77- </packing>
78- </child>
79- <child>
80- <object class="GtkHBox" id="hbox5">
81- <property name="visible">True</property>
82- <property name="can_focus">False</property>
83- <property name="border_width">6</property>
84- <property name="spacing">12</property>
85- <child>
86- <object class="GtkImage" id="image_hig">
87- <property name="visible">True</property>
88- <property name="can_focus">False</property>
89- <property name="xalign">0</property>
90- <property name="yalign">0</property>
91- <property name="stock">gtk-dialog-error</property>
92- <property name="icon-size">6</property>
93- </object>
94- <packing>
95- <property name="expand">False</property>
96- <property name="fill">True</property>
97- <property name="position">0</property>
98- </packing>
99- </child>
100- <child>
101- <object class="GtkVBox" id="vbox8">
102- <property name="visible">True</property>
103- <property name="can_focus">False</property>
104- <property name="spacing">12</property>
105- <child>
106- <object class="GtkLabel" id="label_hig">
107- <property name="visible">True</property>
108- <property name="can_focus">False</property>
109- <property name="use_markup">True</property>
110- <property name="wrap">True</property>
111- </object>
112- <packing>
113- <property name="expand">False</property>
114- <property name="fill">True</property>
115- <property name="position">0</property>
116- </packing>
117- </child>
118- <child>
119- <object class="GtkExpander" id="expander_hig">
120- <property name="can_focus">True</property>
121- <property name="expanded">True</property>
122- <property name="spacing">6</property>
123- <child>
124- <object class="GtkScrolledWindow" id="scrolledwindow44">
125- <property name="visible">True</property>
126- <property name="can_focus">True</property>
127- <property name="shadow_type">in</property>
128- <child>
129- <object class="GtkTextView" id="textview_hig">
130- <property name="visible">True</property>
131- <property name="can_focus">True</property>
132- <property name="editable">False</property>
133- <property name="buffer">textbuffer_hig</property>
134- </object>
135- </child>
136- </object>
137- </child>
138- <child type="label">
139- <object class="GtkLabel" id="label27">
140- <property name="visible">True</property>
141- <property name="can_focus">False</property>
142- <property name="label" translatable="yes">Details</property>
143- </object>
144- </child>
145- </object>
146- <packing>
147- <property name="expand">True</property>
148- <property name="fill">True</property>
149- <property name="position">1</property>
150- </packing>
151- </child>
152- </object>
153- <packing>
154- <property name="expand">False</property>
155- <property name="fill">False</property>
156- <property name="position">1</property>
157- </packing>
158- </child>
159- </object>
160- <packing>
161- <property name="expand">False</property>
162- <property name="fill">True</property>
163- <property name="position">1</property>
164- </packing>
165- </child>
166- </object>
167- </child>
168- <action-widgets>
169- <action-widget response="-7">button2</action-widget>
170- </action-widgets>
171- </object>
172 <object class="GtkImage" id="image1">
173 <property name="visible">True</property>
174 <property name="can_focus">False</property>
175@@ -561,8 +427,6 @@
176 <property name="stock">gtk-apply</property>
177 </object>
178 <object class="GtkTextBuffer" id="textbuffer_description"/>
179- <object class="GtkTextBuffer" id="textbuffer_filelist"/>
180- <object class="GtkTextBuffer" id="textbuffer_hig"/>
181 <object class="GtkWindow" id="window_main">
182 <property name="can_focus">False</property>
183 <property name="title" translatable="yes">Package Installer</property>
184@@ -571,8 +435,8 @@
185 <accel-groups>
186 <group name="accelgroup1"/>
187 </accel-groups>
188+ <signal name="delete-event" handler="on_window_main_delete_event" swapped="no"/>
189 <signal name="drag-data-received" handler="on_window_main_drag_data_received" swapped="no"/>
190- <signal name="delete-event" handler="on_window_main_delete_event" swapped="no"/>
191 <child>
192 <object class="GtkVBox" id="vbox1">
193 <property name="visible">True</property>
194@@ -599,8 +463,8 @@
195 <property name="image">image1</property>
196 <property name="use_stock">False</property>
197 <property name="accel_group">accelgroup1</property>
198+ <signal name="activate" handler="on_open_activate" swapped="no"/>
199 <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
200- <signal name="activate" handler="on_open_activate" swapped="no"/>
201 </object>
202 </child>
203 <child>
204@@ -612,8 +476,8 @@
205 <property name="image">image2</property>
206 <property name="use_stock">False</property>
207 <property name="accel_group">accelgroup1</property>
208+ <signal name="activate" handler="on_refresh_activate" swapped="no"/>
209 <accelerator key="R" signal="activate" modifiers="GDK_CONTROL_MASK"/>
210- <signal name="activate" handler="on_refresh_activate" swapped="no"/>
211 </object>
212 </child>
213 <child>
214@@ -710,8 +574,8 @@
215 <object class="GtkLabel" id="label1">
216 <property name="visible">True</property>
217 <property name="can_focus">False</property>
218- <property name="xalign">0</property>
219 <property name="label" translatable="yes">Package:</property>
220+ <property name="xalign">0</property>
221 </object>
222 <packing>
223 <property name="x_options">GTK_FILL</property>
224@@ -722,9 +586,9 @@
225 <object class="GtkLabel" id="label_name">
226 <property name="visible">True</property>
227 <property name="can_focus">True</property>
228- <property name="xalign">0</property>
229 <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt; &lt;/big&gt;&lt;/b&gt;</property>
230 <property name="use_markup">True</property>
231+ <property name="xalign">0</property>
232 </object>
233 <packing>
234 <property name="left_attach">1</property>
235@@ -741,9 +605,9 @@
236 <object class="GtkLabel" id="label_status">
237 <property name="visible">True</property>
238 <property name="can_focus">True</property>
239+ <property name="wrap">True</property>
240 <property name="xalign">0</property>
241 <property name="yalign">0</property>
242- <property name="wrap">True</property>
243 </object>
244 <packing>
245 <property name="expand">True</property>
246@@ -794,9 +658,9 @@
247 <object class="GtkLabel" id="label3">
248 <property name="visible">True</property>
249 <property name="can_focus">False</property>
250+ <property name="label" translatable="yes">Status:</property>
251 <property name="xalign">0</property>
252 <property name="yalign">0</property>
253- <property name="label" translatable="yes">Status:</property>
254 </object>
255 <packing>
256 <property name="top_attach">2</property>
257@@ -808,8 +672,8 @@
258 <child>
259 <object class="GtkLabel" id="label24">
260 <property name="can_focus">False</property>
261- <property name="xalign">0</property>
262 <property name="label" translatable="yes">Description:</property>
263+ <property name="xalign">0</property>
264 </object>
265 <packing>
266 <property name="top_attach">1</property>
267@@ -821,8 +685,8 @@
268 <child>
269 <object class="GtkLabel" id="label_desc">
270 <property name="can_focus">True</property>
271- <property name="xalign">0</property>
272 <property name="selectable">True</property>
273+ <property name="xalign">0</property>
274 </object>
275 <packing>
276 <property name="left_attach">1</property>
277@@ -862,6 +726,22 @@
278 </packing>
279 </child>
280 <child>
281+ <object class="GtkButton" id="button_download">
282+ <property name="label" translatable="yes">_Download Package</property>
283+ <property name="sensitive">False</property>
284+ <property name="can_focus">True</property>
285+ <property name="can_default">True</property>
286+ <property name="receives_default">False</property>
287+ <property name="use_underline">True</property>
288+ <signal name="clicked" handler="on_button_download_clicked" swapped="no"/>
289+ </object>
290+ <packing>
291+ <property name="expand">False</property>
292+ <property name="fill">False</property>
293+ <property name="position">1</property>
294+ </packing>
295+ </child>
296+ <child>
297 <object class="GtkButton" id="button_remove">
298 <property name="label" translatable="yes">_Remove Package</property>
299 <property name="sensitive">False</property>
300@@ -878,22 +758,6 @@
301 </packing>
302 </child>
303 <child>
304- <object class="GtkButton" id="button_download">
305- <property name="label" translatable="yes">_Download Package</property>
306- <property name="sensitive">False</property>
307- <property name="can_focus">True</property>
308- <property name="can_default">True</property>
309- <property name="receives_default">False</property>
310- <property name="use_underline">True</property>
311- <signal name="clicked" handler="on_button_download_clicked" swapped="no"/>
312- </object>
313- <packing>
314- <property name="expand">False</property>
315- <property name="fill">False</property>
316- <property name="position">1</property>
317- </packing>
318- </child>
319- <child>
320 <placeholder/>
321 </child>
322 </object>
323@@ -960,9 +824,9 @@
324 <object class="GtkLabel" id="label23">
325 <property name="visible">True</property>
326 <property name="can_focus">False</property>
327- <property name="xalign">0</property>
328 <property name="label" translatable="yes">&lt;b&gt;Version:&lt;/b&gt;</property>
329 <property name="use_markup">True</property>
330+ <property name="xalign">0</property>
331 </object>
332 <packing>
333 <property name="x_options">GTK_FILL</property>
334@@ -973,9 +837,9 @@
335 <object class="GtkLabel" id="label15">
336 <property name="visible">True</property>
337 <property name="can_focus">False</property>
338- <property name="xalign">0</property>
339 <property name="label" translatable="yes">&lt;b&gt;Maintainer:&lt;/b&gt;</property>
340 <property name="use_markup">True</property>
341+ <property name="xalign">0</property>
342 </object>
343 <packing>
344 <property name="top_attach">1</property>
345@@ -988,9 +852,9 @@
346 <object class="GtkLabel" id="label16">
347 <property name="visible">True</property>
348 <property name="can_focus">False</property>
349- <property name="xalign">0</property>
350 <property name="label" translatable="yes">&lt;b&gt;Priority:&lt;/b&gt;</property>
351 <property name="use_markup">True</property>
352+ <property name="xalign">0</property>
353 </object>
354 <packing>
355 <property name="top_attach">2</property>
356@@ -1003,9 +867,9 @@
357 <object class="GtkLabel" id="label17">
358 <property name="visible">True</property>
359 <property name="can_focus">False</property>
360- <property name="xalign">0</property>
361 <property name="label" translatable="yes">&lt;b&gt;Section:&lt;/b&gt;</property>
362 <property name="use_markup">True</property>
363+ <property name="xalign">0</property>
364 </object>
365 <packing>
366 <property name="top_attach">3</property>
367@@ -1018,9 +882,9 @@
368 <object class="GtkLabel" id="label21">
369 <property name="visible">True</property>
370 <property name="can_focus">False</property>
371- <property name="xalign">0</property>
372 <property name="label" translatable="yes">&lt;b&gt;Size:&lt;/b&gt;</property>
373 <property name="use_markup">True</property>
374+ <property name="xalign">0</property>
375 </object>
376 <packing>
377 <property name="top_attach">4</property>
378@@ -1033,8 +897,8 @@
379 <object class="GtkLabel" id="label_maintainer">
380 <property name="visible">True</property>
381 <property name="can_focus">False</property>
382+ <property name="label" translatable="yes"> </property>
383 <property name="xalign">0</property>
384- <property name="label" translatable="yes"> </property>
385 </object>
386 <packing>
387 <property name="left_attach">1</property>
388@@ -1049,8 +913,8 @@
389 <object class="GtkLabel" id="label_priority">
390 <property name="visible">True</property>
391 <property name="can_focus">False</property>
392+ <property name="label" translatable="yes"> </property>
393 <property name="xalign">0</property>
394- <property name="label" translatable="yes"> </property>
395 </object>
396 <packing>
397 <property name="left_attach">1</property>
398@@ -1065,8 +929,8 @@
399 <object class="GtkLabel" id="label_section">
400 <property name="visible">True</property>
401 <property name="can_focus">False</property>
402+ <property name="label" translatable="yes"> </property>
403 <property name="xalign">0</property>
404- <property name="label" translatable="yes"> </property>
405 </object>
406 <packing>
407 <property name="left_attach">1</property>
408@@ -1081,8 +945,8 @@
409 <object class="GtkLabel" id="label_version">
410 <property name="visible">True</property>
411 <property name="can_focus">False</property>
412+ <property name="label" translatable="yes"> </property>
413 <property name="xalign">0</property>
414- <property name="label" translatable="yes"> </property>
415 </object>
416 <packing>
417 <property name="left_attach">1</property>
418@@ -1095,8 +959,8 @@
419 <object class="GtkLabel" id="label_size">
420 <property name="visible">True</property>
421 <property name="can_focus">False</property>
422+ <property name="label" translatable="yes"> </property>
423 <property name="xalign">0</property>
424- <property name="label" translatable="yes"> </property>
425 </object>
426 <packing>
427 <property name="left_attach">1</property>
428@@ -1267,4 +1131,141 @@
429 </object>
430 </child>
431 </object>
432+ <object class="GtkTextBuffer" id="textbuffer_filelist"/>
433+ <object class="GtkTextBuffer" id="textbuffer_hig"/>
434+ <object class="GtkDialog" id="dialog_hig">
435+ <property name="can_focus">False</property>
436+ <property name="border_width">6</property>
437+ <property name="resizable">False</property>
438+ <property name="window_position">center-on-parent</property>
439+ <property name="type_hint">dialog</property>
440+ <property name="skip_taskbar_hint">True</property>
441+ <property name="skip_pager_hint">True</property>
442+ <child internal-child="vbox">
443+ <object class="GtkBox" id="vbox7">
444+ <property name="visible">True</property>
445+ <property name="can_focus">False</property>
446+ <property name="orientation">vertical</property>
447+ <property name="spacing">12</property>
448+ <child internal-child="action_area">
449+ <object class="GtkButtonBox" id="hbuttonbox1">
450+ <property name="visible">True</property>
451+ <property name="can_focus">False</property>
452+ <property name="layout_style">end</property>
453+ <child>
454+ <object class="GtkButton" id="button2">
455+ <property name="label">gtk-close</property>
456+ <property name="visible">True</property>
457+ <property name="can_focus">True</property>
458+ <property name="can_default">True</property>
459+ <property name="receives_default">False</property>
460+ <property name="use_stock">True</property>
461+ </object>
462+ <packing>
463+ <property name="expand">False</property>
464+ <property name="fill">False</property>
465+ <property name="position">0</property>
466+ </packing>
467+ </child>
468+ </object>
469+ <packing>
470+ <property name="expand">False</property>
471+ <property name="fill">True</property>
472+ <property name="pack_type">end</property>
473+ <property name="position">0</property>
474+ </packing>
475+ </child>
476+ <child>
477+ <object class="GtkHBox" id="hbox5">
478+ <property name="visible">True</property>
479+ <property name="can_focus">False</property>
480+ <property name="border_width">6</property>
481+ <property name="spacing">12</property>
482+ <child>
483+ <object class="GtkImage" id="image_hig">
484+ <property name="visible">True</property>
485+ <property name="can_focus">False</property>
486+ <property name="xalign">0</property>
487+ <property name="yalign">0</property>
488+ <property name="stock">gtk-dialog-error</property>
489+ <property name="icon_size">6</property>
490+ </object>
491+ <packing>
492+ <property name="expand">False</property>
493+ <property name="fill">True</property>
494+ <property name="position">0</property>
495+ </packing>
496+ </child>
497+ <child>
498+ <object class="GtkVBox" id="vbox8">
499+ <property name="visible">True</property>
500+ <property name="can_focus">False</property>
501+ <property name="spacing">12</property>
502+ <child>
503+ <object class="GtkLabel" id="label_hig">
504+ <property name="visible">True</property>
505+ <property name="can_focus">False</property>
506+ <property name="use_markup">True</property>
507+ <property name="wrap">True</property>
508+ </object>
509+ <packing>
510+ <property name="expand">False</property>
511+ <property name="fill">True</property>
512+ <property name="position">0</property>
513+ </packing>
514+ </child>
515+ <child>
516+ <object class="GtkExpander" id="expander_hig">
517+ <property name="can_focus">True</property>
518+ <property name="expanded">True</property>
519+ <property name="spacing">6</property>
520+ <child>
521+ <object class="GtkScrolledWindow" id="scrolledwindow44">
522+ <property name="visible">True</property>
523+ <property name="can_focus">True</property>
524+ <property name="shadow_type">in</property>
525+ <child>
526+ <object class="GtkTextView" id="textview_hig">
527+ <property name="visible">True</property>
528+ <property name="can_focus">True</property>
529+ <property name="editable">False</property>
530+ <property name="buffer">textbuffer_hig</property>
531+ </object>
532+ </child>
533+ </object>
534+ </child>
535+ <child type="label">
536+ <object class="GtkLabel" id="label27">
537+ <property name="visible">True</property>
538+ <property name="can_focus">False</property>
539+ <property name="label" translatable="yes">Details</property>
540+ </object>
541+ </child>
542+ </object>
543+ <packing>
544+ <property name="expand">True</property>
545+ <property name="fill">True</property>
546+ <property name="position">1</property>
547+ </packing>
548+ </child>
549+ </object>
550+ <packing>
551+ <property name="expand">False</property>
552+ <property name="fill">False</property>
553+ <property name="position">1</property>
554+ </packing>
555+ </child>
556+ </object>
557+ <packing>
558+ <property name="expand">False</property>
559+ <property name="fill">True</property>
560+ <property name="position">1</property>
561+ </packing>
562+ </child>
563+ </object>
564+ </child>
565+ <action-widgets>
566+ <action-widget response="-7">button2</action-widget>
567+ </action-widgets>
568+ </object>
569 </interface>

Subscribers

People subscribed via source and target branches

to status/vote changes: