Merge lp:~larsu/ubiquity/lp1260396 into lp:ubiquity

Proposed by Lars Karlitski
Status: Merged
Merged at revision: 6099
Proposed branch: lp:~larsu/ubiquity/lp1260396
Merge into: lp:ubiquity
Diff against target: 23 lines (+2/-0)
2 files modified
gui/gtk/stepPrepare.ui (+1/-0)
gui/gtk/stepWireless.ui (+1/-0)
To merge this branch: bzr merge lp:~larsu/ubiquity/lp1260396
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Approve
Review via email: mp+199463@code.launchpad.net

Commit message

Limit width of some long labels in prepare and wireless

Prior to gtk 3.10, these labels were wrapped automatically, because window width was limited to 640 pixels (if there were no widgets that requested more space). This patch forces these labels to wrap by limiting their line length to 50 characters.

Description of the change

Limit width of some long labels in prepare and wireless

Prior to gtk 3.10, these labels were wrapped automatically, because window width was limited to 640 pixels (if there were no widgets that requested more space). This patch forces these labels to wrap by limiting their line length to 50 characters.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

This definitely looks better. However I think it still looks wider than it used to be, I'll try to figure out what other (optional) pages push the window as wide as it now is in trusty. Thanks a lot for this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gui/gtk/stepPrepare.ui'
2--- gui/gtk/stepPrepare.ui 2012-06-19 08:46:09 +0000
3+++ gui/gtk/stepPrepare.ui 2013-12-18 14:30:42 +0000
4@@ -121,6 +121,7 @@
5 <property name="xalign">0</property>
6 <property name="label" translatable="yes">${RELEASE} uses third-party software to play Flash, MP3 and other media, and to work with some graphics and wi-fi hardware. Some of this software is proprietary. The software is subject to license terms included with its documentation.</property>
7 <property name="wrap">True</property>
8+ <property name="max-width-chars">50</property>
9 </object>
10 <packing>
11 <property name="expand">True</property>
12
13=== modified file 'gui/gtk/stepWireless.ui'
14--- gui/gtk/stepWireless.ui 2012-02-10 21:13:47 +0000
15+++ gui/gtk/stepWireless.ui 2013-12-18 14:30:42 +0000
16@@ -15,6 +15,7 @@
17 <property name="xalign">0</property>
18 <property name="label" translatable="yes">Connecting this computer to a wi-fi network helps with</property>
19 <property name="wrap">True</property>
20+ <property name="max-width-chars">50</property>
21 </object>
22 <packing>
23 <property name="expand">False</property>

Subscribers

People subscribed via source and target branches

to status/vote changes: