synaptic

Merge lp:~and471/synaptic/fix-resize-grip into lp:synaptic

  1. fix-resize-grip
  2. Merge into trunk
Proposed by Andrew
Status: Merged
Merged at revision: 1831
Proposed branch: lp:~and471/synaptic/fix-resize-grip
Merge into: lp:synaptic
Diff against target: 111 lines (+36/-32)
1 file modified
gtk/gtkbuilder/window_main.ui (+36/-32)
To merge this branch: bzr merge lp:~and471/synaptic/fix-resize-grip
Reviewer Review Type Date Requested Status
synaptic-developers Pending
Review via email: mp+49662@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Roth (evfool) wrote :

Why did you remove the translatable attributes?

Revision history for this message
Andrew (and471) wrote :

Hmm, that was the work of glade, and I assumed it was due to a slight syntax change (i.e. that if translatable="yes" is not there, it is assumed) however after more research I see this is not the case.

I have fixed this and updated the branch.

lp:~and471/synaptic/fix-resize-grip updated
1819. By Andrew <email address hidden>

undo the removing of translatable="yes"

1820. By Andrew <email address hidden>

okay really undo that all...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/gtkbuilder/window_main.ui'
2--- gtk/gtkbuilder/window_main.ui 2010-12-11 10:26:00 +0000
3+++ gtk/gtkbuilder/window_main.ui 2011-02-18 07:45:26 +0000
4@@ -63,7 +63,7 @@
5 <child>
6 <object class="GtkMenuItem" id="menu_add_downloadedfiles">
7 <property name="visible">True</property>
8- <property name="tooltip_text" translatable="yes">Add packages downloaded with the &quot;Generate package download script&quot; feature to the system</property>
9+ <property name="tooltip_text" translatable="yes">Add packages downloaded with the "Generate package download script" feature to the system</property>
10 <property name="label" translatable="yes">Add downloaded packages</property>
11 <property name="use_underline">True</property>
12 <signal name="activate" handler="on_add_downloadedfiles_activate"/>
13@@ -1427,14 +1427,13 @@
14 <property name="visible">True</property>
15 <property name="border_width">12</property>
16 <property name="spacing">6</property>
17- <property name="homogeneous">False</property>
18 <child>
19 <object class="GtkComboBox" id="combobox_depends">
20 <property name="visible">True</property>
21 </object>
22 <packing>
23+ <property name="expand">False</property>
24 <property name="position">0</property>
25- <property name="expand">False</property>
26 </packing>
27 </child>
28 <child>
29@@ -1791,48 +1790,53 @@
30 </packing>
31 </child>
32 <child>
33- <object class="GtkHBox" id="hbox_status">
34+ <object class="GtkAlignment" id="alignment2">
35 <property name="visible">True</property>
36- <property name="spacing">2</property>
37+ <property name="right_padding">18</property>
38 <child>
39- <object class="GtkScrolledWindow" id="scrolledwindow22">
40+ <object class="GtkHBox" id="hbox_status">
41 <property name="visible">True</property>
42- <property name="can_focus">True</property>
43- <property name="hscrollbar_policy">never</property>
44- <property name="vscrollbar_policy">never</property>
45+ <property name="spacing">2</property>
46 <child>
47- <object class="GtkViewport" id="viewport4">
48+ <object class="GtkScrolledWindow" id="scrolledwindow22">
49 <property name="visible">True</property>
50+ <property name="can_focus">True</property>
51+ <property name="hscrollbar_policy">never</property>
52+ <property name="vscrollbar_policy">never</property>
53 <child>
54- <object class="GtkLabel" id="label_status">
55- <property name="width_request">100</property>
56+ <object class="GtkViewport" id="viewport4">
57 <property name="visible">True</property>
58- <property name="xalign">0</property>
59- <property name="yalign">0</property>
60+ <property name="resize_mode">queue</property>
61+ <child>
62+ <object class="GtkLabel" id="label_status">
63+ <property name="width_request">100</property>
64+ <property name="visible">True</property>
65+ <property name="xalign">0</property>
66+ <property name="yalign">0</property>
67+ </object>
68+ </child>
69 </object>
70 </child>
71 </object>
72- </child>
73- </object>
74- <packing>
75- <property name="position">0</property>
76- </packing>
77- </child>
78- <child>
79- <object class="GtkProgressBar" id="progressbar_main">
80- <property name="visible">True</property>
81- <property name="pulse_step">0.10000000149</property>
82- </object>
83- <packing>
84- <property name="expand">False</property>
85- <property name="fill">False</property>
86- <property name="position">1</property>
87- </packing>
88+ <packing>
89+ <property name="position">0</property>
90+ </packing>
91+ </child>
92+ <child>
93+ <object class="GtkProgressBar" id="progressbar_main">
94+ <property name="visible">True</property>
95+ <property name="pulse_step">0.10000000149</property>
96+ </object>
97+ <packing>
98+ <property name="expand">False</property>
99+ <property name="fill">False</property>
100+ <property name="position">1</property>
101+ </packing>
102+ </child>
103+ </object>
104 </child>
105 </object>
106 <packing>
107- <property name="expand">False</property>
108- <property name="fill">False</property>
109 <property name="position">3</property>
110 </packing>
111 </child>

Subscribers

People subscribed via source and target branches

to status/vote changes: