Merge lp:~mandel/ubuntuone-control-panel/double-gathering into lp:ubuntuone-control-panel

[Manuel de la Peña]

- Stop showing double overlay by ensuring that we can tell the different panels not to show it via the tabbed panel (LP: #1065513).
- Set the username label before the overlay is removed (LP: #1067329).

- Stop showing double overlay by ensuring that we can tell the different panels not to show it via their parent (LP: #1065513).
- Set the username label before the overlay is removed (LP: #1067329).

[lp:~mandel/ubuntuone-control-panel/double-gathering]

371. By Manuel de la Peña on 2012-10-16

Don't change things from the ui that should not change.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2012-08-24 19:39:19 +0000
+++ data/qt/controlpanel.ui	2012-10-16 12:47:22 +0000
@@ -221,7 +221,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QTabWidget" name="tab_widget">
+          <widget class="TabbedPanel" name="tab_widget">
            <property name="sizePolicy">
             <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
              <horstretch>0</horstretch>
@@ -238,7 +238,7 @@
            </widget>
            <widget class="ShareLinksPanel" name="share_links_tab">
             <attribute name="title">
-             <string>Share Links</string>
+             <string notr="true">Share Links</string>
             </attribute>
            </widget>
            <widget class="DevicesPanel" name="devices_tab">
@@ -427,6 +427,12 @@
    <header>ubuntuone.controlpanel.gui.qt.share_links</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>TabbedPanel</class>
+   <extends>QTabWidget</extends>
+   <header>ubuntuone.controlpanel.gui.qt.tabbed_panel</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>help_button</tabstop>

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-10-08 18:11:55 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-10-16 12:47:22 +0000
@@ -87,6 +87,10 @@
         self.ui.tab_widget.setTabText(
             self.ui.tab_widget.indexOf(self.ui.account_tab), MAIN_ACCOUNT_TAB)
 
+        # in the setup lets not show the overlay in the tabs until we got the
+        # account info
+        self.ui.tab_widget.show_overlay = False
+
     @defer.inlineCallbacks
     def connect_file_sync(self):
         """Connect file sync service if the setting autoconnect is enabled."""
@@ -112,10 +116,11 @@
         """Credentials are not found or were removed."""
         self.ui.switcher.setCurrentWidget(self.ui.management)
         self.connect_file_sync()
-        self.is_processing = False
 
         info = yield self.backend.account_info()
         self.process_info(info)
+        self.is_processing = False
+        self.ui.tab_widget.show_overlay = True
 
     # pylint: disable=E0202
     @defer.inlineCallbacks

=== added file 'ubuntuone/controlpanel/gui/qt/tabbed_panel.py'
--- ubuntuone/controlpanel/gui/qt/tabbed_panel.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/tabbed_panel.py	2012-10-16 12:47:22 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2012 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/>.
+
+"""Tabbed panel used to show the information optained via rest services."""
+
+from PyQt4 import QtGui
+
+
+class TabbedPanel(QtGui.QTabWidget):
+    """Widget that shows tabs that use rest services to get the info."""
+
+    def __init__(self, *args, **kwargs):
+        super(TabbedPanel, self).__init__(*args, **kwargs)
+        self._show_overlay = False
+
+    def _get_show_overlay(self):
+        """Get if the overlay is shown."""
+        return self._show_overlay
+
+    def _set_show_overlay(self, is_shown):
+        """Set if the overlay is shown."""
+        # we need to loop over the differet tabs and get their widgets, if the
+        # widet does have an overlay, lets set the value
+        for index in range(self.count()):
+            widget = self.widget(index)
+            show_overlay = getattr(widget, 'show_overlay', None)
+            if show_overlay is not None:
+                widget.show_overlay = is_shown
+
+        self._show_overlay = is_shown
+
+    show_overlay = property(fget=_get_show_overlay, fset=_set_show_overlay)

=== added file 'ubuntuone/controlpanel/gui/qt/tests/test_tabbed_panel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_tabbed_panel.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_tabbed_panel.py	2012-10-16 12:47:22 +0000
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+
+#
+# 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 tabbed panel."""
+
+from PyQt4 import QtGui
+from twisted.internet import defer
+from twisted.trial.unittest import TestCase
+
+from ubuntuone.controlpanel.gui.qt import tabbed_panel
+
+
+class FakeOverlayWidget(QtGui.QLabel):
+    """Fake a widget that does have the show_orvelay attribute."""
+
+    def __init__(self, *args, **kwargs):
+        super(FakeOverlayWidget, self).__init__(*args, **kwargs)
+        self.show_overlay = False
+
+
+class TabbedPanelTestCase(TestCase):
+    """Test the tabbed panel."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set the tests."""
+        yield super(TabbedPanelTestCase, self).setUp()
+        self.tab_widget = tabbed_panel.TabbedPanel()
+
+    def test_all_overlay_supported(self):
+        """Test when all the widgets support the overlay feature."""
+        labels = [FakeOverlayWidget("Test"),
+                  FakeOverlayWidget("Test"),
+                  FakeOverlayWidget("Test")]
+        for lab in labels:
+            self.tab_widget.addTab(lab, 'label')
+
+        self.tab_widget.show_overlay = True
+        self.assertTrue(all([l.show_overlay for l in labels]))
+        self.tab_widget.show_overlay = False
+        self.assertFalse(any([l.show_overlay for l in labels]))

=== modified file 'ubuntuone/controlpanel/gui/qt/ubuntuonebin.py'
--- ubuntuone/controlpanel/gui/qt/ubuntuonebin.py	2012-04-05 22:20:40 +0000
+++ ubuntuone/controlpanel/gui/qt/ubuntuonebin.py	2012-10-16 12:47:22 +0000
@@ -40,6 +40,7 @@
 
         self.overlay = LoadingOverlay(self)
         self.overlay.hide()
+        self._show_overlay = True
 
         self._is_processing = None
         self.is_processing = False
@@ -51,6 +52,21 @@
 
         self._setup()
 
+    def _get_show_overlay(self):
+        """Get if the overlay will be shown."""
+        return self._show_overlay
+
+    def _set_show_overlay(self, is_shown):
+        """Set if the overlay will be shown."""
+        self._show_overlay = is_shown
+
+        if self._show_overlay and self._is_processing:
+            self.overlay.setVisible(is_shown)
+        else:
+            self.overlay.hide()
+
+    show_overlay = property(fget=_get_show_overlay, fset=_set_show_overlay)
+
     def _get_is_processing(self):
         """Get the value of is_processing."""
         return self._is_processing
@@ -62,7 +78,8 @@
         If not is_processing, enable the UI and hide the spinner.
 
         """
-        self.overlay.setVisible(new_value)
+        if self._show_overlay:
+            self.overlay.setVisible(new_value)
         self.setEnabled(not new_value)
         self._is_processing = new_value