gdebi

Merge lp:~chamfay/gdebi/trunk into lp:gdebi

  1. trunk
  2. Merge into trunk
Proposed by Faissal Chamekh
Status: Needs review
Proposed branch: lp:~chamfay/gdebi/trunk
Merge into: lp:gdebi
Diff against target: 586 lines (+177/-177)
1 file modified
data/gdebi.ui (+177/-177)
To merge this branch: bzr merge lp:~chamfay/gdebi/trunk
Reviewer Review Type Date Requested Status
Faissal Chamekh Pending
Review via email: mp+294625@code.launchpad.net

Description of the change

Hi,
This changes expand packages widget in detail window (gdebi gtk version)
I just modified gdebi.ui glade file.

To post a comment you must log in.
lp:~chamfay/gdebi/trunk updated
494. By Faissal Chamekh

Expand Status label (gdebi gui)

Unmerged revisions

494. By Faissal Chamekh

Expand Status label (gdebi gui)

493. By Faissal Chamekh

Expand packages widget in details window

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

Subscribers

People subscribed via source and target branches

to status/vote changes: