Merge lp:~alecu/ubuntuone-client/use-libunity into lp:ubuntuone-client

[Alejandro J. Cura]

Show/update/hide the progressbar, and show/hide the emblem in the Unity icon launcher (Bug #702116)

Show/update/hide the progressbar, and show/hide the emblem in the Unity icon launcher (Bug #702116)

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~alecu/ubuntuone-client/use-libunity]

884. By Alejandro J. Cura on 2011-02-21

do not use libunity if not installed.

[Manuel de la Peña (mandel)]

I do not know if this is related with my system, but when running make check I get the following:

Making check in data
make[1]: Entering directory `/home/mandel/Projects/ubuntuone-client/use-libunity/data'
make[1]: Nothing to be done for `check'.
make[1]: Leaving directory `/home/mandel/Projects/ubuntuone-client/use-libunity/data'
Making check in libsyncdaemon
make[1]: Entering directory `/home/mandel/Projects/ubuntuone-client/use-libunity/libsyncdaemon'
make[1]: Leaving directory `/home/mandel/Projects/ubuntuone-client/use-libunity/libsyncdaemon'
Making check in nautilus
make[1]: Entering directory `/home/mandel/Projects/ubuntuone-client/use-libunity/nautilus'
make[1]: Nothing to be done for `check'.
make[1]: Leaving directory `/home/mandel/Projects/ubuntuone-client/use-libunity/nautilus'
Making check in po
make[1]: Entering directory `/home/mandel/Projects/ubuntuone-client/use-libunity/po'
rm -f missing notexist
srcdir=. /usr/bin/intltool-update -m
if [ -r missing -o -r notexist ]; then \
   exit 1; \
 fi
make[1]: Leaving directory `/home/mandel/Projects/ubuntuone-client/use-libunity/po'
Making check in gsd-plugin
make[1]: Entering directory `/home/mandel/Projects/ubuntuone-client/use-libunity/gsd-plugin'
make[1]: Nothing to be done for `check'.
make[1]: Leaving directory `/home/mandel/Projects/ubuntuone-client/use-libunity/gsd-plugin'
Making check in docs
make[1]: Entering directory `/home/mandel/Projects/ubuntuone-client/use-libunity/docs'
Making check in reference
make[2]: Entering directory `/home/mandel/Projects/ubuntuone-client/use-libunity/docs/reference'
make[2]: Nothing to be done for `check'.
make[2]: Leaving directory `/home/mandel/Projects/ubuntuone-client/use-libunity/docs/reference'
make[2]: Entering directory `/home/mandel/Projects/ubuntuone-client/use-libunity/docs'
make[2]: Nothing to be done for `check-am'.
make[2]: Leaving directory `/home/mandel/Projects/ubuntuone-client/use-libunity/docs'
make[1]: Leaving directory `/home/mandel/Projects/ubuntuone-client/use-libunity/docs'
make[1]: Entering directory `/home/mandel/Projects/ubuntuone-client/use-libunity'
sed -e 's|\@localedir\@|/usr/local/share/locale|g' \
 -e 's|\@libexecdir\@|/usr/local/libexec|g' \
 -e 's|\@GETTEXT_PACKAGE\@|ubuntuone-client|g' \
 -e 's|\@SSO_APP_NAME\@|Ubuntu One|g' \
 -e 's|\@SSO_TC_URL\@|https://one.ubuntu.com/terms/|g' \
 -e 's|\@SSO_PING_URL\@|https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/|g' \
 -e 's|\@VERSION\@|1.5.4|g' < ubuntuone/clientdefs.py.in > ubuntuone/clientdefs.py
if test "x." != "x."; then \
  if [ ! -e pylintrc -a ! -h pylintrc ]; then \
   ln -s ./pylintrc; \
  fi; \
 fi
make -C data logging.conf
make[2]: Entering directory `/home/mandel/Projects/ubuntuone-client/use-libunity/data'
make[2]: `logging.conf' is up to date.
make[2]: Leaving directory `/home/mandel/Projects/ubuntuone-client/use-libunity/data'
make[1]: Leaving directory `/home/mandel/Projects/ubuntuone-client/use-libunity'
if test "x." != "x."; then \
  if [ ! -e pylintrc -a ! -h pylintrc ]; then \
   ln -s ./pylintrc; \
  fi; \
 fi
PYTHONPATH=""::.:."" SRCDIR="." USE_PYFLAKES="true" u1lint
make -C data logging.conf
make[1]: Entering directory `/home/mandel/Pr...

review: Needs Fixing (clean natty install)

[Manuel de la Peña (mandel)]

Approved as discussed on irc.

review: Approve

=== added file 'tests/platform/linux/test_unity.py'
--- tests/platform/linux/test_unity.py	1970-01-01 00:00:00 +0000
+++ tests/platform/linux/test_unity.py	2011-02-21 22:33:34 +0000
@@ -0,0 +1,108 @@
+# tests.platform.linux.test_unity
+#
+# Author: Alejandro J. Cura <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the libunity interface."""
+
+from twisted.trial.unittest import TestCase
+
+from ubuntuone.platform.linux import unity
+
+
+class FakeLauncherEntryProps(object):
+    """A fake Unity.LauncherEntry.props"""
+
+    progress = 0.0
+    progress_visible = False
+    emblem = None
+    emblem_visible = False
+
+
+class FakeLauncherEntry(object):
+    """A fake Unity.LauncherEntry"""
+
+    @staticmethod
+    def get_for_desktop_id(dotdesktop):
+        """Find the LauncherEntry for a given dotdesktop."""
+        return FakeLauncherEntry()
+
+    def __init__(self):
+        """Initialize this fake instance."""
+        self.props = FakeLauncherEntryProps()
+
+
+class FakeThemedIcon(object):
+    """A fake gio.ThemedIcon."""
+
+    def __init__(self, name):
+        """Initialize this fake instance."""
+        self.name = name
+
+
+class LauncherProgressbarEmblemTestCase(TestCase):
+    """Test the Launcher progressbar and emblem."""
+    
+    skip = None if unity.use_libunity else "libunity not installed."
+
+    def setUp(self):
+        """Initialize this test instance."""
+        self.patch(unity.Unity, "LauncherEntry", FakeLauncherEntry)
+        self.patch(unity.gio, "ThemedIcon", FakeThemedIcon)
+        self.launcher = unity.UbuntuOneLauncher()
+
+    def test_progress_starts_hidden(self):
+        """The progressbar starts hidden."""
+        self.assertFalse(self.launcher.entry.props.progress_visible,
+                         "The progressbar starts hidden.")
+
+    def test_progress_shown(self):
+        """The progressbar is shown."""
+        self.launcher.show_progressbar()
+        self.assertTrue(self.launcher.entry.props.progress_visible,
+                        "The progressbar is shown.")
+
+    def test_progress_hidden_after_shown(self):
+        """The progressbar is hidden after being shown."""
+        self.launcher.show_progressbar()
+        self.launcher.hide_progressbar()
+        self.assertFalse(self.launcher.entry.props.progress_visible,
+                         "The progressbar is hidden.")
+
+    def test_progress_is_updated(self):
+        """The progress value is updated."""
+        value = 0.5
+        self.launcher.set_progress(value)
+        self.assertEqual(self.launcher.entry.props.progress, value)
+
+    def test_warning_emblem_made_visible(self):
+        """The emblem is made visible."""
+        self.launcher.show_warning_emblem()
+        self.assertTrue(self.launcher.entry.props.emblem_visible,
+                        "The emblem is made visible.")
+
+    def test_right_emblem_displayed(self):
+        """The right emblem is displayed."""
+        emblem_name = unity.EMBLEM_IMPORTANT
+        self.launcher.show_warning_emblem()
+        self.assertEqual(self.launcher.entry.props.emblem.name, emblem_name)
+
+    def test_emblem_hidden_after_shown(self):
+        """The emblem is hidden after being shown."""
+        self.launcher.show_warning_emblem()
+        self.launcher.hide_emblem()
+        self.assertFalse(self.launcher.entry.props.emblem_visible,
+                         "The emblem is hidden.")

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2011-02-17 13:11:11 +0000
+++ tests/status/test_aggregator.py	2011-02-21 22:33:34 +0000
@@ -606,11 +606,41 @@
         self.assertEqual(1, len(self.bubble.notification.notifications_shown))
 
 
+class FakeLauncher(object):
+    """A fake UbuntuOneLauncher."""
+
+    progress_visible = False
+    progress = 0.0
+    emblem_visible = False
+    emblem = None
+
+    def show_progressbar(self):
+        """The progressbar is shown."""
+        self.progress_visible = True
+
+    def hide_progressbar(self):
+        """The progressbar is hidden."""
+        self.progress_visible = False
+
+    def set_progress(self, value):
+        """The progressbar value is changed."""
+        self.progress = value
+
+    def show_warning_emblem(self):
+        """Show a warning emblem."""
+        self.emblem_visible = True
+
+    def hide_emblem(self):
+        """Hide the current emblem."""
+        self.emblem_visible = False
+
+
 class ProgressBarTestCase(TestCase):
     """Tests for the progress bar."""
 
     def setUp(self):
         """Initialize this test instance."""
+        self.patch(aggregator, "UbuntuOneLauncher", FakeLauncher)
         self.clock = PatchedClock()
         self.bar = aggregator.ProgressBar(clock=self.clock)
         self.addCleanup(self.bar.cleanup)
@@ -619,7 +649,7 @@
 
         def fake_timeout(result):
             """A fake _timeout method."""
-            self.timeout_calls.append(self.bar.percentage)
+            self.timeout_calls.append(self.bar.progress)
             original_timeout(result)
 
         self.patch(self.bar, "_timeout", fake_timeout)
@@ -628,11 +658,12 @@
         """The progress bar is shown when progress is made."""
         self.bar.progress_made(50, 100)
         self.assertTrue(self.bar.visible)
+        self.assertTrue(self.bar.launcher.progress_visible)
 
     def test_progress_made_updates_counter(self):
         """Progress made updates the counter."""
         self.bar.progress_made(50, 100)
-        self.assertEqual(self.bar.percentage, 50.0)
+        self.assertEqual(self.bar.progress, 0.5)
 
     def test_no_timer_set_initially(self):
         """There's no timer set initially."""
@@ -643,16 +674,24 @@
         self.bar.progress_made(50, 100)
         self.assertNotEqual(self.bar.timer, None)
 
+    def test_cleanup_resets_timer(self):
+        """The cleanup method resets the timer."""
+        self.bar.progress_made(50, 100)
+        self.bar.cleanup()
+        self.assertEqual(self.bar.timer, None)
+
     def test_progress_made_not_updated_initially(self):
         """Progress made is not updated initially."""
         self.bar.progress_made(50, 100)
         self.assertEqual(0, len(self.timeout_calls))
+        self.assertEqual(0.0, self.bar.launcher.progress)
 
     def test_progress_made_updated_after_a_delay(self):
         """The progressbar is updated after a delay."""
         self.bar.progress_made(50, 100)
         self.clock.advance(aggregator.ProgressBar.updates_delay)
-        self.assertIn(50.0, self.timeout_calls)
+        self.assertIn(0.5, self.timeout_calls)
+        self.assertEqual(0.5, self.bar.launcher.progress)
 
     def test_progress_updates_are_aggregated(self):
         """The progressbar is updated after a delay."""
@@ -666,8 +705,10 @@
         """The progressbar updates are continuous."""
         self.bar.progress_made(50, 100)
         self.clock.advance(aggregator.ProgressBar.updates_delay)
+        self.assertEqual(0.5, self.bar.launcher.progress)
         self.bar.progress_made(60, 100)
         self.clock.advance(aggregator.ProgressBar.updates_delay)
+        self.assertEqual(0.6, self.bar.launcher.progress)
         self.assertEqual(2, len(self.timeout_calls))
 
     def test_hidden_when_completed(self):
@@ -675,18 +716,21 @@
         self.bar.progress_made(50, 100)
         self.bar.completed()
         self.assertFalse(self.bar.visible)
-
-    def test_disable(self):
-        """The bar pulse is disabled."""
-        self.bar.enable()
-        self.bar.disable()
-        self.assertFalse(self.bar.pulsating)
-
-    def test_enable(self):
-        """The bar pulse is enabled."""
-        self.bar.disable()
-        self.bar.enable()
-        self.assertTrue(self.bar.pulsating)
+        self.assertFalse(self.bar.launcher.progress_visible)
+
+    def test_show_warning_emblem(self):
+        """The warning emblem is shown."""
+        self.bar.hide_emblem()
+        self.bar.show_warning_emblem()
+        self.assertTrue(self.bar.emblem_visible)
+        self.assertTrue(self.bar.launcher.emblem_visible)
+
+    def test_hide_emblem(self):
+        """The emblem is hidden."""
+        self.bar.show_warning_emblem()
+        self.bar.hide_emblem()
+        self.assertFalse(self.bar.emblem_visible)
+        self.assertFalse(self.bar.launcher.emblem_visible)
 
 
 class FakeDelayedBuffer(object):
@@ -734,6 +778,7 @@
         """Initialize this fake instance."""
         self.queued_commands = set()
         self.notification_switch = aggregator.NotificationSwitch()
+        self.connected = False
 
     def queue_done(self):
         """The queue completed all operations."""
@@ -756,6 +801,14 @@
     upload_started = misc_command_queued
     upload_finished = misc_command_unqueued
 
+    def connection_made(self):
+       """The client made the connection to the server."""
+       self.connected = True
+
+    def connection_lost(self):
+       """The client lost the connection to the server."""
+       self.connected = False
+
 
 class StatusFrontendTestCase(BaseTwistedTestCase):
     """Test the status frontend."""
@@ -937,6 +990,7 @@
 
     def test_server_connection_lost(self):
         """The client connected to the server."""
+        self.status_frontend.aggregator.connected = True
         self.listener.handle_SYS_CONNECTION_LOST()
         self.assertEqual(
             1, len(self.status_frontend.notification.notifications_shown))
@@ -944,9 +998,11 @@
             (aggregator.UBUNTUONE_TITLE,
              aggregator.ConnectionLostStatus.MESSAGE_ONE, None, False),
             self.status_frontend.notification.notifications_shown[0])
+        self.assertFalse(self.status_frontend.aggregator.connected)
 
     def test_server_connection_made(self):
         """The client connected to the server."""
+        self.status_frontend.aggregator.connected = False
         self.listener.handle_SYS_CONNECTION_MADE()
         self.assertEqual(
             1, len(self.status_frontend.notification.notifications_shown))
@@ -954,6 +1010,7 @@
             (aggregator.UBUNTUONE_TITLE,
              aggregator.ConnectionMadeStatus.MESSAGE_ONE, None, False),
             self.status_frontend.notification.notifications_shown[0])
+        self.assertTrue(self.status_frontend.aggregator.connected)
 
     def test_set_show_all_notifications(self):
         """Test the set_show_all_notifications method."""
@@ -1148,6 +1205,9 @@
                    FakeProgressBubble)
         self.patch(aggregator, "FinalStatusBubble",
                    FakeFinalBubble)
+        self.patch(aggregator, "ToggleableNotification",
+                   FakeNotificationSingleton())
+        self.patch(aggregator, "UbuntuOneLauncher", FakeLauncher)
         self.status_frontend = aggregator.StatusFrontend()
         self.aggregator = self.status_frontend.aggregator
         self.fake_bubble = self.aggregator.file_discovery_bubble
@@ -1192,7 +1252,7 @@
         fc = FakeCommand()
         self.status_frontend.queue_added(fc)
         self.assertMiscCommandQueued(fc)
-        self.assertEqual(0, self.aggregator.progress_bar.percentage)
+        self.assertEqual(0, self.aggregator.progress_bar.progress)
 
     def test_misc_command_unqueue(self):
         """Test that a misc command was unqueued."""
@@ -1200,7 +1260,7 @@
         self.status_frontend.queue_added(fc)
         self.status_frontend.queue_removed(fc)
         self.assertMiscCommandUnqueued(fc)
-        self.assertEqual(100.0, self.aggregator.progress_bar.percentage)
+        self.assertEqual(1.0, self.aggregator.progress_bar.progress)
 
     def test_file_download_started(self):
         """Test that a file has started download."""
@@ -1355,9 +1415,19 @@
         self.status_frontend.upload_started(fc)
         self.aggregator.queue_done()
         self.assertStatusReset()
-        self.assertEqual(0.0, self.aggregator.progress_bar.percentage)
+        self.assertEqual(0.0, self.aggregator.progress_bar.progress)
         self.assertFalse(self.aggregator.progress_bar.visible)
 
+    def test_connection_lost(self):
+        """The connection to the server was lost."""
+        self.status_frontend.server_connection_lost()
+        self.assertTrue(self.aggregator.progress_bar.emblem_visible)
+
+    def test_connection_made(self):
+        """The connection to the server was made."""
+        self.status_frontend.server_connection_made()
+        self.assertFalse(self.aggregator.progress_bar.emblem_visible)
+
 
 class StatusGrouperTestCase(TestCase):
     """Tests for the group_statuses function."""
@@ -1411,7 +1481,7 @@
         sf.download_started(download)
         self.assertEqual(1, len(notifications_shown))
         # the progress still is zero
-        self.assertEqual(0.0, sf.aggregator.progress_bar.percentage)
+        self.assertEqual(0.0, sf.aggregator.progress_bar.progress)
         clock.advance(aggregator.FileDiscoveryUpdateState.updates_delay)
         # files count update
         self.assertEqual(2, len(notifications_shown))
@@ -1425,7 +1495,7 @@
         self.assertEqual(3, len(notifications_shown))
         sf.upload_finished(download)
         # the progress still is now 100%
-        self.assertEqual(100.0, sf.aggregator.progress_bar.percentage)
+        self.assertEqual(1.0, sf.aggregator.progress_bar.progress)
         # progress, but the progress bubble is not updated immediately
         self.assertEqual(3, len(notifications_shown))
         clock.advance(aggregator.ProgressBubble.sleep_delay)
@@ -1463,7 +1533,7 @@
         sf.download_started(download)
         self.assertEqual(0, len(notifications_shown))
         # the progress still is zero
-        self.assertEqual(0.0, sf.aggregator.progress_bar.percentage)
+        self.assertEqual(0.0, sf.aggregator.progress_bar.progress)
         clock.advance(aggregator.FileDiscoveryUpdateState.updates_delay)
         self.assertEqual(0, len(notifications_shown))
         clock.advance(aggregator.FileDiscoveryUpdateState.updates_timeout -
@@ -1475,7 +1545,7 @@
         self.assertEqual(0, len(notifications_shown))
         sf.upload_finished(download)
         # the progress still is now 100%
-        self.assertEqual(100.0, sf.aggregator.progress_bar.percentage)
+        self.assertEqual(1.0, sf.aggregator.progress_bar.progress)
         self.assertEqual(0, len(notifications_shown))
         clock.advance(aggregator.ProgressBubble.sleep_delay)
         self.assertEqual(0, len(notifications_shown))

=== added file 'ubuntuone/platform/linux/unity.py'
--- ubuntuone/platform/linux/unity.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/linux/unity.py	2011-02-21 22:33:34 +0000
@@ -0,0 +1,83 @@
+# ubuntuone.platform.linux.unity
+#
+# Author: Alejandro J. Cura <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Use libunity to show a progressbar and emblems on the launcher icon."""
+
+import gio
+
+try:
+    from gi.repository import Unity
+    use_libunity = True
+except ImportError:
+    use_libunity = False
+
+U1_DOTDESKTOP = "ubuntuone-control-panel-gtk.desktop"
+EMBLEM_IMPORTANT = "emblem-important"
+
+
+class UbuntuOneLauncherUnity(object):
+    """The Ubuntu One launcher icon."""
+
+    def __init__(self):
+        """Initialize this instance."""
+        self.entry = Unity.LauncherEntry.get_for_desktop_id(U1_DOTDESKTOP)
+
+    def show_progressbar(self):
+        """The progressbar is shown."""
+        self.entry.props.progress_visible = True
+
+    def hide_progressbar(self):
+        """The progressbar is hidden."""
+        self.entry.props.progress_visible = False
+
+    def set_progress(self, value):
+        """The progressbar value is changed."""
+        self.entry.props.progress = value
+
+    def show_warning_emblem(self):
+        """Show a warning emblem."""
+        self.entry.props.emblem = gio.ThemedIcon(EMBLEM_IMPORTANT)
+        self.entry.props.emblem_visible = True
+
+    def hide_emblem(self):
+        """Hide the current emblem."""
+        self.entry.props.emblem_visible = False
+
+
+class DummyLauncher(object):
+    """A dummy launcher icon."""
+
+    def __init__(self):
+        """Initialize this instance."""
+
+    def show_progressbar(self):
+        """The progressbar is shown."""
+
+    def hide_progressbar(self):
+        """The progressbar is hidden."""
+
+    def set_progress(self, value):
+        """The progressbar value is changed."""
+
+    def show_warning_emblem(self):
+        """Show a warning emblem."""
+
+    def hide_emblem(self):
+        """Hide the current emblem."""
+
+
+UbuntuOneLauncher = UbuntuOneLauncherUnity if use_libunity else DummyLauncher

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2011-02-17 13:11:11 +0000
+++ ubuntuone/status/aggregator.py	2011-02-21 22:33:34 +0000
@@ -27,6 +27,7 @@
 from ubuntuone.logger import basic_formatter, logging
 from ubuntuone.platform.notification import Notification
 from ubuntuone.platform.messaging import Messaging, open_volumes
+from ubuntuone.platform.unity import UbuntuOneLauncher
 
 LOG_LEVEL = logging.DEBUG
 logger = logging.getLogger('ubuntuone.status')
@@ -48,6 +49,7 @@
 PROGRESS_UPLOADED = "Uploaded %d/%d file(s)."
 PROGRESS_COMPLETED = "%d%% completed."
 
+
 class ToggleableNotification(object):
     """A controller for notifications that can be turned off."""
 
@@ -434,37 +436,45 @@
     """Update a progressbar no more than 10 times a second."""
     pulsating = True
     visible = False
-    percentage = 0.0
+    progress = 0.0
     updates_delay = 0.1
     timer = None
 
     def __init__(self, clock=reactor):
         """Initialize this instance."""
         self.clock = clock
+        self.launcher = UbuntuOneLauncher()
 
     def cleanup(self):
         """Cleanup this instance."""
         if self.timer:
             self.timer.cleanup()
-
-    def enable(self):
-        """Enable the pulse on the progressbar."""
-        self.pulsating = True
-
-    def disable(self):
-        """Disable the pulse on the progressbar."""
-        self.pulsating = False
+            self.timer = None
+
+    def hide_emblem(self):
+        """Hide the emblem on the launcher icon."""
+        self.emblem_visible = False
+        self.launcher.hide_emblem()
+
+    def show_warning_emblem(self):
+        """Show the warning emblem on the launcher icon."""
+        self.emblem_visible = True
+        self.launcher.show_warning_emblem()
 
     def _timeout(self, result):
         """The aggregating timer has expired, so update the UI."""
         self.timer = None
+        self.launcher.set_progress(self.progress)
+        logger.debug("progressbar updated: %f", self.progress)
 
     def progress_made(self, steps_done, steps_total):
         """Steps amount changed. Set up a timer if one not ticking."""
         assert steps_total > 0
-        self.percentage = 100.0 * float(steps_done) / float(steps_total)
+        self.progress = float(steps_done) / float(steps_total)
         if not self.visible:
             self.visible = True
+            self.launcher.show_progressbar()
+            logger.debug("progressbar shown")
         if not self.timer:
             self.timer = Timer(self.updates_delay, clock=self.clock)
             self.timer.addCallback(self._timeout)
@@ -473,6 +483,8 @@
         """All has completed."""
         self.cleanup()
         self.visible = False
+        self.launcher.hide_progressbar()
+        logger.debug("progressbar hidden")
 
 
 class FinalStatusBubble(object):
@@ -636,6 +648,14 @@
         self.upload_done += 1
         self.misc_command_unqueued(command)
 
+    def connection_lost(self):
+        """The connection to the server was lost."""
+        self.progress_bar.show_warning_emblem()
+
+    def connection_made(self):
+        """The connection to the server was made."""
+        self.progress_bar.hide_emblem()
+
 
 class StatusFrontend(object):
     """Frontend for the status aggregator, used by the StatusListener."""
@@ -712,12 +732,14 @@
         logger.debug("server connection lost")
         self.notification.send_notification(
             UBUNTUONE_TITLE, ConnectionLostStatus().one())
+        self.aggregator.connection_lost()
 
     def server_connection_made(self):
         """The client made the connection to the server."""
         logger.debug("server connection made")
         self.notification.send_notification(
             UBUNTUONE_TITLE, ConnectionMadeStatus().one())
+        self.aggregator.connection_made()
 
     def set_show_all_notifications(self, value):
         """Set the flag to show all notifications."""