Ubuntu One Control Panel

Merge lp:~nataliabidart/ubuntuone-control-panel/align-devices into lp:ubuntuone-control-panel

  1. align-devices
  2. Merge into trunk
Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 73
Merged at revision: 73
Proposed branch: lp:~nataliabidart/ubuntuone-control-panel/align-devices
Merge into: lp:ubuntuone-control-panel
Diff against target: 76 lines (+38/-7)
1 file modified
data/device.ui (+38/-7)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-control-panel/align-devices
Reviewer Review Type Date Requested Status
Eric Casteleijn (community) Approve
Martin Albisetti (community) Approve
Review via email: mp+50164@code.launchpad.net

Commit message

- Limit speed layout was improved (LP: #715812).

To post a comment you must log in.
Revision history for this message
Martin Albisetti (beuno) :
review: Approve
Revision history for this message
Eric Casteleijn (thisfred) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/device.ui'
2--- data/device.ui 2011-02-16 20:23:35 +0000
3+++ data/device.ui 2011-02-17 15:13:00 +0000
4@@ -60,7 +60,7 @@
5 <object class="GtkTable" id="throttling">
6 <property name="visible">True</property>
7 <property name="n_rows">4</property>
8- <property name="n_columns">2</property>
9+ <property name="n_columns">3</property>
10 <property name="column_spacing">3</property>
11 <property name="row_spacing">3</property>
12 <child>
13@@ -90,9 +90,8 @@
14 <child>
15 <object class="GtkLabel" id="max_upload_speed_label">
16 <property name="visible">True</property>
17- <property name="xalign">1</property>
18- <property name="xpad">5</property>
19- <property name="label" translatable="yes">Max upload speed (KiB/s)</property>
20+ <property name="xalign">0</property>
21+ <property name="label" translatable="yes">Max upload speed:</property>
22 <property name="track_visited_links">False</property>
23 </object>
24 <packing>
25@@ -103,9 +102,8 @@
26 <child>
27 <object class="GtkLabel" id="max_download_speed_label">
28 <property name="visible">True</property>
29- <property name="xalign">1</property>
30- <property name="xpad">5</property>
31- <property name="label" translatable="yes">Max download speed (KiB/s)</property>
32+ <property name="xalign">0</property>
33+ <property name="label" translatable="yes">Max download speed:</property>
34 </object>
35 <packing>
36 <property name="top_attach">3</property>
37@@ -151,6 +149,39 @@
38 <child>
39 <placeholder/>
40 </child>
41+ <child>
42+ <placeholder/>
43+ </child>
44+ <child>
45+ <placeholder/>
46+ </child>
47+ <child>
48+ <placeholder/>
49+ </child>
50+ <child>
51+ <object class="GtkLabel" id="label1">
52+ <property name="visible">True</property>
53+ <property name="label" translatable="yes">KiB/s</property>
54+ </object>
55+ <packing>
56+ <property name="left_attach">2</property>
57+ <property name="right_attach">3</property>
58+ <property name="top_attach">2</property>
59+ <property name="bottom_attach">3</property>
60+ </packing>
61+ </child>
62+ <child>
63+ <object class="GtkLabel" id="label2">
64+ <property name="visible">True</property>
65+ <property name="label" translatable="yes">KiB/s</property>
66+ </object>
67+ <packing>
68+ <property name="left_attach">2</property>
69+ <property name="right_attach">3</property>
70+ <property name="top_attach">3</property>
71+ <property name="bottom_attach">4</property>
72+ </packing>
73+ </child>
74 </object>
75 </child>
76 </object>

Subscribers

People subscribed via source and target branches