Merge lp:~alecu/ubuntuone-control-panel/ui-bigrename into lp:ubuntuone-control-panel
- ui-bigrename
- Merge into trunk
Proposed by
Alejandro J. Cura
Status: | Merged |
---|---|
Approved by: | Natalia Bidart |
Approved revision: | 156 |
Merged at revision: | 148 |
Proposed branch: | lp:~alecu/ubuntuone-control-panel/ui-bigrename |
Merge into: | lp:ubuntuone-control-panel |
Diff against target: |
661 lines (+117/-76) 7 files modified
data/qt/controlpanel.ui (+35/-22) data/qt/devices.ui (+13/-13) data/qt/folders.ui (+2/-2) data/qt/mainwindow.ui (+14/-2) data/qt/preferences.ui (+13/-13) data/qt/profile.ui (+26/-10) data/qt/services.ui (+14/-14) |
To merge this branch: | bzr merge lp:~alecu/ubuntuone-control-panel/ui-bigrename |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Manuel de la Peña (community) | Approve | ||
Review via email: mp+61985@code.launchpad.net |
Commit message
Saner names for all the Qt widgets
Description of the change
Saner names for all the Qt widgets
To post a comment you must log in.
- 155. By Alejandro J. Cura
-
Use snake_case for widget names
- 156. By Alejandro J. Cura
-
remove richtext from the usage_label on the grounds of easier translation
Revision history for this message
Manuel de la Peña (mandel) : | # |
review:
Approve
Revision history for this message
Natalia Bidart (nataliabidart) : | # |
review:
Approve
- 157. By Alejandro J. Cura
-
use just <b> for bolding, not all the verbose html complaint that qt designer adds
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'data/qt/controlpanel.ui' |
2 | --- data/qt/controlpanel.ui 2011-05-23 13:44:43 +0000 |
3 | +++ data/qt/controlpanel.ui 2011-05-23 16:27:13 +0000 |
4 | @@ -6,8 +6,8 @@ |
5 | <rect> |
6 | <x>0</x> |
7 | <y>0</y> |
8 | - <width>873</width> |
9 | - <height>464</height> |
10 | + <width>646</width> |
11 | + <height>421</height> |
12 | </rect> |
13 | </property> |
14 | <property name="sizePolicy"> |
15 | @@ -23,7 +23,7 @@ |
16 | <item> |
17 | <layout class="QHBoxLayout" name="horizontalLayout"> |
18 | <item> |
19 | - <widget class="QLabel" name="label_2"> |
20 | + <widget class="QLabel" name="greeting_label"> |
21 | <property name="text"> |
22 | <string>Hello Lisette!</string> |
23 | </property> |
24 | @@ -43,18 +43,14 @@ |
25 | </spacer> |
26 | </item> |
27 | <item> |
28 | - <widget class="QLabel" name="label"> |
29 | + <widget class="QLabel" name="usage_label"> |
30 | <property name="text"> |
31 | - <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> |
32 | -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
33 | -p, li { white-space: pre-wrap; } |
34 | -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> |
35 | -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">39% of 22 GB</span> in use</p></body></html></string> |
36 | + <string>39% of 22 GB in use</string> |
37 | </property> |
38 | </widget> |
39 | </item> |
40 | <item> |
41 | - <widget class="QPushButton" name="pushButton_2"> |
42 | + <widget class="QPushButton" name="get_more_space_button"> |
43 | <property name="text"> |
44 | <string>Get more space!</string> |
45 | </property> |
46 | @@ -78,14 +74,17 @@ |
47 | </spacer> |
48 | </item> |
49 | <item> |
50 | - <widget class="QLabel" name="label_3"> |
51 | + <widget class="QLabel" name="sync_status_label"> |
52 | <property name="text"> |
53 | <string>Sync in progress...</string> |
54 | </property> |
55 | + <property name="buddy"> |
56 | + <cstring>change_sync_status_button</cstring> |
57 | + </property> |
58 | </widget> |
59 | </item> |
60 | <item> |
61 | - <widget class="QPushButton" name="pushButton"> |
62 | + <widget class="QPushButton" name="change_sync_status_button"> |
63 | <property name="text"> |
64 | <string>Stop Syncing</string> |
65 | </property> |
66 | @@ -107,34 +106,40 @@ |
67 | </layout> |
68 | </item> |
69 | <item> |
70 | - <widget class="QTabWidget" name="tabWidget"> |
71 | + <widget class="QTabWidget" name="tab_widget"> |
72 | + <property name="sizePolicy"> |
73 | + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> |
74 | + <horstretch>0</horstretch> |
75 | + <verstretch>0</verstretch> |
76 | + </sizepolicy> |
77 | + </property> |
78 | <property name="styleSheet"> |
79 | <string notr="true"/> |
80 | </property> |
81 | <property name="currentIndex"> |
82 | <number>4</number> |
83 | </property> |
84 | - <widget class="FoldersPanel" name="tab"> |
85 | + <widget class="FoldersPanel" name="folders_tab"> |
86 | <attribute name="title"> |
87 | <string>Folders</string> |
88 | </attribute> |
89 | </widget> |
90 | - <widget class="ServicesPanel" name="tab_2"> |
91 | + <widget class="ServicesPanel" name="services_tab"> |
92 | <attribute name="title"> |
93 | <string>Services</string> |
94 | </attribute> |
95 | </widget> |
96 | - <widget class="DevicesPanel" name="tab_3"> |
97 | + <widget class="DevicesPanel" name="devices_tab"> |
98 | <attribute name="title"> |
99 | <string>Devices</string> |
100 | </attribute> |
101 | </widget> |
102 | - <widget class="PreferencesPanel" name="tab_4"> |
103 | + <widget class="PreferencesPanel" name="preferences_tab"> |
104 | <attribute name="title"> |
105 | <string>Preferences</string> |
106 | </attribute> |
107 | </widget> |
108 | - <widget class="ProfilePanel" name="tab_5"> |
109 | + <widget class="ProfilePanel" name="profile_tab"> |
110 | <attribute name="title"> |
111 | <string>Account information</string> |
112 | </attribute> |
113 | @@ -144,7 +149,7 @@ |
114 | <item> |
115 | <layout class="QHBoxLayout" name="horizontalLayout_3"> |
116 | <item> |
117 | - <widget class="QPushButton" name="pushButton_3"> |
118 | + <widget class="QPushButton" name="help_button"> |
119 | <property name="text"> |
120 | <string>Help</string> |
121 | </property> |
122 | @@ -164,14 +169,14 @@ |
123 | </spacer> |
124 | </item> |
125 | <item> |
126 | - <widget class="QLabel" name="label_4"> |
127 | + <widget class="QLabel" name="follow_us_label"> |
128 | <property name="text"> |
129 | <string>Follow us:</string> |
130 | </property> |
131 | </widget> |
132 | </item> |
133 | <item> |
134 | - <widget class="QPushButton" name="pushButton_5"> |
135 | + <widget class="QPushButton" name="twitter_button"> |
136 | <property name="styleSheet"> |
137 | <string notr="true">color: #fff; |
138 | background-color: rgb(0, 170, 255); |
139 | @@ -186,7 +191,7 @@ |
140 | </widget> |
141 | </item> |
142 | <item> |
143 | - <widget class="QPushButton" name="pushButton_4"> |
144 | + <widget class="QPushButton" name="facebook_button"> |
145 | <property name="styleSheet"> |
146 | <string notr="true">color: #fff; |
147 | background-color: rgb(0, 0, 128); |
148 | @@ -236,6 +241,14 @@ |
149 | <container>1</container> |
150 | </customwidget> |
151 | </customwidgets> |
152 | + <tabstops> |
153 | + <tabstop>tab_widget</tabstop> |
154 | + <tabstop>help_button</tabstop> |
155 | + <tabstop>twitter_button</tabstop> |
156 | + <tabstop>facebook_button</tabstop> |
157 | + <tabstop>change_sync_status_button</tabstop> |
158 | + <tabstop>get_more_space_button</tabstop> |
159 | + </tabstops> |
160 | <resources/> |
161 | <connections/> |
162 | </ui> |
163 | |
164 | === modified file 'data/qt/devices.ui' |
165 | --- data/qt/devices.ui 2011-05-20 23:37:46 +0000 |
166 | +++ data/qt/devices.ui 2011-05-23 16:27:13 +0000 |
167 | @@ -15,7 +15,7 @@ |
168 | </property> |
169 | <layout class="QVBoxLayout" name="verticalLayout"> |
170 | <item> |
171 | - <widget class="QLabel" name="label"> |
172 | + <widget class="QLabel" name="tab_header_label"> |
173 | <property name="text"> |
174 | <string>All cloud connected devices</string> |
175 | </property> |
176 | @@ -43,23 +43,23 @@ |
177 | </property> |
178 | <layout class="QGridLayout" name="gridLayout_2"> |
179 | <item row="0" column="0"> |
180 | - <layout class="QGridLayout" name="gridLayout"> |
181 | + <layout class="QGridLayout" name="devices_grid_layout"> |
182 | <item row="0" column="0"> |
183 | - <widget class="QLabel" name="label_2"> |
184 | + <widget class="QLabel" name="device_icon_label"> |
185 | <property name="text"> |
186 | <string>(laptop icon, big)</string> |
187 | </property> |
188 | </widget> |
189 | </item> |
190 | <item row="0" column="1"> |
191 | - <widget class="QLabel" name="label_3"> |
192 | + <widget class="QLabel" name="device_name_label"> |
193 | <property name="text"> |
194 | <string>Nessita's laptop</string> |
195 | </property> |
196 | </widget> |
197 | </item> |
198 | <item row="0" column="2"> |
199 | - <widget class="QPushButton" name="pushButton"> |
200 | + <widget class="QPushButton" name="delete_device_button"> |
201 | <property name="text"> |
202 | <string>Delete device</string> |
203 | </property> |
204 | @@ -68,7 +68,7 @@ |
205 | <item row="1" column="0" colspan="3"> |
206 | <layout class="QHBoxLayout" name="horizontalLayout"> |
207 | <item> |
208 | - <widget class="QLabel" name="label_5"> |
209 | + <widget class="QLabel" name="other_devices_label"> |
210 | <property name="text"> |
211 | <string>Other devices connected to my cloud</string> |
212 | </property> |
213 | @@ -88,7 +88,7 @@ |
214 | </spacer> |
215 | </item> |
216 | <item> |
217 | - <widget class="QPushButton" name="pushButton_4"> |
218 | + <widget class="QPushButton" name="manage_devices_button"> |
219 | <property name="text"> |
220 | <string>Go to the web page to manage your other devices</string> |
221 | </property> |
222 | @@ -97,42 +97,42 @@ |
223 | </layout> |
224 | </item> |
225 | <item row="2" column="0"> |
226 | - <widget class="QLabel" name="label_6"> |
227 | + <widget class="QLabel" name="sample_icon_1"> |
228 | <property name="text"> |
229 | <string>(laptop icon, smaller)</string> |
230 | </property> |
231 | </widget> |
232 | </item> |
233 | <item row="2" column="1"> |
234 | - <widget class="QLabel" name="label_7"> |
235 | + <widget class="QLabel" name="sample_name_1"> |
236 | <property name="text"> |
237 | <string>Nessita's other laptop</string> |
238 | </property> |
239 | </widget> |
240 | </item> |
241 | <item row="3" column="0"> |
242 | - <widget class="QLabel" name="label_8"> |
243 | + <widget class="QLabel" name="sample_icon_2"> |
244 | <property name="text"> |
245 | <string>(smartphone icon)</string> |
246 | </property> |
247 | </widget> |
248 | </item> |
249 | <item row="3" column="1"> |
250 | - <widget class="QLabel" name="label_9"> |
251 | + <widget class="QLabel" name="sample_name_2"> |
252 | <property name="text"> |
253 | <string>Samsung Nexus S</string> |
254 | </property> |
255 | </widget> |
256 | </item> |
257 | <item row="4" column="0"> |
258 | - <widget class="QLabel" name="label_4"> |
259 | + <widget class="QLabel" name="sample_icon_3"> |
260 | <property name="text"> |
261 | <string>(smartphone icon)</string> |
262 | </property> |
263 | </widget> |
264 | </item> |
265 | <item row="4" column="1"> |
266 | - <widget class="QLabel" name="label_10"> |
267 | + <widget class="QLabel" name="sample_name_3"> |
268 | <property name="text"> |
269 | <string>iPhone 3GS</string> |
270 | </property> |
271 | |
272 | === modified file 'data/qt/folders.ui' |
273 | --- data/qt/folders.ui 2011-05-20 23:36:37 +0000 |
274 | +++ data/qt/folders.ui 2011-05-23 16:27:13 +0000 |
275 | @@ -30,7 +30,7 @@ |
276 | </spacer> |
277 | </item> |
278 | <item> |
279 | - <widget class="QPushButton" name="pushButton"> |
280 | + <widget class="QPushButton" name="share_publish_button"> |
281 | <property name="text"> |
282 | <string>Go to the web to share folders and publish files</string> |
283 | </property> |
284 | @@ -52,7 +52,7 @@ |
285 | </layout> |
286 | </item> |
287 | <item> |
288 | - <widget class="QTreeWidget" name="treeWidget"> |
289 | + <widget class="QTreeWidget" name="folders_tree_widget"> |
290 | <property name="alternatingRowColors"> |
291 | <bool>true</bool> |
292 | </property> |
293 | |
294 | === modified file 'data/qt/mainwindow.ui' |
295 | --- data/qt/mainwindow.ui 2011-05-23 13:44:43 +0000 |
296 | +++ data/qt/mainwindow.ui 2011-05-23 16:27:13 +0000 |
297 | @@ -6,10 +6,22 @@ |
298 | <rect> |
299 | <x>0</x> |
300 | <y>0</y> |
301 | - <width>474</width> |
302 | - <height>189</height> |
303 | + <width>736</width> |
304 | + <height>525</height> |
305 | </rect> |
306 | </property> |
307 | + <property name="sizePolicy"> |
308 | + <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> |
309 | + <horstretch>0</horstretch> |
310 | + <verstretch>0</verstretch> |
311 | + </sizepolicy> |
312 | + </property> |
313 | + <property name="baseSize"> |
314 | + <size> |
315 | + <width>0</width> |
316 | + <height>0</height> |
317 | + </size> |
318 | + </property> |
319 | <property name="windowTitle"> |
320 | <string>MainWindow</string> |
321 | </property> |
322 | |
323 | === modified file 'data/qt/preferences.ui' |
324 | --- data/qt/preferences.ui 2011-05-20 23:37:46 +0000 |
325 | +++ data/qt/preferences.ui 2011-05-23 16:27:13 +0000 |
326 | @@ -15,7 +15,7 @@ |
327 | </property> |
328 | <layout class="QVBoxLayout" name="verticalLayout_2"> |
329 | <item> |
330 | - <widget class="QLabel" name="label"> |
331 | + <widget class="QLabel" name="tab_header_label"> |
332 | <property name="text"> |
333 | <string>(empty)</string> |
334 | </property> |
335 | @@ -28,34 +28,34 @@ |
336 | </property> |
337 | <layout class="QGridLayout" name="gridLayout"> |
338 | <item row="0" column="0"> |
339 | - <widget class="QCheckBox" name="checkBox"> |
340 | + <widget class="QCheckBox" name="limit_uploads_checkbox"> |
341 | <property name="text"> |
342 | <string>Limit upload speed to</string> |
343 | </property> |
344 | </widget> |
345 | </item> |
346 | <item row="0" column="1"> |
347 | - <widget class="QSpinBox" name="spinBox"/> |
348 | + <widget class="QSpinBox" name="upload_speed_spinbox"/> |
349 | </item> |
350 | <item row="0" column="2"> |
351 | - <widget class="QLabel" name="label_2"> |
352 | + <widget class="QLabel" name="kbps_label_1"> |
353 | <property name="text"> |
354 | <string>Kilobits per second</string> |
355 | </property> |
356 | </widget> |
357 | </item> |
358 | <item row="1" column="0"> |
359 | - <widget class="QCheckBox" name="checkBox_2"> |
360 | + <widget class="QCheckBox" name="limit_downloads_checkbox"> |
361 | <property name="text"> |
362 | <string>Limit download speed to</string> |
363 | </property> |
364 | </widget> |
365 | </item> |
366 | <item row="1" column="1"> |
367 | - <widget class="QSpinBox" name="spinBox_2"/> |
368 | + <widget class="QSpinBox" name="download_speed_spinbox"/> |
369 | </item> |
370 | <item row="1" column="2"> |
371 | - <widget class="QLabel" name="label_3"> |
372 | + <widget class="QLabel" name="kbps_label_2"> |
373 | <property name="text"> |
374 | <string>Kilobits per second</string> |
375 | </property> |
376 | @@ -84,28 +84,28 @@ |
377 | </property> |
378 | <layout class="QVBoxLayout" name="verticalLayout"> |
379 | <item> |
380 | - <widget class="QCheckBox" name="checkBox_3"> |
381 | + <widget class="QCheckBox" name="auto_connect_checkbox"> |
382 | <property name="text"> |
383 | <string>Connect automatically when computer starts</string> |
384 | </property> |
385 | </widget> |
386 | </item> |
387 | <item> |
388 | - <widget class="QCheckBox" name="checkBox_4"> |
389 | + <widget class="QCheckBox" name="auto_sync_local_folders_checkbox"> |
390 | <property name="text"> |
391 | <string>Automatically sync all selected folders on this computer to the cloud</string> |
392 | </property> |
393 | </widget> |
394 | </item> |
395 | <item> |
396 | - <widget class="QCheckBox" name="checkBox_5"> |
397 | + <widget class="QCheckBox" name="auto_sync_shares_to_me_checkbox"> |
398 | <property name="text"> |
399 | <string>Automatically sync all folders shared with me by other to this computer</string> |
400 | </property> |
401 | </widget> |
402 | </item> |
403 | <item> |
404 | - <widget class="QCheckBox" name="checkBox_6"> |
405 | + <widget class="QCheckBox" name="show_notifications_checkbox"> |
406 | <property name="text"> |
407 | <string>Allow all notifications to this device</string> |
408 | </property> |
409 | @@ -117,7 +117,7 @@ |
410 | <item> |
411 | <layout class="QHBoxLayout" name="horizontalLayout"> |
412 | <item> |
413 | - <widget class="QPushButton" name="pushButton"> |
414 | + <widget class="QPushButton" name="restore_defaults_button"> |
415 | <property name="text"> |
416 | <string>Restore default configuration</string> |
417 | </property> |
418 | @@ -137,7 +137,7 @@ |
419 | </spacer> |
420 | </item> |
421 | <item> |
422 | - <widget class="QPushButton" name="pushButton_2"> |
423 | + <widget class="QPushButton" name="apply_changes_button"> |
424 | <property name="text"> |
425 | <string>Apply changes</string> |
426 | </property> |
427 | |
428 | === modified file 'data/qt/profile.ui' |
429 | --- data/qt/profile.ui 2011-05-20 23:37:46 +0000 |
430 | +++ data/qt/profile.ui 2011-05-23 16:27:13 +0000 |
431 | @@ -15,7 +15,7 @@ |
432 | </property> |
433 | <layout class="QVBoxLayout" name="verticalLayout"> |
434 | <item> |
435 | - <widget class="QLabel" name="label"> |
436 | + <widget class="QLabel" name="tab_header_label"> |
437 | <property name="text"> |
438 | <string>(empty)</string> |
439 | </property> |
440 | @@ -33,21 +33,24 @@ |
441 | <enum>QFormLayout::AllNonFixedFieldsGrow</enum> |
442 | </property> |
443 | <item row="0" column="1"> |
444 | - <widget class="QLineEdit" name="lineEdit"> |
445 | + <widget class="QLineEdit" name="fullname_lineedit"> |
446 | <property name="text"> |
447 | <string>John Cheepaca</string> |
448 | </property> |
449 | </widget> |
450 | </item> |
451 | <item row="1" column="0"> |
452 | - <widget class="QLabel" name="label_4"> |
453 | + <widget class="QLabel" name="email_label"> |
454 | <property name="text"> |
455 | <string>Email</string> |
456 | </property> |
457 | + <property name="buddy"> |
458 | + <cstring>email_lineedit</cstring> |
459 | + </property> |
460 | </widget> |
461 | </item> |
462 | <item row="1" column="1"> |
463 | - <widget class="QLineEdit" name="lineEdit_2"> |
464 | + <widget class="QLineEdit" name="email_lineedit"> |
465 | <property name="text"> |
466 | <string>chipaca@canonical.com</string> |
467 | </property> |
468 | @@ -57,14 +60,17 @@ |
469 | </widget> |
470 | </item> |
471 | <item row="2" column="0"> |
472 | - <widget class="QLabel" name="label_3"> |
473 | + <widget class="QLabel" name="password_label"> |
474 | <property name="text"> |
475 | <string>Password</string> |
476 | </property> |
477 | + <property name="buddy"> |
478 | + <cstring>password_lineedit</cstring> |
479 | + </property> |
480 | </widget> |
481 | </item> |
482 | <item row="2" column="1"> |
483 | - <widget class="QLineEdit" name="lineEdit_3"> |
484 | + <widget class="QLineEdit" name="password_lineedit"> |
485 | <property name="text"> |
486 | <string>secretpass</string> |
487 | </property> |
488 | @@ -74,10 +80,13 @@ |
489 | </widget> |
490 | </item> |
491 | <item row="0" column="0"> |
492 | - <widget class="QLabel" name="label_2"> |
493 | + <widget class="QLabel" name="fullname_label"> |
494 | <property name="text"> |
495 | <string>Full name</string> |
496 | </property> |
497 | + <property name="buddy"> |
498 | + <cstring>fullname_lineedit</cstring> |
499 | + </property> |
500 | </widget> |
501 | </item> |
502 | </layout> |
503 | @@ -99,7 +108,7 @@ |
504 | </spacer> |
505 | </item> |
506 | <item> |
507 | - <widget class="QPushButton" name="pushButton"> |
508 | + <widget class="QPushButton" name="edit_profile_button"> |
509 | <property name="text"> |
510 | <string>Edit your profile</string> |
511 | </property> |
512 | @@ -131,7 +140,7 @@ |
513 | </property> |
514 | <layout class="QGridLayout" name="gridLayout"> |
515 | <item row="0" column="0" colspan="2"> |
516 | - <widget class="QLabel" name="label_5"> |
517 | + <widget class="QLabel" name="modify_billing_label"> |
518 | <property name="text"> |
519 | <string>You can modify your billing address and credit card details at any time</string> |
520 | </property> |
521 | @@ -151,7 +160,7 @@ |
522 | </spacer> |
523 | </item> |
524 | <item row="1" column="1"> |
525 | - <widget class="QPushButton" name="pushButton_2"> |
526 | + <widget class="QPushButton" name="edit_billing_information_button"> |
527 | <property name="text"> |
528 | <string>Edit billing information</string> |
529 | </property> |
530 | @@ -175,6 +184,13 @@ |
531 | </item> |
532 | </layout> |
533 | </widget> |
534 | + <tabstops> |
535 | + <tabstop>fullname_lineedit</tabstop> |
536 | + <tabstop>email_lineedit</tabstop> |
537 | + <tabstop>password_lineedit</tabstop> |
538 | + <tabstop>edit_profile_button</tabstop> |
539 | + <tabstop>edit_billing_information_button</tabstop> |
540 | + </tabstops> |
541 | <resources/> |
542 | <connections/> |
543 | </ui> |
544 | |
545 | === modified file 'data/qt/services.ui' |
546 | --- data/qt/services.ui 2011-05-20 23:37:46 +0000 |
547 | +++ data/qt/services.ui 2011-05-23 16:27:13 +0000 |
548 | @@ -15,18 +15,18 @@ |
549 | </property> |
550 | <layout class="QVBoxLayout" name="verticalLayout"> |
551 | <item> |
552 | - <widget class="QLabel" name="label_3"> |
553 | + <widget class="QLabel" name="tab_header_label"> |
554 | <property name="text"> |
555 | <string>Selected plans and storage</string> |
556 | </property> |
557 | </widget> |
558 | </item> |
559 | <item> |
560 | - <layout class="QVBoxLayout" name="verticalLayout_2"> |
561 | + <layout class="QVBoxLayout" name="mobile_plan_verticallayout"> |
562 | <item> |
563 | <layout class="QHBoxLayout" name="horizontalLayout"> |
564 | <item> |
565 | - <widget class="QLabel" name="label"> |
566 | + <widget class="QLabel" name="mobile_plan_title_label"> |
567 | <property name="text"> |
568 | <string>Ubuntu One Mobile</string> |
569 | </property> |
570 | @@ -46,7 +46,7 @@ |
571 | </spacer> |
572 | </item> |
573 | <item> |
574 | - <widget class="QLabel" name="label_2"> |
575 | + <widget class="QLabel" name="mobile_plan_trial_label"> |
576 | <property name="text"> |
577 | <string>14 days free trial left</string> |
578 | </property> |
579 | @@ -55,14 +55,14 @@ |
580 | </layout> |
581 | </item> |
582 | <item> |
583 | - <widget class="Line" name="line"> |
584 | + <widget class="Line" name="mobile_plan_horizontal_line"> |
585 | <property name="orientation"> |
586 | <enum>Qt::Horizontal</enum> |
587 | </property> |
588 | </widget> |
589 | </item> |
590 | <item> |
591 | - <widget class="QLabel" name="label_4"> |
592 | + <widget class="QLabel" name="mobile_plan_billing_label"> |
593 | <property name="text"> |
594 | <string>Billed Monthly - $3.99 per month</string> |
595 | </property> |
596 | @@ -84,7 +84,7 @@ |
597 | </spacer> |
598 | </item> |
599 | <item> |
600 | - <widget class="QPushButton" name="pushButton"> |
601 | + <widget class="QPushButton" name="mobile_plan_modify_button"> |
602 | <property name="text"> |
603 | <string>Go to the web to modify your plan</string> |
604 | </property> |
605 | @@ -124,11 +124,11 @@ |
606 | </spacer> |
607 | </item> |
608 | <item> |
609 | - <layout class="QVBoxLayout" name="verticalLayout_3"> |
610 | + <layout class="QVBoxLayout" name="storage_plan_verticallayout"> |
611 | <item> |
612 | <layout class="QHBoxLayout" name="horizontalLayout_3"> |
613 | <item> |
614 | - <widget class="QLabel" name="label_5"> |
615 | + <widget class="QLabel" name="storage_plan_total_label"> |
616 | <property name="text"> |
617 | <string>22 GB in total</string> |
618 | </property> |
619 | @@ -148,7 +148,7 @@ |
620 | </spacer> |
621 | </item> |
622 | <item> |
623 | - <widget class="QLabel" name="label_6"> |
624 | + <widget class="QLabel" name="storage_plan_usage_label"> |
625 | <property name="text"> |
626 | <string>39% in use</string> |
627 | </property> |
628 | @@ -157,21 +157,21 @@ |
629 | </layout> |
630 | </item> |
631 | <item> |
632 | - <widget class="Line" name="line_2"> |
633 | + <widget class="Line" name="storage_plan_horizontalline"> |
634 | <property name="orientation"> |
635 | <enum>Qt::Horizontal</enum> |
636 | </property> |
637 | </widget> |
638 | </item> |
639 | <item> |
640 | - <widget class="QLabel" name="label_7"> |
641 | + <widget class="QLabel" name="storage_plan_line1_label"> |
642 | <property name="text"> |
643 | <string>2 GB from your free account</string> |
644 | </property> |
645 | </widget> |
646 | </item> |
647 | <item> |
648 | - <widget class="QLabel" name="label_8"> |
649 | + <widget class="QLabel" name="storage_plan_line2_label"> |
650 | <property name="text"> |
651 | <string>+ 1 x 20Gb - Pack of storage</string> |
652 | </property> |
653 | @@ -193,7 +193,7 @@ |
654 | </spacer> |
655 | </item> |
656 | <item> |
657 | - <widget class="QPushButton" name="pushButton_2"> |
658 | + <widget class="QPushButton" name="storage_plan_modify_button"> |
659 | <property name="text"> |
660 | <string>Go to the web to update your storage</string> |
661 | </property> |