Merge lp:~nataliabidart/ubuntuone-control-panel/order-in-the-room into lp:ubuntuone-control-panel

[Natalia Bidart]

- Use proper mechanism to define object's signals (LP: #713271).

[Roberto Alsina (ralsina)]

works as promised

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-01-25 17:56:20 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-02-04 18:59:53 +0000
@@ -113,9 +113,6 @@
         gtk.show_uri(None, uri, gtk.gdk.CURRENT_TIME)
 
 
-gtk.link_button_set_uri_hook(uri_hook)
-
-
 class ControlPanelMixin(object):
     """The main interface for the Ubuntu One control panel."""
 
@@ -150,10 +147,6 @@
 
         logger.debug('%s: started.', self.__class__.__name__)
 
-    def debug(self, *args, **kwargs):
-        """Do some debug."""
-        print '\n', args, kwargs
-
     def humanize(self, int_bytes):
         """Return a human readble string of 'int_bytes'."""
         return GLib.format_size_for_display(int_bytes)
@@ -164,89 +157,6 @@
         label.show()
 
 
-class ControlPanelWindow(gtk.Window):
-    """The main window for the Ubuntu One control panel."""
-
-    TITLE = _('%(app_name)s Dashboard')
-
-    def __init__(self, switch_to=None):
-        super(ControlPanelWindow, self).__init__()
-
-        self.set_title(self.TITLE % {'app_name': U1_APP_NAME})
-        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
-        self.set_icon_name('ubuntuone')
-        self.set_size_request(-1, 525)  # bug #683164
-
-        self.connect('delete-event', lambda w, e: gtk.main_quit())
-        self.show()
-
-        self.control_panel = ControlPanel(main_window=self)
-        self.add(self.control_panel)
-
-        logger.info('Starting %s pointing at panel: %r.',
-                     self.__class__.__name__, switch_to)
-        if switch_to is not None:
-            button = getattr(self.control_panel.management,
-                             '%s_button' % switch_to, None)
-            if button is not None:
-                button.clicked()
-            else:
-                logger.warning('Could not start at panel: %r.', switch_to)
-
-        logger.debug('%s: started (window size %r).',
-                     self.__class__.__name__, self.get_size_request())
-
-    def main(self):
-        """Run the main loop of the widget toolkit."""
-        logger.debug('Starting GTK main loop.')
-        gtk.main()
-
-
-class ControlPanel(gtk.Notebook):
-    """The control panel per se, can be added into any other widget."""
-
-    # should not be any larger than 736x525
-
-    def __init__(self, main_window):
-        gtk.Notebook.__init__(self)
-        self.main_window = main_window
-
-        self.set_show_tabs(False)
-        self.set_show_border(False)
-
-        self.overview = OverviewPanel(main_window=main_window)
-        self.insert_page(self.overview, position=0)
-
-        self.management = ManagementPanel(main_window=main_window)
-        self.insert_page(self.management, position=1)
-
-        self.overview.connect('credentials-found',
-                              self.on_show_management_panel)
-        self.management.connect('local-device-removed',
-                                self.on_show_overview_panel)
-
-        self.show()
-        self.on_show_overview_panel()
-
-        logger.debug('%s: started (window size %r).',
-                     self.__class__.__name__, self.get_size_request())
-
-    def on_show_overview_panel(self, widget=None):
-        """Show the overview panel."""
-        self.set_current_page(0)
-
-    def on_show_management_panel(self, widget=None,
-                                 credentials_are_new=False, token=None):
-        """Show the notebook (main panel)."""
-        if self.get_current_page() == 0:
-            self.management.load()
-            if credentials_are_new:
-                # redirect user to volumes page to review subscription
-                self.management.volumes_button.clicked()
-
-            self.next_page()
-
-
 class UbuntuOneBin(gtk.VBox):
     """A Ubuntu One bin."""
 
@@ -305,6 +215,11 @@
 class OverviewPanel(GreyableBin, ControlPanelMixin):
     """The overview panel. Introduces Ubuntu One to the not logged user."""
 
+    __gsignals__ = {
+        'credentials-found': (gobject.SIGNAL_RUN_FIRST,  gobject.TYPE_NONE,
+                              (gobject.TYPE_BOOLEAN, gobject.TYPE_PYOBJECT)),
+    }
+
     CREDENTIALS_ERROR = _('There was a problem while retrieving the '
         'credentials.')
     AUTHORIZATION_DENIED = _('The authentication was cancelled. Please either '
@@ -819,6 +734,11 @@
 class DevicesPanel(UbuntuOneBin, ControlPanelMixin):
     """The devices panel."""
 
+    __gsignals__ = {
+        'local-device-removed': (gobject.SIGNAL_RUN_FIRST,
+                                 gobject.TYPE_NONE, ()),
+    }
+
     TITLE = _('The devices synced with your personal cloud are listed below.')
     NO_DEVICES = _('No devices to show.')
     CONFIRM_REMOVE = _('Are you sure you want to remove this device '
@@ -898,6 +818,10 @@
 class InstallPackage(gtk.VBox, ControlPanelMixin):
     """A widget to process the install of a package."""
 
+    __gsignals__ = {
+        'finished': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ()),
+    }
+
     INSTALL_PACKAGE = _('You need to install the package <i>%(package_name)s'
                         '</i> in order to enable replication.')
     INSTALLING = _('The package <i>%(package_name)s</i> is being installed, '
@@ -1340,6 +1264,11 @@
 
     """
 
+    __gsignals__ = {
+        'local-device-removed': (gobject.SIGNAL_RUN_FIRST,
+                                 gobject.TYPE_NONE, ()),
+    }
+
     QUOTA_LABEL = _('%(used)s used of %(total)s (%(percentage).1f%%)')
 
     def __init__(self, main_window=None):
@@ -1418,12 +1347,86 @@
         self._update_quota(WARNING_MARKUP % VALUE_ERROR)
 
 
-gobject.signal_new('credentials-found', OverviewPanel,
-                    gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
-                   (gobject.TYPE_BOOLEAN, gobject.TYPE_PYOBJECT))
-
-gobject.signal_new('local-device-removed', DevicesPanel,
-                    gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ())
-
-gobject.signal_new('finished', InstallPackage,
-                    gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ())
+class ControlPanel(gtk.Notebook):
+    """The control panel per se, can be added into any other widget."""
+
+    # should not be any larger than 736x525
+
+    def __init__(self, main_window):
+        gtk.Notebook.__init__(self)
+        gtk.link_button_set_uri_hook(uri_hook)
+
+        self.main_window = main_window
+
+        self.set_show_tabs(False)
+        self.set_show_border(False)
+
+        self.overview = OverviewPanel(main_window=main_window)
+        self.insert_page(self.overview, position=0)
+
+        self.management = ManagementPanel(main_window=main_window)
+        self.insert_page(self.management, position=1)
+
+        self.overview.connect('credentials-found',
+                              self.on_show_management_panel)
+        self.management.connect('local-device-removed',
+                                self.on_show_overview_panel)
+
+        self.show()
+        self.on_show_overview_panel()
+
+        logger.debug('%s: started (window size %r).',
+                     self.__class__.__name__, self.get_size_request())
+
+    def on_show_overview_panel(self, widget=None):
+        """Show the overview panel."""
+        self.set_current_page(0)
+
+    def on_show_management_panel(self, widget=None,
+                                 credentials_are_new=False, token=None):
+        """Show the notebook (main panel)."""
+        if self.get_current_page() == 0:
+            self.management.load()
+            if credentials_are_new:
+                # redirect user to volumes page to review subscription
+                self.management.volumes_button.clicked()
+
+            self.next_page()
+
+
+class ControlPanelWindow(gtk.Window):
+    """The main window for the Ubuntu One control panel."""
+
+    TITLE = _('%(app_name)s Dashboard')
+
+    def __init__(self, switch_to=None):
+        super(ControlPanelWindow, self).__init__()
+
+        self.set_title(self.TITLE % {'app_name': U1_APP_NAME})
+        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
+        self.set_icon_name('ubuntuone')
+        self.set_size_request(-1, 525)  # bug #683164
+
+        self.connect('delete-event', lambda w, e: gtk.main_quit())
+        self.show()
+
+        self.control_panel = ControlPanel(main_window=self)
+        self.add(self.control_panel)
+
+        logger.info('Starting %s pointing at panel: %r.',
+                     self.__class__.__name__, switch_to)
+        if switch_to is not None:
+            button = getattr(self.control_panel.management,
+                             '%s_button' % switch_to, None)
+            if button is not None:
+                button.clicked()
+            else:
+                logger.warning('Could not start at panel: %r.', switch_to)
+
+        logger.debug('%s: started (window size %r).',
+                     self.__class__.__name__, self.get_size_request())
+
+    def main(self):
+        """Run the main loop of the widget toolkit."""
+        logger.debug('Starting GTK main loop.')
+        gtk.main()