Merge lp:~chrismcginlay/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-fix-715820 into lp:ubuntu/natty/ubuntuone-control-panel

[Chris McGinlay]

  * controlpanel/gtk/gui.py
    - Implement tooltips for Connect/Disconnect and Account/Cloud/Devices (LP: #715820)
    - Modified _update_status(), adding tooltip=None argument after callback argument
    - Modified ManagementPanel.__init__(), using set_tooltip_text().

[Natalia Bidart (nataliabidart)]

Hi Chris,

like I mentioned in the linked bug report, you should be building and proposing this branch against the project instead of the source package.

Also, all the UI and non-UI changes (except extremely trivial ones) should have its matching test suite proving the changes correctness.

And last but not least, we're not adding new strings to the UI without our product owner approval. About this, I will talk to him asking for review or re-wording of the added tooltips.

Summing up, I'll be disapproving this proposal but looking forward to see a new one with the things I mentioned above. Thanks!

review: Disapprove

Unmerged revisions

13. By Chris McGinlay on 2011-02-15

* controlpanel/gtk/gui.py
  - Implement tooltips for Connect/Disconnect and Account/Cloud/Devices (LP: #715820)
  - Modified _update_status(), adding tooltip=None argument after callback argument
  - Modified ManagementPanel.__init__(), using set_tooltip_text().

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-12 03:18:15 +0000
+++ debian/changelog	2011-02-15 00:47:53 +0000
@@ -1,3 +1,12 @@
+ubuntuone-control-panel (0.8.3-0ubuntu2) natty; urgency=low
+
+  * controlpanel/gtk/gui.py
+    - Implement tooltips for Connect/Disconnect and Account/Cloud/Devices (LP: #715820)
+    - Modified _update_status(), adding tooltip=None argument after callback argument
+    - Modified ManagementPanel.__init__(), using set_tooltip_text().
+
+ -- Chris McGinlay <[e-mail]>  Tue, 15 Feb 2011 00:28:23 +0000
+
 ubuntuone-control-panel (0.8.3-0ubuntu1) natty; urgency=low
 
   * New upstream release.

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-02-12 03:07:22 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-02-15 00:47:53 +0000
@@ -1112,6 +1112,9 @@
     START = _('Start')
     STOP = _('Stop')
 
+    CONNECT_TOOLTIP = _('Connect this computer to Ubuntu One service')
+    DISCONNECT_TOOLTIP = _('Disconnect this computer from Ubuntu One service')
+
     def __init__(self):
         gtk.HBox.__init__(self)
         ControlPanelMixin.__init__(self)
@@ -1144,7 +1147,7 @@
                                       error_handler=error_handler)
         self.show_all()
 
-    def _update_status(self, msg, action, callback, icon=None, color=None):
+    def _update_status(self, msg, action, callback, tooltip=None, icon=None, color=None):
         """Update the status info."""
         if icon is not None:
             foreground = '' if color is None else 'foreground="%s"' % color
@@ -1156,6 +1159,8 @@
         self.button.set_uri(action)
         self.button.set_sensitive(True)
         self.button.set_data('callback', callback)
+        if tooltip is not None:
+            self.button.set_tooltip_text(tooltip)
 
     def _on_button_clicked(self, button):
         """Button was clicked, act accordingly the label."""
@@ -1189,6 +1194,7 @@
         """Backend notifies of file sync status being ready."""
         self._update_status(self.FILE_SYNC_DISCONNECTED,
                             self.CONNECT, self.on_connect_clicked,
+                            self.CONNECT_TOOLTIP,
                             '✘', 'red')
 
     @log_call(logger.info)
@@ -1196,6 +1202,7 @@
         """Backend notifies of file sync status being syncing."""
         self._update_status(self.FILE_SYNC_SYNCING,
                             self.DISCONNECT, self.on_disconnect_clicked,
+                            self.DISCONNECT_TOOLTIP,
                             '⇅', ORANGE)
 
     @log_call(logger.info)
@@ -1203,6 +1210,7 @@
         """Backend notifies of file sync status being idle."""
         self._update_status(self.FILE_SYNC_IDLE,
                             self.DISCONNECT, self.on_disconnect_clicked,
+                            self.DISCONNECT_TOOLTIP,
                             '✔', 'green')
 
     @log_call(logger.error)
@@ -1264,6 +1272,10 @@
     QUOTA_LABEL = _('%(used)s used of %(total)s (%(percentage).1f%%)')
     DASHBOARD_BUTTON_NAME = 'Account'
     DEVICES_BUTTON_NAME = 'Devices'
+    DASHBOARD_BUTTON_TOOLTIP = _('Your personal details and service summary')
+    DEVICES_BUTTON_TOOLTIP = _('View, limit or remove devices that can '
+                                'connect to your personal cloud')
+    VOLUMES_BUTTON_TOOLTIP = _('Control which cloud folders to sync')
 
     def __init__(self, main_window=None):
         gtk.VBox.__init__(self)
@@ -1305,11 +1317,14 @@
             self.notebook.insert_page(getattr(self, tab), position=page_num)
 
         self.dashboard_button.set_name(self.DASHBOARD_BUTTON_NAME)
+        self.dashboard_button.set_tooltip_text(self.DASHBOARD_BUTTON_TOOLTIP)
 
         self.volumes_button.connect('clicked', lambda b: self.volumes.load())
         self.services_button.connect('clicked', lambda b: self.services.load())
+        self.volumes_button.set_tooltip_text(self.VOLUMES_BUTTON_TOOLTIP)
 
         self.devices_button.set_name(self.DEVICES_BUTTON_NAME)
+        self.devices_button.set_tooltip_text(self.DEVICES_BUTTON_TOOLTIP)
         self.devices_button.connect('clicked', lambda b: self.devices.load())
         self.devices.connect('local-device-removed',
                              lambda widget: self.emit('local-device-removed'))