Merge lp:~nataliabidart/ubuntuone-control-panel/fix-933576-1 into lp:ubuntuone-control-panel

[Natalia Bidart]

- Handle properly default/non-default buttons (part of LP: #933576).

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Manuel de la Peña (mandel)]

Looks good!

review: Approve

=== renamed file 'data/u1icon.png' => 'data/icon.png'
=== modified file 'data/qt/account.ui'
--- data/qt/account.ui	2012-02-22 15:35:13 +0000
+++ data/qt/account.ui	2012-03-02 13:46:17 +0000
@@ -27,6 +27,9 @@
        <property name="text">
         <string notr="true">Edit personal details online</string>
        </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item row="2" column="0">
@@ -111,6 +114,9 @@
        <property name="text">
         <string notr="true">Edit your services online</string>
        </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item row="0" column="3">

=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2012-02-22 15:35:13 +0000
+++ data/qt/controlpanel.ui	2012-03-02 13:46:17 +0000
@@ -162,6 +162,9 @@
                  <property name="text">
                   <string notr="true">Get more storage</string>
                  </property>
+                 <property name="default">
+                  <bool>true</bool>
+                 </property>
                 </widget>
                </item>
               </layout>

=== modified file 'data/qt/devices.ui'
--- data/qt/devices.ui	2012-02-22 15:35:13 +0000
+++ data/qt/devices.ui	2012-03-02 13:46:17 +0000
@@ -92,6 +92,9 @@
        <property name="text">
         <string notr="true">Go to the web page to manage your other devices</string>
        </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>

=== modified file 'data/qt/folders.ui'
--- data/qt/folders.ui	2012-02-22 15:35:13 +0000
+++ data/qt/folders.ui	2012-03-02 13:46:17 +0000
@@ -155,6 +155,9 @@
         <property name="text">
          <string notr="true">Add a folder from this computer</string>
         </property>
+        <property name="default">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>

=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2012-01-30 18:49:50 +0000
+++ data/qt/images.qrc	2012-03-02 13:46:17 +0000
@@ -1,20 +1,18 @@
 <RCC>
   <qresource prefix="/">
-    <file>../u1icon.png</file>
+    <file>../computer.png</file>
     <file>../external_icon_orange.png</file>
+    <file>../external_icon_white.png</file>
+    <file>../icon.png</file>
+    <file>../folder.png</file>
+    <file>../phone.png</file>
+    <file>../sync_status_alert.png</file>
     <file>../sync_status_disconnected.png</file>
-    <file>../sync_status_alert.png</file>
+    <file>../sync_status_loading.png</file>
     <file>../sync_status_sync_done.png</file>
     <file>../sync_status_syncing.png</file>
-    <file>../sync_status_loading.png</file>
-    <file>../folder.png</file>
-    <file>../computer.png</file>
-    <file>../phone.png</file>
-    <file>../twitter.png</file>
-    <file>../twitter.png</file>
-    <file>../facebook.png</file>
-    <file>../facebook.png</file>
-    <file>../external_icon_white.png</file>
+    <file>../twitter.png</file>
+    <file>../facebook.png</file>
     <file>../Ubuntu-R.ttf</file>
     <file>../Ubuntu-B.ttf</file>
     <file>ubuntuone.qss</file>

=== modified file 'data/qt/mainwindow.ui'
--- data/qt/mainwindow.ui	2012-02-22 14:58:25 +0000
+++ data/qt/mainwindow.ui	2012-03-02 13:46:17 +0000
@@ -27,7 +27,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="images.qrc">
-    <normaloff>:/u1icon.png</normaloff>:/u1icon.png</iconset>
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <property name="sizePolicy">

=== modified file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2012-02-22 14:58:25 +0000
+++ data/qt/preferences.ui	2012-03-02 13:46:17 +0000
@@ -195,6 +195,9 @@
        <property name="text">
         <string notr="true">Apply these settings</string>
        </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
      <item>

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-11-23 17:22:33 +0000
+++ data/qt/ubuntuone.qss	2012-03-02 13:46:17 +0000
@@ -68,55 +68,57 @@
     border-width: 1px;
 }
 
-QPushButton[enabled="true"] {
+QPushButton:disabled {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #eaeaea, stop: 1.0 #cacaca);
+    color: #595959;
+    border-color: #939389;
+}
+
+QPushButton:enabled {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #ffffff,stop: 1.0 #e6e6e6);
+    color: #333333;
+    border-color: #999999;
+}
+
+QPushButton:enabled:focus,
+QPushButton:enabled:hover {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #ffffff,stop: 1.0 #ededed);
+    color: #333333;
+    border-color: #999999;
+}
+
+QPushButton:enabled:pressed {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #d9d9d9,stop: 1.0 #fefefe);
+    color: #333333;
+    border-color: #999999;
+}
+
+QPushButton:default:enabled {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
         stop: 0 #fe9e84,stop: 1.0 #dd4814);
     color: white;
     border-color: #999999;
 }
 
-QPushButton:hover[enabled="true"] {
+QPushButton:default:enabled:focus,
+QPushButton:default:enabled:hover {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
         stop: 0 #ffb19c,stop: 1.0 #dd4814);
     color: white;
     border-color: #999999;
 }
 
-QPushButton:pressed[enabled="true"] {
+QPushButton:default:enabled:pressed {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
         stop: 0 #b93f14,stop: 1.0 #dd4814);
     color: white;
     border-color: #999999;
 }
 
-QPushButton[secondary="true"] {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #ffffff,stop: 1.0 #e6e6e6);
-    color: #333333;
-    border-color: #999999;
-}
-
-QPushButton:hover[secondary="true"] {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #ffffff,stop: 1.0 #ededed);
-    color: #333333;
-    border-color: #999999;
-}
-
-QPushButton:pressed[secondary="true"] {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #d9d9d9,stop: 1.0 #fefefe);
-    color: #333333;
-    border-color: #999999;
-}
-
-QPushButton[enabled="false"] {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #eaeaea, stop: 1.0 #cacaca);
-    color: #595959;
-    border-color: #939389;
-}
-
 QPushButton#help_button {
     background: transparent;
     border: none;

=== modified file 'ubuntuone/controlpanel/gui/qt/__init__.py'
--- ubuntuone/controlpanel/gui/qt/__init__.py	2011-10-05 16:35:59 +0000
+++ ubuntuone/controlpanel/gui/qt/__init__.py	2012-03-02 13:46:17 +0000
@@ -93,7 +93,8 @@
             try:
                 res = yield f(*args, **kwargs)
             except Exception, e:  # pylint: disable=W0703
-                logger.exception(f.__name__)
+                msg = 'Error while invoking %r with args %r and kwargs %r:'
+                logger.exception(msg, f, args, kwargs)
             else:
                 defer.returnValue(res)
 

=== modified file 'ubuntuone/controlpanel/gui/qt/filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2012-01-30 18:49:50 +0000
+++ ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2012-03-02 13:46:17 +0000
@@ -164,14 +164,8 @@
             self.ui.sync_status_button.setText(action)
             self.ui.sync_status_button.setEnabled(True)
             self.ui.sync_status_button.show()
-            if status_key == backend.FILE_SYNC_DISCONNECTED:
-                self.ui.sync_status_button.setProperty("secondary", False)
-            else:
-                self.ui.sync_status_button.setProperty("secondary", True)
-            self.ui.sync_status_button.style().unpolish(
-                self.ui.sync_status_button)
-            self.ui.sync_status_button.style().polish(
-                self.ui.sync_status_button)
+            default = (status_key == backend.FILE_SYNC_DISCONNECTED)
+            self.ui.sync_status_button.setDefault(default)
         else:
             self.ui.sync_status_button.hide()
 
@@ -190,11 +184,7 @@
             self.ui.sync_status_button.setText(PLEASE_WAIT)
             pixmap = pixmap_from_name('sync_status_loading')
             self.ui.sync_status_icon.setPixmap(pixmap)
-            self.ui.sync_status_button.setProperty("secondary", True)
-            self.ui.sync_status_button.style().unpolish(
-                self.ui.sync_status_button)
-            self.ui.sync_status_button.style().polish(
-                self.ui.sync_status_button)
+            self.ui.sync_status_button.setDefault(False)
             self._backend_method()
         else:
             logger.error('on_sync_status_button_clicked: backend method is '

=== modified file 'ubuntuone/controlpanel/gui/qt/systray.py'
--- ubuntuone/controlpanel/gui/qt/systray.py	2012-02-22 14:58:25 +0000
+++ ubuntuone/controlpanel/gui/qt/systray.py	2012-03-02 13:46:17 +0000
@@ -17,7 +17,6 @@
 
 from PyQt4 import QtGui
 from twisted.internet.defer import inlineCallbacks
-
 from ubuntuone.platform.tools import SyncDaemonTool
 
 from ubuntuone.controlpanel.gui import (
@@ -32,7 +31,7 @@
 
     def __init__(self, window=None, close_callback=lambda: None):
         super(TrayIcon, self).__init__(None)
-        self.setIcon(QtGui.QIcon(":/u1icon.png"))
+        self.setIcon(QtGui.QIcon(":/icon.png"))
         self.setVisible(True)
         self.window = window
         self.activated.connect(self.on_activated)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-02-17 12:01:56 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-03-02 13:46:17 +0000
@@ -233,73 +233,6 @@
     # pylint: enable=C0103
 
 
-class FakePageUiStyle(object):
-    """Fake the page."""
-
-    def __init__(self):
-        self.ui = self
-        self.properties = {}
-        super(FakePageUiStyle, self).__init__()
-
-    def wizard(self):
-        """Use itself as a fake wizard, too."""
-        return self
-
-    def text(self):
-        """Return text."""
-        return self.properties.get('text', '')
-
-    # setText, setEnabled are inherited
-    # pylint: disable=C0103
-    def setText(self, text):
-        """Save text."""
-        self.properties['text'] = text
-
-    def setEnabled(self, value):
-        """Fake setEnabled."""
-        self.properties['enabled'] = value
-
-    def enabled(self):
-        """Fake enabled."""
-        return self.properties.get('enabled', False)
-
-    def isEnabled(self):
-        """Fake isEnabled."""
-        return self.properties.get('enabled', False)
-
-    def setProperty(self, key, val):
-        """Fake setProperty to restyle some widget."""
-        self.properties[key] = val
-
-    def property(self, key):
-        """Fake property from widget style."""
-        return self.properties.get(key, False)
-
-    def setDefault(self, val):
-        """Fake button setDefault."""
-        self.properties['default'] = val
-
-    def style(self):
-        """Fake style."""
-        return self
-
-    def unpolish(self, *args):
-        """Fake unpolish."""
-        self.properties['unpolish'] = len(args) > 0
-
-    def polish(self, *args):
-        """Fake polish."""
-        self.properties['polish'] = len(args) > 0
-
-    def setVisible(self, val):
-        """Fake setVisible from Qt."""
-        self.properties['visible'] = val
-
-    def isVisible(self):
-        """Fake isVisible from Qt."""
-        return self.properties['visible']
-
-
 class BaseTestCase(TestCase):
     """Base Test Case."""
 

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2012-02-06 12:39:18 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2012-03-02 13:46:17 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Natalia B Bidart <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-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
@@ -20,15 +18,12 @@
 
 from twisted.internet import defer
 
-from ubuntuone.controlpanel.gui.qt import filesyncstatus as gui
-from ubuntuone.controlpanel.gui.qt.tests import (
-    BaseTestCase,
-    FakePageUiStyle,
-)
 from ubuntuone.controlpanel.gui import (
     LOADING,
     PLEASE_WAIT,
 )
+from ubuntuone.controlpanel.gui.qt import filesyncstatus as gui
+from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
 
 backend = gui.backend  # pylint: disable=C0103
 
@@ -75,22 +70,17 @@
 
         self.assertTrue(self.ui.ui.sync_status_button.isEnabled())
         self.assertEqual(self.ui.ui.sync_status_button.text(), action)
-        if action == gui.FILE_SYNC_DISCONNECTED:
-            self.assertFalse(
-                self.ui.ui.sync_status_button.property("secondary"))
-        else:
-            self.assertTrue(
-                self.ui.ui.sync_status_button.property("secondary"))
+
+        is_default = self.ui.ui.sync_status_button.isDefault()
+        expected_default = (action == gui.FILE_SYNC_CONNECT)
+        self.assertEqual(expected_default, is_default)
 
         self.ui.ui.sync_status_button.click()
         self.assertFalse(self.ui.ui.sync_status_button.isEnabled())
         self.assert_backend_called(callback)
-        if action == gui.FILE_SYNC_DISCONNECTED:
-            self.assertFalse(
-                self.ui.ui.sync_status_button.property("secondary"))
-        else:
-            self.assertTrue(
-                self.ui.ui.sync_status_button.property("secondary"))
+
+        is_default = self.ui.ui.sync_status_button.isDefault()
+        self.assertFalse(is_default)
 
         if tooltip is not None:
             self.assertEqual(self.ui.ui.sync_status_button.toolTip(), tooltip)
@@ -184,18 +174,15 @@
         # Ensure the _backend_method is not None to execute the first
         # part of the If.
         self.ui._backend_method = lambda: 'Not None'
-        self.patch(self.ui.ui, "sync_status_button", FakePageUiStyle())
+
         # Simulate the click event
         self.ui.on_sync_status_button_clicked()
+
         self.assertFalse(self.ui.ui.sync_status_button.isEnabled())
-        self.assertTrue(self.ui.ui.sync_status_button.property("secondary"))
+        self.assertFalse(self.ui.ui.sync_status_button.isDefault())
         actual_text = self.ui.ui.sync_status_label.text()
         self.assertEqual(actual_text, LOADING)
         self.assertEqual(self.ui.ui.sync_status_button.text(), PLEASE_WAIT)
         actual_icon = self.ui.ui.sync_status_icon.pixmap()
         expected_icon = gui.pixmap_from_name('sync_status_loading')
         self.assertEqualPixmaps(expected_icon, actual_icon)
-        self.assertTrue(
-            self.ui.ui.sync_status_button.properties.get('unpolish', True))
-        self.assertTrue(
-            self.ui.ui.sync_status_button.properties.get('polish', True))