Merge lp:~nataliabidart/ubuntuone-control-panel/rename-buttons into lp:ubuntuone-control-panel

Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 103
Merged at revision: 104
Proposed branch: lp:~nataliabidart/ubuntuone-control-panel/rename-buttons
Merge into: lp:ubuntuone-control-panel
Diff against target: 47 lines (+6/-6)
2 files modified
ubuntuone/controlpanel/gtk/gui.py (+4/-4)
ubuntuone/controlpanel/gtk/tests/test_gui_basic.py (+2/-2)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-control-panel/rename-buttons
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Martin Albisetti (community) Approve
Review via email: mp+54249@code.launchpad.net

Commit message

- Name for notebook's tab-buttons have now a more realistic name, and also match those from the theme ("ModeLeft" and "ModeRight").

- After initial computer adding, the user is redirected to the Services tab (LP: #739576).

To post a comment you must log in.
Revision history for this message
Martin Albisetti (beuno) :
review: Approve
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
2--- ubuntuone/controlpanel/gtk/gui.py 2011-03-18 21:01:49 +0000
3+++ ubuntuone/controlpanel/gtk/gui.py 2011-03-21 18:14:40 +0000
4@@ -1399,8 +1399,8 @@
5
6 QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
7 QUOTA_THRESHOLD = 0.95
8- DASHBOARD_BUTTON_NAME = 'Account'
9- SERVICES_BUTTON_NAME = 'Devices' # Intentional until the theme is fixed
10+ DASHBOARD_BUTTON_NAME = 'ModeLeft'
11+ SERVICES_BUTTON_NAME = 'ModeRight'
12
13 DASHBOARD_BUTTON_TOOLTIP = _('View your personal details and service '
14 'summary')
15@@ -1547,8 +1547,8 @@
16 if self.get_current_page() == 0:
17 self.management.load()
18 if credentials_are_new:
19- # redirect user to volumes page to review subscription
20- self.management.volumes_button.clicked()
21+ # redirect user to services page to start using Ubuntu One
22+ self.management.services_button.clicked()
23
24 self.next_page()
25
26
27=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py'
28--- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py 2011-03-04 13:15:01 +0000
29+++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py 2011-03-21 18:14:40 +0000
30@@ -196,7 +196,7 @@
31 def test_credentials_found_shows_volumes_management_panel(self):
32 """On 'credentials-found' signal, the management panel is shown.
33
34- If first signal parameter is True, visible tab should be volumes.
35+ If first signal parameter is True, visible tab should be services.
36
37 """
38 a_token = object()
39@@ -204,7 +204,7 @@
40
41 self.assert_current_tab_correct(self.ui.management)
42 self.assertEqual(self.ui.management.notebook.get_current_page(),
43- self.ui.management.VOLUMES_PAGE)
44+ self.ui.management.SERVICES_PAGE)
45
46 def test_local_device_removed_shows_overview_panel(self):
47 """On 'local-device-removed' signal, the overview panel is shown."""

Subscribers

People subscribed via source and target branches