Ubuntu
ubuntuone-control-panel package

Merge lp:~nataliabidart/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-0.9.4 into lp:ubuntu/natty/ubuntuone-control-panel

  1. Natty (11.04)
  2. ubuntuone-control-panel-0.9.4
  3. Merge into natty
Proposed by Natalia Bidart
Status: Merged
Merged at revision: 19
Proposed branch: lp:~nataliabidart/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-0.9.4
Merge into: lp:ubuntu/natty/ubuntuone-control-panel
Diff against target: 214 lines (+68/-33)
4 files modified
PKG-INFO (+1/-1)
data/dashboard.ui (+55/-31)
debian/changelog (+11/-0)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~nataliabidart/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-0.9.4
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+54599@code.launchpad.net

Description of the change

  * New upstream release:
    [ Natalia B. Bidart <email address hidden> ]
      - Improved the account tab to generate a better grouping of the
        information, and to be consistent with the services tab.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'PKG-INFO'
2--- PKG-INFO 2011-03-23 16:06:41 +0000
3+++ PKG-INFO 2011-03-23 20:39:47 +0000
4@@ -1,6 +1,6 @@
5 Metadata-Version: 1.1
6 Name: ubuntuone-control-panel
7-Version: 0.9.3
8+Version: 0.9.4
9 Summary: Ubuntu One Control Panel
10 Home-page: https://launchpad.net/ubuntuone-control-panel
11 Author: Natalia Bidart
12
13=== modified file 'data/dashboard.ui'
14--- data/dashboard.ui 2011-03-23 16:06:41 +0000
15+++ data/dashboard.ui 2011-03-23 20:39:47 +0000
16@@ -2,33 +2,36 @@
17 <interface>
18 <requires lib="gtk+" version="2.22"/>
19 <!-- interface-naming-policy project-wide -->
20- <object class="GtkVBox" id="itself">
21+ <object class="GtkAlignment" id="itself">
22 <property name="visible">True</property>
23 <property name="can_focus">False</property>
24+ <property name="yalign">0</property>
25+ <property name="yscale">0</property>
26 <child>
27 <object class="GtkHBox" id="account">
28 <property name="visible">True</property>
29 <property name="can_focus">False</property>
30 <property name="border_width">12</property>
31- <property name="spacing">20</property>
32- <property name="homogeneous">True</property>
33+ <property name="spacing">12</property>
34 <child>
35 <object class="GtkFrame" id="frame2">
36 <property name="visible">True</property>
37 <property name="can_focus">False</property>
38 <property name="label_xalign">0</property>
39- <property name="shadow_type">none</property>
40+ <property name="shadow_type">out</property>
41 <child>
42 <object class="GtkAlignment" id="alignment2">
43 <property name="visible">True</property>
44 <property name="can_focus">False</property>
45 <property name="top_padding">12</property>
46+ <property name="bottom_padding">12</property>
47 <property name="left_padding">12</property>
48+ <property name="right_padding">12</property>
49 <child>
50 <object class="GtkVBox" id="vbox5">
51 <property name="visible">True</property>
52 <property name="can_focus">False</property>
53- <property name="spacing">10</property>
54+ <property name="spacing">12</property>
55 <child>
56 <object class="GtkLabel" id="name_label">
57 <property name="visible">True</property>
58@@ -57,19 +60,30 @@
59 </packing>
60 </child>
61 <child>
62- <object class="GtkLinkButton" id="linkbutton3">
63- <property name="label" translatable="yes">Edit account details</property>
64+ <object class="GtkHButtonBox" id="hbuttonbox1">
65 <property name="visible">True</property>
66- <property name="can_focus">True</property>
67- <property name="receives_default">True</property>
68- <property name="tooltip_text" translatable="yes">Edit your account details</property>
69- <property name="use_action_appearance">False</property>
70- <property name="relief">half</property>
71- <property name="uri">http://login.ubuntu.com</property>
72+ <property name="can_focus">False</property>
73+ <child>
74+ <object class="GtkLinkButton" id="linkbutton3">
75+ <property name="label" translatable="yes">Edit account details</property>
76+ <property name="visible">True</property>
77+ <property name="can_focus">True</property>
78+ <property name="receives_default">True</property>
79+ <property name="use_action_appearance">False</property>
80+ <property name="relief">half</property>
81+ <property name="uri">http://login.ubuntu.com</property>
82+ </object>
83+ <packing>
84+ <property name="expand">False</property>
85+ <property name="fill">False</property>
86+ <property name="pack_type">end</property>
87+ <property name="position">0</property>
88+ </packing>
89+ </child>
90 </object>
91 <packing>
92 <property name="expand">False</property>
93- <property name="fill">False</property>
94+ <property name="fill">True</property>
95 <property name="pack_type">end</property>
96 <property name="position">2</property>
97 </packing>
98@@ -98,18 +112,20 @@
99 <property name="visible">True</property>
100 <property name="can_focus">False</property>
101 <property name="label_xalign">0</property>
102- <property name="shadow_type">none</property>
103+ <property name="shadow_type">out</property>
104 <child>
105- <object class="GtkAlignment" id="alignment1">
106+ <object class="GtkAlignment" id="alignment3">
107 <property name="visible">True</property>
108 <property name="can_focus">False</property>
109 <property name="top_padding">12</property>
110+ <property name="bottom_padding">12</property>
111 <property name="left_padding">12</property>
112+ <property name="right_padding">12</property>
113 <child>
114 <object class="GtkVBox" id="vbox4">
115 <property name="visible">True</property>
116 <property name="can_focus">False</property>
117- <property name="spacing">10</property>
118+ <property name="spacing">12</property>
119 <child>
120 <object class="GtkLabel" id="type_label">
121 <property name="visible">True</property>
122@@ -117,6 +133,8 @@
123 <property name="xalign">0</property>
124 <property name="label">Ubuntu One Basic (2 GB)
125 22GB of awesomeness
126+Total storage 22GB
127+You also have a mobile plan!
128 This is great!</property>
129 </object>
130 <packing>
131@@ -126,19 +144,30 @@
132 </packing>
133 </child>
134 <child>
135- <object class="GtkLinkButton" id="linkbutton1">
136- <property name="label" translatable="yes">Buy more storage and new plans</property>
137+ <object class="GtkHButtonBox" id="hbuttonbox2">
138 <property name="visible">True</property>
139- <property name="can_focus">True</property>
140- <property name="receives_default">True</property>
141- <property name="tooltip_text" translatable="yes">Upgrade the storage space on your account</property>
142- <property name="use_action_appearance">False</property>
143- <property name="relief">half</property>
144- <property name="uri">https://one.ubuntu.com/plans/</property>
145+ <property name="can_focus">False</property>
146+ <child>
147+ <object class="GtkLinkButton" id="linkbutton1">
148+ <property name="label" translatable="yes">Buy storage and plans</property>
149+ <property name="visible">True</property>
150+ <property name="can_focus">True</property>
151+ <property name="receives_default">True</property>
152+ <property name="use_action_appearance">False</property>
153+ <property name="relief">half</property>
154+ <property name="uri">https://one.ubuntu.com/plans/</property>
155+ </object>
156+ <packing>
157+ <property name="expand">False</property>
158+ <property name="fill">False</property>
159+ <property name="pack_type">end</property>
160+ <property name="position">0</property>
161+ </packing>
162+ </child>
163 </object>
164 <packing>
165 <property name="expand">False</property>
166- <property name="fill">False</property>
167+ <property name="fill">True</property>
168 <property name="pack_type">end</property>
169 <property name="position">1</property>
170 </packing>
171@@ -164,11 +193,6 @@
172 </packing>
173 </child>
174 </object>
175- <packing>
176- <property name="expand">False</property>
177- <property name="fill">True</property>
178- <property name="position">0</property>
179- </packing>
180 </child>
181 </object>
182 </interface>
183
184=== modified file 'debian/changelog'
185--- debian/changelog 2011-03-23 19:52:46 +0000
186+++ debian/changelog 2011-03-23 20:39:47 +0000
187@@ -1,3 +1,14 @@
188+ubuntuone-control-panel (0.9.4-0ubuntu1) UNRELEASED; urgency=low
189+
190+ * New upstream release:
191+
192+ [ Natalia B. Bidart <natalia.bidart@canonical.com> ]
193+ - Improved the account tab to generate a better grouping of the
194+ information, and to be consistent with the services tab.
195+
196+
197+ -- Natalia Bidart (nessita) <nataliabidart@gmail.com> Wed, 23 Mar 2011 17:33:59 -0300
198+
199 ubuntuone-control-panel (0.9.3-0ubuntu1) natty; urgency=low
200
201 * New upstream release:
202
203=== modified file 'setup.py'
204--- setup.py 2011-03-23 16:06:41 +0000
205+++ setup.py 2011-03-23 20:39:47 +0000
206@@ -79,7 +79,7 @@
207
208 DistUtilsExtra.auto.setup(
209 name='ubuntuone-control-panel',
210- version='0.9.3',
211+ version='0.9.4',
212 license='GPL v3',
213 author='Natalia Bidart',
214 author_email='natalia.bidart@canonical.com',

Subscribers

People subscribed via source and target branches