Merge lp:~dobey/ubuntuone-client/prefs-sync-status into lp:ubuntuone-client

[dobey]

Add status info to the preferences dialog

[Facundo Batista (facundo)]

You shouldn't use Unicode characters in a non-Unicode string.

The easiest to do is to replace "…" per "...".

review: Needs Fixing

[lp:~dobey/ubuntuone-client/prefs-sync-status]

446. By dobey on 2010-03-25

Mark the string as a unicode object, since we use utf-8 characters inside it

[Facundo Batista (facundo)]

Looks ok now.

review: Approve

[lp:~dobey/ubuntuone-client/prefs-sync-status]

447. By dobey on 2010-03-25

Refactor the current_status/StatusChanged code to send the same dict

[Natalia Bidart (nataliabidart)]

When testing the ubuntuone-preferences, the window gets resized when changing the state legend.

I think that the status should be on a separated row and with a fixed wide, to avoid resizing.

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

> When testing the ubuntuone-preferences, the window gets resized when changing
> the state legend.
>
> I think that the status should be on a separated row and with a fixed wide, to
> avoid resizing.

Another thing to fix is the following:

 * Even after the IDLE status was emitted as per this log:

2010-03-26 10:42:52,301 - ubuntuone.SyncDaemon.EQ - DEBUG - push_event: SYS_STATE_CHANGED, args:(), kw:{'state': QUEUE_MANAGER (error=False connected=True online=True) Queue: IDLE Connection: With User With Network}

The u1-preferences status keeps sayins "Synchronization in progress..."
Only after a restart of the application, the status is "Synchronization complete"

[lp:~dobey/ubuntuone-client/prefs-sync-status]

448. By dobey on 2010-03-26

Move the status text to a second line, to avoid resizing the window

[Natalia Bidart (nataliabidart)]

Issues fixed, approving.

review: Approve

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-03-25 18:30:27 +0000
+++ bin/ubuntuone-preferences	2010-03-26 19:03:26 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 
 # ubuntuone-client-applet - Tray icon applet for managing Ubuntu One
 #
@@ -483,12 +484,13 @@
         # Timeout ID to avoid spamming DBus from spinbutton changes
         self.__update_id = 0
 
+        # Build the dialog
+        self.__construct()
+
         # SD Tool object
         self.sdtool = SyncDaemonTool(self.__bus)
-        self.sdtool.get_status().addCallbacks(lambda _: self.__got_state,
+        self.sdtool.get_status().addCallbacks(self.__got_state,
                                               self.__sd_error)
-        # Build the dialog
-        self.__construct()
         logger.debug("starting")
 
     def quit(self):
@@ -505,6 +507,21 @@
 
     def __got_state(self, state):
         """Got the state of syncdaemon."""
+        if not state['is_connected']:
+            self.status_label.set_text(_("Disconnected"))
+        else:
+            try:
+                status = state['name']
+                queues = state['queues']
+            except KeyError:
+                status = None
+                queues = None
+            if status == u'QUEUE_MANAGER' and queues == u'IDLE':
+                self.status_label.set_text(_("Synchronization complete"))
+            else:
+                self.status_label.set_text(_(u"Synchronization in progress…"))
+
+        # Update the stuff in the devices tab
         self.devices.handle_state_change(state)
 
     def __got_limits(self, limits):
@@ -684,29 +701,30 @@
         vbox.show()
 
         # Usage text/progress bar
-        hbox = gtk.HBox(homogeneous=True)
-        vbox.pack_start(hbox, False, False)
+        rbox = gtk.VBox(spacing=12)
+        vbox.pack_start(rbox, False, False)
+        rbox.show()
+
+        hbox = gtk.HBox(spacing=6)
+        rbox.pack_start(hbox, False, False)
         hbox.show()
 
-        label = gtk.Label("")
-        hbox.add(label)
-        label.show()
-
-        rbox = gtk.VBox(spacing=2)
-        hbox.pack_end(rbox)
-        rbox.show()
+        self.usage_graph = gtk.ProgressBar()
+        hbox.pack_start(self.usage_graph, False, False)
+        self.usage_graph.show()
 
         self.usage_label = gtk.Label("")
-        self.usage_label.set_alignment(0.5, 0.5)
-        rbox.add(self.usage_label)
+        self.usage_label.set_alignment(0.0, 0.5)
+        hbox.pack_start(self.usage_label, True, True)
         self.usage_label.show()
 
-        self.usage_graph = gtk.ProgressBar()
-        rbox.add(self.usage_graph)
-        self.usage_graph.show()
-
         self.update_quota_display(0, 2)
 
+        self.status_label = gtk.Label("")
+        self.status_label.set_alignment(0.0, 0.5)
+        rbox.pack_start(self.status_label, False, False)
+        self.status_label.show()
+
         # Notebook
         self.notebook = gtk.Notebook()
         vbox.add(self.notebook)
 
=== modified file 'ubuntuone/syncdaemon/dbus_interface.py'
--- ubuntuone/syncdaemon/dbus_interface.py	2010-03-23 22:48:19 +0000
+++ ubuntuone/syncdaemon/dbus_interface.py	2010-03-26 19:03:26 +0000
@@ -143,17 +143,11 @@
         DBusExposedObject.__init__(self, bus_name=bus_name,
                                    path=self.path)
 
-    @dbus.service.method(DBUS_IFACE_STATUS_NAME,
-                         in_signature='', out_signature='a{ss}')
-    def current_status(self):
-        """ return the current status of the system, one of: local_rescan,
-        offline, trying_to_connect, server_rescan or online.
-        """
-        logger.debug('called current_status')
+    def _get_current_state(self):
+        """Get the current status of the system."""
         state = self.dbus_iface.main.state_manager.state
         connection = self.dbus_iface.main.state_manager.connection.state
         queues = self.dbus_iface.main.state_manager.queues.state.name
-        self.emit_status_changed(state)
         state_dict = {
             'name': state.name,
             'description': state.description,
@@ -165,6 +159,15 @@
         }
         return state_dict
 
+    @dbus.service.method(DBUS_IFACE_STATUS_NAME,
+                         in_signature='', out_signature='a{ss}')
+    def current_status(self):
+        """ return the current status of the system, one of: local_rescan,
+        offline, trying_to_connect, server_rescan or online.
+        """
+        logger.debug('called current_status')
+        return self._get_current_state()
+
     @dbus.service.method(DBUS_IFACE_STATUS_NAME, out_signature='aa{ss}')
     def current_downloads(self):
         """ return list of files with a download in progress. """
@@ -335,12 +338,7 @@
 
     def emit_status_changed(self, state):
         """Emits the signal."""
-        state_dict = {'name':state.name,
-                      'description':state.description,
-                      'is_error':self.bool_str(state.is_error),
-                      'is_connected':self.bool_str(state.is_connected),
-                      'is_online':self.bool_str(state.is_online)}
-        self.StatusChanged(state_dict)
+        self.StatusChanged(self._get_current_state())
 
     def emit_download_started(self, download):
         """ Emits the signal """