Merge lp:~ibelieve/ubuntu/raring/software-properties/fix-for-1058059 into lp:ubuntu/raring/software-properties

Proposed by Michael Spencer
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~ibelieve/ubuntu/raring/software-properties/fix-for-1058059
Merge into: lp:ubuntu/raring/software-properties
Diff against target: 66 lines (+19/-0)
2 files modified
data/gtkbuilder/main.ui (+12/-0)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~ibelieve/ubuntu/raring/software-properties/fix-for-1058059
Reviewer Review Type Date Requested Status
Matthew Paul Thomas (community) design Approve
Ubuntu branches Pending
Review via email: mp+133130@code.launchpad.net

Description of the change

Fix for LP: #1058059, "Menus are misaligned: "When there are other updates" and "Notify me of a new Ubuntu version""

Changes:
  Added combo box labels to a size group to keep the combo boxes all the same width

Testing:
  Check Updates tab for aligned combo boxes

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thank you for your work, that fixes the alignement of the combos indeed but the text is still left aligned and that makes weird spacing between the right of the text and the combos ... the design document on the bug (https://wiki.ubuntu.com/SoftwareUpdates#settings) has text right aligned against the combo, did you try to do that?

114. By Michael Spencer

Right aligned labels in Updates tab

Revision history for this message
Michael Spencer (ibelieve) wrote :

On 11/09/2012 06:54 AM, Sebastien Bacher wrote:
> Thank you for your work, that fixes the alignement of the combos indeed but the text is still left aligned and that makes weird spacing between the right of the text and the combos ... the design document on the bug (https://wiki.ubuntu.com/SoftwareUpdates#settings) has text right aligned against the combo, did you try to do that?
Sorry about that, I saw the design but somehow missed that the labels
were supposed to be right aligned. I've uploaded the branch with the
labels right aligned, so this is ready for review again.

Revision history for this message
Matthew Paul Thomas (mpt) wrote :

Nice job, thank you Michael!

review: Approve (design)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, merged to lp:software-properties and uploaded to raring

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/gtkbuilder/main.ui'
2--- data/gtkbuilder/main.ui 2012-08-27 09:56:47 +0000
3+++ data/gtkbuilder/main.ui 2012-11-09 14:06:24 +0000
4@@ -570,6 +570,7 @@
5 <object class="GtkLabel" id="label3">
6 <property name="visible">True</property>
7 <property name="can_focus">False</property>
8+ <property name="xalign">1</property>
9 <property name="label" translatable="yes">Automatically check for updates:</property>
10 </object>
11 <packing>
12@@ -612,6 +613,7 @@
13 <object class="GtkLabel" id="label4">
14 <property name="visible">True</property>
15 <property name="can_focus">False</property>
16+ <property name="xalign">1</property>
17 <property name="label" translatable="yes">When there are security updates:</property>
18 </object>
19 <packing>
20@@ -654,6 +656,7 @@
21 <object class="GtkLabel" id="label5">
22 <property name="visible">True</property>
23 <property name="can_focus">False</property>
24+ <property name="xalign">1</property>
25 <property name="label" translatable="yes">When there are other updates:</property>
26 </object>
27 <packing>
28@@ -710,6 +713,7 @@
29 <object class="GtkLabel" id="label29">
30 <property name="visible">True</property>
31 <property name="can_focus">False</property>
32+ <property name="xalign">1</property>
33 <property name="label" translatable="yes">Notify me of a new Ubuntu version:</property>
34 </object>
35 <packing>
36@@ -1109,4 +1113,12 @@
37 </object>
38 </child>
39 </object>
40+ <object class="GtkSizeGroup" id="sizegroup1">
41+ <widgets>
42+ <widget name="label3"/>
43+ <widget name="label4"/>
44+ <widget name="label5"/>
45+ <widget name="label29"/>
46+ </widgets>
47+ </object>
48 </interface>
49
50=== modified file 'debian/changelog'
51--- debian/changelog 2012-11-07 22:13:18 +0000
52+++ debian/changelog 2012-11-09 14:06:24 +0000
53@@ -7,6 +7,13 @@
54
55 software-properties (0.92.11) raring; urgency=low
56
57+ * data/gtkbuilder/main.ui: Fixed alignment of combo boxes in Updates tab
58+ (LP: #1058059)
59+
60+ -- Michael Spencer <spencers1993@gmail.com> Tue, 06 Nov 2012 09:45:12 -0600
61+
62+software-properties (0.92.11) raring; urgency=low
63+
64 * Force the python3 shebang to /usr/bin/python3.
65
66 -- Colin Watson <cjwatson@ubuntu.com> Thu, 01 Nov 2012 10:05:11 +0000

Subscribers

People subscribed via source and target branches