Merge lp:~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.91.1 into lp:ubuntuone-control-panel/stable-3-0

[Natalia Bidart]

[ Natalia B. Bidart <email address hidden> ]
  - Isolate linux specific styling hacks to avoid weird side effects
    on windows (LP: #961229).
  - Handle errors from backend on the signin wizard page (LP: #945078).
  - Avoid the 'show/hide details' button to grow when focused (LP: #961348).
  - Modified stylesheet to use the new colours from brand, and to also ease
    the reading of white text (LP: #956077).
  - Fixed the gap tab outlines (LP: #822629).

[ Brian Curtin <email address hidden> ]
  - Add Ubuntu One to the Windows auto-start registry key.
  - Made the creation of symlinks a separated test case so it can be
    skipped on Windows.
  - Better cleanup in tests -- allow the rest of the test suite to
    complete. Fix courtesy of Natalia Bidart.

[ Roberto Alsina <email address hidden> ]
  - Made the license page from the wizard be shown (only when called
    with --installer) (LP: #933697).
  - Forced white background (LP: #961346).

[Roberto Alsina (ralsina)]

+1

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== added file 'data/external_icon_dark_grey.png'
Binary files data/external_icon_dark_grey.png	1970-01-01 00:00:00 +0000 and data/external_icon_dark_grey.png	2012-03-27 15:50:42 +0000 differ
=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2012-03-15 01:25:08 +0000
+++ data/qt/images.qrc	2012-03-27 15:50:42 +0000
@@ -2,6 +2,7 @@
   <qresource prefix="/">
     <file>../banner.png</file>
     <file>../computer.png</file>
+    <file>../external_icon_dark_grey.png</file>
     <file>../external_icon_orange.png</file>
     <file>../external_icon_white.png</file>
     <file>../icon.png</file>

=== modified file 'data/qt/linux.qss'
--- data/qt/linux.qss	2012-03-16 21:10:54 +0000
+++ data/qt/linux.qss	2012-03-27 15:50:42 +0000
@@ -1,2 +1,18 @@
 /* Styles specific to the linux platform */
 
+QPushButton:focus,
+GoToWebButton#help_button:focus,
+GoToWebButton#share_publish_button:focus {
+    /* hack to make the mild-orange focused box dissapear */
+    padding-top: 100%;
+    padding-bottom: 100%;
+    /* end of hack */
+}
+
+QTabBar::tab:hover,
+QTabBar::tab:focus {
+    /* hack to make the mild-orange focused box dissapear */
+    padding-left: 1000px;
+    padding-right: 1000px;
+    /* end of hack */
+}

=== modified file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2012-03-14 18:37:40 +0000
+++ data/qt/preferences.ui	2012-03-27 15:50:42 +0000
@@ -95,6 +95,9 @@
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Minimum</enum>
+        </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>

=== modified file 'data/qt/side_widget.ui'
--- data/qt/side_widget.ui	2012-03-14 15:11:19 +0000
+++ data/qt/side_widget.ui	2012-03-27 15:50:42 +0000
@@ -20,7 +20,16 @@
    <property name="spacing">
     <number>40</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>10</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -83,6 +92,9 @@
           <property name="text">
            <string notr="true">Install</string>
           </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
        </layout>
@@ -125,6 +137,9 @@
           <property name="text">
            <string notr="true">Sign In</string>
           </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
        </layout>
@@ -164,6 +179,9 @@
           <property name="text">
            <string notr="true">Select sync folders</string>
           </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
        </layout>
@@ -203,6 +221,9 @@
           <property name="text">
            <string notr="true">Sync, stream, share!</string>
           </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
        </layout>

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2012-03-20 13:05:20 +0000
+++ data/qt/ubuntuone.qss	2012-03-27 15:50:42 +0000
@@ -7,7 +7,7 @@
 */
 
 QMainWindow {
-    background-color: #aea79f;
+    background-color: #adadad;
 }
 
 QWidget {
@@ -16,6 +16,7 @@
 
 QFrame {
     border: none;
+    border-color: #333333;
 }
 
 UbuntuOneWizard,
@@ -23,13 +24,12 @@
     background: white;
     border-radius: 5px;
     border-style: solid;
-    border-color: #939389;
     border-width: 1px;
     min-height: 90px;
 }
 
 QFrame#frame_greeting {
-    margin 0px;
+    margin: 0px;
     padding-left: 15px;
     padding-top: 10px;
     padding-right: 10px;
@@ -39,7 +39,6 @@
 QFrame#frame_status,
 QFrame#frame_storage {
     border-style: dotted;
-    border-color: #939389;
     border-left-width: 1px;
     padding: 10px;
     min-width: 40px;
@@ -47,24 +46,21 @@
 
 QFrame#account_separator {
     border-style: dotted;
-    border-color: #939389;
     border-bottom-width: 1px;
 }
 
 QFrame#frm_box { /*The Loading Overlay frame.*/
-    background: #ffffff;
+    background: white;
     border-radius: 5px;
     border-style: solid;
-    border-color: #939389;
     border-width: 1px;
     color: white;
     min-height: 100px;
 }
 
-SideWidget {
+SideWidget {  /* is a QFrame, so border color is already set */
     background-color: white;
     border-style: dotted;
-    border-color: #939389;
     border-right-width: 1px;
     color: white;
     min-height: 100px;
@@ -85,10 +81,6 @@
     padding: 5px;
     padding-left: 19px;
     padding-right: 19px;
-    /* hack to make the mild-orange focused box dissapear */
-    padding-top: 100%;
-    padding-bottom: 100%;
-    /* end of hack */
 }
 
 QPushButton:disabled {
@@ -100,7 +92,7 @@
 
 QPushButton:enabled {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #ffffff,stop: 1.0 #e6e6e6);
+        stop: 0 white, stop: 1.0 #e6e6e6);
     color: #333333;
     border-color: #999999;
 }
@@ -111,7 +103,7 @@
 
 QPushButton:enabled:hover {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #ffffff,stop: 1.0 #ededed);
+        stop: 0 white, stop: 1.0 #ededed);
 }
 
 QPushButton:enabled:pressed {
@@ -169,10 +161,9 @@
     background: transparent;
     border: none;
     text-decoration: underline;
-    color: white;
-    padding-left: 10px;
-    padding-right: 25px;
-    background-image: url(:/external_icon_white.png);
+    padding-left: 2px;  /* 2px border buffer when focused */
+    padding-right: 15px;
+    background-image: url(:/external_icon_dark_grey.png);
     background-repeat: no-repeat;
     background-position: right;
     background-origin: margin;
@@ -180,13 +171,9 @@
 
 GoToWebButton#help_button:focus {
     border: 2px solid #dd4814;
-    /* hack to make the mild-orange focused box dissapear */
-    padding-top: 100%;
-    padding-bottom: 100%;
-    /* end of hack */
     /* Compensate for border so text doesn't move */
-    padding-left: 8px;
-    padding-right: 23px;
+    padding-left: 0px;
+    padding-right: 13px;
 }
 
 GoToWebButton#share_publish_button {
@@ -204,84 +191,72 @@
 
 GoToWebButton#share_publish_button:focus {
     border: 2px solid #aea79f;
-    /* hack to make the mild-orange focused box dissapear */
-    padding-top: 100%;
-    padding-bottom: 100%;
-    /* end of hack */
     /* Compensate for border so text doesn't move */
     padding-left: 8px;
     padding-right: 23px;
 }
 
+GoToWebButton#edit_profile_button,
+GoToWebButton#edit_services_button,
+GoToWebButton#get_more_space_button {
+    padding-left: 8px;
+    padding-right: 25px;
+    background-image: url(:/external_icon_white.png);
+    background-repeat: no-repeat;
+    background-position: right;
+    background-origin: margin;
+}
+
+QTabWidget {
+    border-bottom-left-radius: 5px;
+    border-bottom-right-radius: 5px;
+    border-style: solid;
+    padding: 10px;
+}
+
+QTabWidget::pane {
+    border-bottom-left-radius: 5px;
+    border-bottom-right-radius: 5px;
+    border-top-right-radius: 5px;
+    border-style: solid;
+    border-color: #333333;
+    border-width: 1px;
+    background: white;
+    position: absolute;
+    top: -2px;
+}
+
 QTabBar::tab {
-    height: 15px;
-    color: #333333;
-    background-color: #e4e0dd;
+    background-color: #e3e0dd;
     border-top-left-radius: 5px;
     border-top-right-radius: 5px;
+    border-bottom-right-radius: 1px;
+    border-bottom-left-radius: 1px;
     border-style: solid;
     padding: 12px;
-    border-top-color: #939389;
-    border-right-color: #939389;
-    border-left-color: white;
-    border-bottom-color: #939389;
+    border-color: #898989;
+    border-left-color: #e3e0dd;  /* same as background */
     border-width: 1px;
+    margin-bottom: 1px;  /* to be able to override the QTabWidget border */
+    border-bottom-color: #333333;  /* same as background for QTabWidget */
+}
+
+QTabBar::tab:first {
+    border-left-color: #898989;  /* same as border-color */
+    border-bottom-left-radius: 0px;
 }
 
 QTabBar::tab:selected {
     background-color: white;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-    border-style: solid;
-    padding: 12px;
-    border-top-color: #939389;
-    border-right-color: #939389;
-    border-left-color: white;
-    border-bottom-color: white;
-    border-width: 1px;
-}
-
-QTabBar::tab:first {
-    border-left-color: #939389;
-}
-
-QTabBar::tab:middle:!selected {
-    border-left-color: #e4e0dd;
-}
-
-QTabBar::tab:last:!selected {
-    border-left-color: #e4e0dd;
-}
-
-QTabBar::tab:hover {
-    background: #f6f6f6;
-    text-decoration: underline;
-}
-
+    border-color: #333333;
+    border-bottom-color: white;  /* same as background for selected */
+    border-bottom-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+}
+
+QTabBar::tab:hover,
 QTabBar::tab:focus {
     text-decoration: underline;
-    /* hack to make the mild-orange focused box dissapear */
-    padding-left: 1000px;
-    padding-right: 1000px;
-    /* end of hack */
-}
-
-QTabWidget {
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    border-style: solid;
-    padding: 10px;
-}
-
-QTabWidget::pane {
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    border-top-right-radius: 5px;
-    border-style: solid;
-    border-color: #939389;
-    border-width: 1px;
-    background: white;
-    border-top: 2px solid white;
 }
 
 QGroupBox {
@@ -332,10 +307,6 @@
     margin-top: -4px;
 }
 
-QLabel#follow_us_label {
-    color: white;
-}
-
 QLabel[OverQuota="true"],
 QLabel#warning_label {
     color: #df2d1f;
@@ -343,7 +314,6 @@
 
 QAbstractItemView {
     border-style: solid;
-    border-color: #898989;
     border-top-width: 1px;
     border-bottom-width: 1px;
     alternate-background-color: #f7f6f5;
@@ -363,19 +333,9 @@
     padding-right: 0px;
 }
 
-GoToWebButton#edit_profile_button,
-GoToWebButton#edit_services_button,
-GoToWebButton#get_more_space_button {
-    padding-left: 8px;
-    padding-right: 25px;
-    background-image: url(:/external_icon_white.png);
-    background-repeat: no-repeat;
-    background-position: right;
-    background-origin: margin;
-}
-
 QSpinBox {
     padding: 3px;
+    background-color: white;
 }
 
 QSpinBox:focus {
@@ -389,3 +349,12 @@
     background: #fcece7;
     color: black;
 }
+
+
+QMessageBox > QWidget > QPushButton:focus {
+    /* use the same padding from the original QPushButton:focus setting */
+    /* hack to make the mild-orange focused box dissapear */
+    padding-top: 5px;
+    padding-bottom: 5px;
+    /* end of hack */
+}

=== modified file 'data/qt/windows.qss'
--- data/qt/windows.qss	2012-03-15 01:25:08 +0000
+++ data/qt/windows.qss	2012-03-27 15:50:42 +0000
@@ -3,3 +3,14 @@
 QWidget {
     font-family: "Ubuntu";
 }
+
+QTabBar::tab:hover,
+QTabBar::tab:focus {
+    padding-left: 0px;
+    padding-right: 0px;
+}
+
+QPushButton#twitter_button:focus,
+QPushButton#facebook_button:focus {
+    padding: 0px;
+}

=== modified file 'ubuntuone/controlpanel/gui/qt/__init__.py'
--- ubuntuone/controlpanel/gui/qt/__init__.py	2012-03-02 13:53:24 +0000
+++ ubuntuone/controlpanel/gui/qt/__init__.py	2012-03-27 15:50:42 +0000
@@ -70,6 +70,12 @@
     return icon
 
 
+# Invalid name "box"
+# pylint: disable=C0103
+box = None
+# pylint: enable=C0103
+
+
 def handle_errors(error_handler=None, logger=None):
     """Decorator to handle errors when calling a function.
 
@@ -107,13 +113,35 @@
             else:
                 msgs = [e.__class__.__name__] + map(repr, e.args)
             msg = '\n'.join(msgs)
+
+            # hack to avoid the QMessageBox being gargabe-collected too soon
+            # Using the global statement, pylint: disable=W0603
+            global box
+            # pylint: enable=W0603
             box = QtGui.QMessageBox(QtGui.QMessageBox.Critical,
-                                    GENERAL_ERROR_TITLE, GENERAL_ERROR_MSG,
-                                    QtGui.QMessageBox.Close,
-                                    parent=None)
+                    GENERAL_ERROR_TITLE, GENERAL_ERROR_MSG,
+                    QtGui.QMessageBox.Close, parent=None)
+            box.setDefaultButton(QtGui.QMessageBox.Close)
             box.setDetailedText(msg)
-            box.setDefaultButton(QtGui.QMessageBox.Close)
-            box.exec_()
+
+            # can not exec_() on the QMessageBox since that will block the Qt
+            # mainloop
+
+            d = defer.Deferred()
+
+            def box_finished(result):
+                """The QMessageBox finished."""
+                logger.info('The warning dialog was shown and also closed '
+                            '(message was %r).', msg)
+                box.finished.disconnect(box_finished)
+                box.hide()
+                box.deleteLater()
+                d.callback(result)
+
+            box.finished.connect(box_finished)
+            box.show()
+
+            yield d
 
         return inner
 

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-03-19 20:55:52 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-03-27 15:50:42 +0000
@@ -170,3 +170,11 @@
     def on_wizard_finished(self, status):
         """Move to controlpanel if wizard ended successfully."""
         self.on_credentials_found()
+
+    @log_call(logger.info)
+    def start_from_license(self):
+        """Use the license page as first page."""
+        # license
+        self.ui.wizard.setStartId(self.ui.wizard.pages[
+            self.ui.wizard.license_page])
+        self.ui.wizard.restart()

=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2012-03-06 21:33:23 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-03-27 15:50:42 +0000
@@ -20,6 +20,7 @@
 
 from ubuntuone.controlpanel.gui.qt.systray import TrayIcon
 from ubuntuone.controlpanel.gui.qt.ui import mainwindow_ui
+from ubuntuone.controlpanel.utils import add_to_autostart
 
 # pylint: disable=E0611
 try:
@@ -35,7 +36,7 @@
 class MainWindow(QtGui.QMainWindow):
     """The Main Window of the Control Panel."""
 
-    def __init__(self, close_callback=None):
+    def __init__(self, close_callback=None, installer=False):
         """Initialize this instance with the UI layout."""
         super(MainWindow, self).__init__()
         self.ui = mainwindow_ui.Ui_MainWindow()
@@ -46,6 +47,10 @@
             triggered=self.close)
         self.quit_action.setShortcuts(["Ctrl+q", "Ctrl+w"])
         self.addAction(self.quit_action)
+        self.installer = installer
+        if installer:
+            self.ui.control_panel.start_from_license()
+        add_to_autostart()
         if USE_LIBUNITY:
             self.entry = Unity.LauncherEntry.get_for_desktop_id(U1_DOTDESKTOP)
         else:
@@ -84,14 +89,15 @@
     # pylint: enable=C0103
 
 
-def start(close_callback, minimized=False, with_icon=False):
+def start(close_callback, minimized=False, with_icon=False, installer=False):
     """Show the UI elements."""
     # pylint: disable=W0404, F0401
     if not minimized:
         if with_icon or minimized:
-            window = MainWindow()
+            window = MainWindow(installer=installer)
         else:
-            window = MainWindow(close_callback=close_callback)
+            window = MainWindow(close_callback=close_callback,
+                installer=installer)
         app = QtGui.QApplication.instance()
         style = QtGui.QStyle.alignedRect(
                     QtCore.Qt.LeftToRight, QtCore.Qt.AlignCenter,

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-03-16 21:09:40 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-03-27 15:50:42 +0000
@@ -55,6 +55,9 @@
                         default=False,
                         help="Start Ubuntu One "
                              "with an icon in the notification area.")
+    result.add_argument("--installer", dest="installer", action="store_true",
+                        default=False,
+                        help="Show the license agreement page first.")
     return result
 
 
@@ -82,17 +85,19 @@
     switch_to = args.switch_to
     minimized = args.minimized
     with_icon = args.with_icon
+    installer = args.installer
     source.main(app)
 
     data = []
-    for qss_name in (source.PLATFORM_QSS, ":/ubuntuone.qss"):
+    for qss_name in (":/ubuntuone.qss", source.PLATFORM_QSS):
         qss = QtCore.QResource(qss_name)
         data.append(unicode(qss.data()))
     app.setStyleSheet('\n'.join(data))
 
     # Unused variable 'window', 'icon', pylint: disable=W0612
     icon, window = start(lambda: source.main_quit(app),
-                         minimized=minimized, with_icon=with_icon)
+                         minimized=minimized, with_icon=with_icon,
+                         installer=installer)
     window.switch_to(switch_to)
     # pylint: enable=W0612
     if icon:

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-03-16 21:14:20 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-03-27 15:50:42 +0000
@@ -132,25 +132,25 @@
         """Ensure the binary name is not given to argparse."""
         main.main(["foo", "bar", sys.argv[0], "--minimized"])
         self.assertEqual(self.start.args[1],
-            {'minimized': True, 'with_icon': False})
+            {'minimized': True, 'with_icon': False, 'installer': False})
 
     def test_minimized_option(self):
         """Ensure the --minimized option is parsed and passed correctly."""
         main.main([sys.argv[0], "--minimized"])
         self.assertEqual(self.start.args[1],
-            {'minimized': True, 'with_icon': False})
+            {'minimized': True, 'with_icon': False, 'installer': False})
 
     def test_with_icon_option(self):
         """Ensure the --minimized option is parsed and passed correctly."""
         main.main([sys.argv[0], "--with-icon"])
         self.assertEqual(self.start.args[1],
-            {'minimized': False, 'with_icon': True})
+            {'minimized': False, 'with_icon': True, 'installer': False})
 
     def test_all_styles_load(self):
         """Ensure the platform style is loaded."""
         main.main([sys.argv[0]])
         data = []
-        for qss_name in (main.source.PLATFORM_QSS, ":/ubuntuone.qss"):
+        for qss_name in (":/ubuntuone.qss", main.source.PLATFORM_QSS):
             qss = QtCore.QResource(qss_name)
             data.append(unicode(qss.data()))
         self.assertEqual((('\n'.join(data),), {}), self.app.style)
@@ -160,6 +160,12 @@
         main.main([sys.argv[0], "--switch-to", "folders"])
         self.assertEqual(self.start.window.tabname, "folders")
 
+    def test_installer_option(self):
+        """Ensure the --installer option is parsed and passed correctly."""
+        main.main([sys.argv[0], "--installer"])
+        self.assertEqual(self.start.args[1],
+            {'minimized': False, 'with_icon': False, 'installer': True})
+
     def test_translator(self):
         """Ensure the Qt translator is loaded."""
         main.main([sys.argv[0]])

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-03-08 20:46:13 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-03-27 15:50:42 +0000
@@ -187,17 +187,16 @@
         return inner
 
 
-class FakedDialog(object):
+class FakedDialog(QtGui.QMessageBox):
     """Fake a confirmation dialog."""
 
-    Close = object()
-    Critical = object()
     properties = response = args = kwargs = None
 
     def __init__(self, *a, **kw):
+        super(FakedDialog, self).__init__(*a, **kw)
         FakedDialog.args = a
         FakedDialog.kwargs = kw
-        FakedDialog.properties = {'exec_': 0}
+        FakedDialog.properties = {'shown': 0}
 
     @classmethod
     def reset(cls, *a, **kw):
@@ -216,17 +215,24 @@
 
     def setDetailedText(self, text):
         """Fake the setDetailedText."""
+        super(FakedDialog, self).setDetailedText(text)
         FakedDialog.properties['detailed_text'] = text
 
     def setDefaultButton(self, button):
         """Fake the setDefaultButton."""
+        super(FakedDialog, self).setDefaultButton(button)
         FakedDialog.properties['default_button'] = button
 
     # pylint: enable=C0103
 
+    def show(self):
+        """Fake show."""
+        FakedDialog.properties['shown'] += 1
+        self.finished.emit(0)
+
     def exec_(self):
         """Fake exec_."""
-        FakedDialog.properties['exec_'] += 1
+        FakedDialog.properties['shown'] += 1
 
 
 class FakedFileDialog(object):
@@ -275,7 +281,9 @@
             self.ui = self.class_ui(**self.kwargs)
             # pylint: enable=E1102
             self.ui.show()
-            self.addCleanup(self.ui.destroy)
+            self.addCleanup(self.ui.hide)
+            self.addCleanup(self.ui.deleteLater)
+            self.addCleanup(QtCore.QCoreApplication.instance().processEvents)
 
         if getattr(self.ui, 'backend', None) is not None:
             self.addCleanup(self.ui.backend._called.clear)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_common.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_common.py	2011-10-05 16:35:59 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_common.py	2012-03-27 15:50:42 +0000
@@ -132,7 +132,8 @@
         yield self.decorate_me()
 
         logged = self.memento.check_exception(self.failure.__class__, msg)
-        recs = '\n'.join(rec.exc_text for rec in self.memento.records)
+        recs = '\n'.join(rec.exc_text for rec in self.memento.records
+                         if rec.exc_text is not None)
         self.assertTrue(logged, 'Exception must be logged, got:\n%s' % recs)
 
     @defer.inlineCallbacks
@@ -147,7 +148,7 @@
                 QtGui.QMessageBox.Close)
         self.assertEqual(FakedDialog.args, args)
         self.assertEqual(FakedDialog.kwargs, {'parent': None})
-        self.assertEqual(FakedDialog.properties['exec_'], 1)
+        self.assertEqual(FakedDialog.properties['shown'], 1)
 
     @defer.inlineCallbacks
     def test_show_error_message_default_button(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-03-19 15:50:31 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-03-27 15:50:42 +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
@@ -186,6 +184,16 @@
         remote = self.ui.ui.folders_tab.remote_folders
         self.assertFalse(remote)
 
+    def test_start_from_license(self):
+        """Ensure we change the starting page correctly."""
+        # Before, we start on sign_in
+        self.assertEqual(self.ui.ui.wizard.startId(),
+            self.ui.ui.wizard.pages[self.ui.ui.wizard.signin_page])
+        # After, we start on license_page
+        self.ui.start_from_license()
+        self.assertEqual(self.ui.ui.wizard.startId(),
+            self.ui.ui.wizard.pages[self.ui.ui.wizard.license_page])
+
 
 class ExternalLinkButtonsTestCase(ControlPanelTestCase):
     """The link in the go-to-web buttons are correct."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-19 20:51:26 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-27 15:50:42 +0000
@@ -26,6 +26,7 @@
 from PyQt4 import QtGui
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
+from ubuntuone.devtools.testcases import skipIfOS
 
 from ubuntuone.controlpanel.tests import helper_fail
 from ubuntuone.controlpanel.gui.tests import (
@@ -694,10 +695,6 @@
         empty_dir = os.path.join(dir_path, 'empty')
         os.mkdir(empty_dir)
 
-        # add a symlink to confirm those are avoided
-        a_link = os.path.join(dir_path, 'some_link')
-        os.symlink(a_file, a_link)
-
         return total_size
 
 
@@ -733,6 +730,28 @@
         self.assertRaises(Queue.Empty, self.queue.get, block=True, timeout=0.5)
 
 
+@skipIfOS("win32", "Windows does not easily support symlinks")
+class CalculateSizeWithSymlinksTestCase(BaseLocalFoldersTestCase):
+    """Test suite for the CalculateSize thread implementation."""
+
+    def build_test_dir(self, dir_path):
+        """Build a testing directory hierarchy."""
+        total_size = super(CalculateSizeWithSymlinksTestCase,
+                           self).build_test_dir(dir_path)
+
+        a_file = os.path.join(dir_path, 'to_be_symlinked')
+        with open(a_file, 'wb') as f:
+            f.write('y' * 5000)
+
+        total_size += os.path.getsize(a_file)
+
+        # add a symlink to confirm those are avoided
+        a_link = os.path.join(dir_path, 'some_link')
+        os.symlink(a_file, a_link)
+
+        return total_size
+
+
 class FakedCalculateSize(object):
     """A faked CalculateSize thread."""
 

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gui.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-03-09 01:05:49 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-03-27 15:50:42 +0000
@@ -18,6 +18,8 @@
 
 """Tests for the Qt UI."""
 
+from twisted.internet import defer
+
 from ubuntuone.controlpanel.gui.qt import gui
 from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
 
@@ -115,3 +117,17 @@
         self.patch(self.ui, "entry", entry)
         self.ui.set_urgent("foo")
         self.assertEqual(entry.called, (('urgent', "foo"), {}))
+
+
+class AutoStartTestCase(MainWindowTestCase):
+    """Test the add_to_autostart call."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        # Be sure to patch add_to_autostart *before* class_ui creation occurs.
+        self.patch(gui, "add_to_autostart", self._set_called)
+        yield super(AutoStartTestCase, self).setUp()
+
+    def test_add_to_autostart(self):
+        """Test that the add_to_autostart function is called when CP opens."""
+        self.assertTrue(self._called)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_start.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-02-17 14:42:57 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-03-27 15:50:42 +0000
@@ -78,7 +78,7 @@
         gui.start(close_callback=self.close_cb,
                   with_icon=True, minimized=False)
         kwargs = {'close_callback': self.close_cb, 'window': self.main_window}
-        self.assertEqual(self.main_window.args, [((), {})])
+        self.assertEqual(self.main_window.args, [((), {'installer': False})])
         self.assertEqual(self.tray_icon.args, [((), kwargs)])
 
     def test_both_false(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_wizard.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_wizard.py	2012-03-20 15:14:24 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_wizard.py	2012-03-27 15:50:42 +0000
@@ -89,7 +89,7 @@
         # Finish button is visible (and enabled if isComplete() returns true).
 
         # After calling setFinalPage(false), isFinalPage() returns true if
-        #nextId() returns -1; otherwise, it returns false.
+        # nextId() returns -1; otherwise, it returns false.
 
         self.patch(self.ui, 'nextId', lambda *a: 0)
         self.assertFalse(self.ui.isFinalPage())
@@ -153,11 +153,9 @@
 
     class_ui = gui.UbuntuOneWizard
     confirm_response = gui.QtGui.QDialog.Accepted
-    show_license = False
 
     @defer.inlineCallbacks
     def setUp(self):
-        self.patch(self.class_ui, 'show_license', self.show_license)
         yield super(UbuntuOneWizardTestCase, self).setUp()
         self.patch(self.ui.confirm_dialog, 'exec_',
                    lambda: self.confirm_response)
@@ -186,11 +184,7 @@
 
     def test_first_page(self):
         """The first page is the correct one."""
-        if self.show_license:
-            expected = self.ui.pages[self.ui.license_page]
-        else:
-            expected = self.ui.pages[self.ui.signin_page]
-
+        expected = self.ui.pages[self.ui.signin_page]
         self.assertEqual(self.ui.startId(), expected)
 
     def test_done_accepted(self):
@@ -202,12 +196,6 @@
         self.assertEqual(self._called, ((gui.QtGui.QDialog.Accepted,), {}))
 
 
-class LicensedUbuntuOneWizardTestCase(UbuntuOneWizardTestCase):
-    """Test the LicensedUbuntuOneWizard."""
-
-    show_license = True
-
-
 class UbuntuOneWizardSignInTestCase(UbuntuOneWizardTestCase):
     """Test the SignInPage wizard page."""
 
@@ -267,12 +255,13 @@
             if text is not None:
                 self.assertEqual(unicode(button.text()), text)
 
-            getattr(self.ui, signal).connect(self._set_called)
-            button.click()
+            if signal:
+                getattr(self.ui, signal).connect(self._set_called)
+                button.click()
 
-            self.assertEqual(self._called, (signal_args, {}),
-                             msg % (name, signal, signal_args))
-            self._called = False
+                self.assertEqual(self._called, (signal_args, {}),
+                                msg % (name, signal, signal_args))
+                self._called = False
 
     def test_done_rejected(self):
         """When the wizard was cancelled and user confirmed, finish."""
@@ -300,7 +289,7 @@
 class UbuntuOneWizardCloudToComputerTestCase(UbuntuOneWizardSignInTestCase):
     """Test the CloudToComputerPage wizard page."""
 
-    buttons = {'NextButton': (None, 'currentIdChanged', (3,))}
+    buttons = {'NextButton': (None, 'currentIdChanged', (4,))}
     page_name = 'cloud_folders'
     stage_name = 'folders'
 
@@ -308,7 +297,7 @@
 class UbuntuOneWizardSettingsTestCase(UbuntuOneWizardSignInTestCase):
     """Test the CloudToComputerPage wizard page."""
 
-    buttons = {'BackButton': (None, 'currentIdChanged', (0,))}
+    buttons = {'BackButton': (None, 'currentIdChanged', (1,))}
     page_name = 'settings'
     stage_name = 'folders'
 
@@ -318,7 +307,7 @@
 
     buttons = {
         'FinishButton': (None, 'finished', (gui.QtGui.QDialog.Accepted,)),
-        'BackButton': (None, 'currentIdChanged', (0,)),
+        'BackButton': (None, 'currentIdChanged', (1,)),
     }
     page_name = 'local_folders'
     stage_name = 'sync'
@@ -341,11 +330,10 @@
     """Test the LicensePage wizard page."""
 
     buttons = {
-        'NextButton': (gui.LICENSE_AGREE, 'currentIdChanged', (1,)),
+        'CommitButton': (gui.LICENSE_AGREE, None, ()),
         'CancelButton': (gui.LICENSE_DISAGREE, 'rejected', ()),
     }
     page_name = 'license'
-    show_license = True
     stage_name = 'install'
 
 
@@ -397,6 +385,27 @@
         self.assertTrue(self.ui.signin_page.isEnabled())
         self.assertFalse(self._called)
 
+    @defer.inlineCallbacks
+    def test_with_error(self):
+        """Wizard is enabled after an error was handled."""
+        self.ui.currentIdChanged.connect(self._set_called)
+        d = defer.fail(ValueError())
+
+        def check():
+            """Confirm the ui is disabled while processing."""
+            self.assertFalse(self.ui.signin_page.isEnabled())
+            return d
+
+        self.patch(self.ui.backend, self.method, check)
+        button = getattr(self.ui.signin_page.panel.ui,
+                         '%s_button' % self.method)
+        button.click()
+
+        yield d
+
+        self.assertTrue(self.ui.signin_page.isEnabled())
+        self.assertFalse(self._called)  # the wizard page was not changed
+
 
 class UbuntuOneWizardRegisterTestCase(UbuntuOneWizardLoginTestCase):
     """Test the register through the wizard."""

=== modified file 'ubuntuone/controlpanel/gui/qt/wizard.py'
--- ubuntuone/controlpanel/gui/qt/wizard.py	2012-03-20 15:11:56 +0000
+++ ubuntuone/controlpanel/gui/qt/wizard.py	2012-03-27 15:50:42 +0000
@@ -44,6 +44,7 @@
     LICENSE_LINK,
     UBUNTUONE_LINK,
 )
+from ubuntuone.controlpanel.gui.qt import handle_errors
 from ubuntuone.controlpanel.gui.qt.folders import (
     RemoteFoldersPanel,
     LocalFoldersPanel,
@@ -167,8 +168,6 @@
 class UbuntuOneWizard(cache.Cache, QtGui.QWizard):
     """The Ubuntu One wizard."""
 
-    show_license = False  # do not change unless you know what you're doing
-
     def __init__(self, *args, **kwargs):
         super(UbuntuOneWizard, self).__init__(*args, **kwargs)
         self.pages = {}
@@ -185,9 +184,8 @@
 
         # license
         self.license_page = LicensePage()
-        self.next_button_text = self.button(self.NextButton).text()
-        if self.show_license:
-            self.addPage(self.license_page)
+        self.license_page.setCommitPage(True)
+        self.addPage(self.license_page)
 
         # sign in
         self.signin_page = SignInPage()
@@ -213,7 +211,7 @@
         self.addPage(self.local_folders_page)
 
         self._next_id = self.pages[self.signin_page]
-        self.next()
+        self.setStartId(self._next_id)
 
     # pylint: disable=C0103
 
@@ -231,12 +229,14 @@
         button_layout = button_to = button = stage = None
 
         if page is self.license_page:
-            button_layout = [self.Stretch, self.CancelButton, self.NextButton]
-            button = self.button(self.NextButton)
+            button_layout = [self.Stretch, self.CancelButton,
+                self.CommitButton]
+            button = self.button(self.CommitButton)
             button_to = self.button(self.CancelButton)
             stage = self.side_widget.install_stage
+            self._next_id = self.pages[self.signin_page]
 
-            self.setButtonText(self.NextButton, LICENSE_AGREE)
+            self.setButtonText(self.CommitButton, LICENSE_AGREE)
             self.setButtonText(self.CancelButton, LICENSE_DISAGREE)
 
         elif page is self.signin_page:
@@ -250,8 +250,6 @@
             self.setTabOrder(self.signin_page.panel.ui.login_button, button)
 
         elif page is self.cloud_folders_page:
-            self.setButtonText(self.NextButton, self.next_button_text)
-
             button_layout = [self.Stretch, self.NextButton]
             button = self.cloud_folders_page.panel.ui.check_settings_button
             button_to = self.button(self.NextButton)
@@ -303,22 +301,28 @@
             self.next()
 
     @QtCore.pyqtSlot()
+    @handle_errors(logger=logger)
     @defer.inlineCallbacks
     def login(self):
         """Show the login dialog."""
         self.setEnabled(False)
-        credentials = yield self.backend.login()
-        self._process_credentials(credentials)
-        self.setEnabled(True)
+        try:
+            credentials = yield self.backend.login()
+            self._process_credentials(credentials)
+        finally:
+            self.setEnabled(True)
 
     @QtCore.pyqtSlot()
+    @handle_errors(logger=logger)
     @defer.inlineCallbacks
     def register(self):
         """Show the register dialog."""
         self.setEnabled(False)
-        credentials = yield self.backend.register()
-        self._process_credentials(credentials)
-        self.setEnabled(True)
+        try:
+            credentials = yield self.backend.register()
+            self._process_credentials(credentials)
+        finally:
+            self.setEnabled(True)
 
     @QtCore.pyqtSlot()
     def check_settings(self):
@@ -339,8 +343,7 @@
             if response == QtGui.QDialog.Accepted:
                 logger.warning('UbuntuOneWizard: user canceled setup.')
                 self.rejected.emit()
-        elif (self.show_license and
-              self.currentId() == self.pages[self.license_page]):
+        elif (self.currentId() == self.pages[self.license_page]):
             response = self.confirm_dialog.exec_()
             if response == QtGui.QDialog.Accepted:
                 logger.warning('UbuntuOneWizard: user wants to uninstall.')

=== modified file 'ubuntuone/controlpanel/utils/__init__.py'
--- ubuntuone/controlpanel/utils/__init__.py	2012-03-16 16:40:27 +0000
+++ ubuntuone/controlpanel/utils/__init__.py	2012-03-27 15:50:42 +0000
@@ -38,11 +38,13 @@
     are_updates_present = windows.are_updates_present
     default_folders = windows.default_folders
     perform_update = windows.perform_update
+    add_to_autostart = windows.add_to_autostart
 else:
     from ubuntuone.controlpanel.utils import linux
     are_updates_present = lambda *args, **kwargs: False
     default_folders = linux.default_folders
     perform_update = lambda *args, **kwargs: None
+    add_to_autostart = lambda *args, **kwargs: None
 
 # pylint: enable=C0103
 

=== modified file 'ubuntuone/controlpanel/utils/tests/test_windows.py'
--- ubuntuone/controlpanel/utils/tests/test_windows.py	2012-03-16 19:55:22 +0000
+++ ubuntuone/controlpanel/utils/tests/test_windows.py	2012-03-27 15:50:42 +0000
@@ -18,6 +18,7 @@
 """Test the windows utils functions."""
 
 import os
+import sys
 
 from twisted.internet import defer
 
@@ -87,6 +88,93 @@
         self.assertEqual(0, self._called[0][5])
 
 
+class FakeOpenKey(object):
+
+    """A Fake OpenKey class.
+
+    This class becomes a method-like callable on FakeRegistry, allowing
+    FakeRegistry.OpenKey to operate as a context manager."""
+
+    def __init__(self):
+        self.openkey_args = None
+        super(FakeOpenKey, self).__init__()
+
+    def __call__(self, *args, **kwargs):
+        self.openkey_args = (args, kwargs)
+        return self
+
+    def __enter__(self, *args, **kwargs):
+        #self.openkey_args = (args, kwargs)
+        return self
+
+    def __exit__(self, *args):
+        pass
+
+
+class FakeRegistry(object):
+
+    """A fake registry."""
+
+    # pylint: disable=C0103
+    HKEY_CURRENT_USER = 2
+    KEY_ALL_ACCESS = 4
+    REG_SZ = 1
+
+    def __init__(self):
+        self.HKEY_CURRENT_USER = 2
+        self.KEY_ALL_ACCESS = 4
+        self.openkey_args = None
+        self.query_args = None
+        self.set_args = []
+
+        self.OpenKey = FakeOpenKey()
+
+    def QueryValueEx(self, *args, **kwargs):
+        """Fake QueryValueEx."""
+        self.query_args = (args, kwargs)
+
+    def SetValueEx(self, *args, **kwargs):
+        """Fake SetValueEx."""
+        self.set_args.append((args, kwargs))
+
+
+class AutostartTestCase(TestCase):
+
+    """Test add_syncdaemon_to_autostart."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Initialize this test instance."""
+        self.registry = FakeRegistry()
+        self.patch(utils.windows, "_winreg", self.registry)
+        yield super(AutostartTestCase, self).setUp()
+
+    def test_add_syncdaemon_to_autostart(self):
+        """Check that the registry is updated correctly."""
+        # I can't patch sys because frozen is not there by default
+        sys.frozen = True
+        self.addCleanup(delattr, sys, 'frozen')
+        utils.windows.add_to_autostart()
+        self.assertEqual(self.registry.OpenKey.openkey_args,
+            ((self.registry.HKEY_CURRENT_USER, utils.windows.AUTORUN_KEY, 0,
+              self.registry.KEY_ALL_ACCESS), {}))
+        self.assertEqual(self.registry.query_args, None)
+        path = os.path.dirname(os.path.abspath(sys.executable))
+        self.assertEqual(self.registry.set_args,
+             [((self.registry.OpenKey, 'Ubuntu One', 0, 1,
+             '"%s\\ubuntuone-syncdaemon.exe"' % path), {}),
+             ((self.registry.OpenKey, 'Ubuntu One Icon', 0, 1,
+             '"%s\\ubuntuone-control-panel-qt.exe" --minimized' % path),
+             {})])
+
+    def test_not_added_if_not_frozen(self):
+        """Not frozen binaries are not added to the registry."""
+        utils.windows.add_to_autostart()
+        self.assertEqual(self.registry.openkey_args, None)
+        self.assertEqual(self.registry.query_args, None)
+        self.assertEqual(self.registry.set_args, [])
+
+
 class DefaultFoldersTestCase(TestCase):
     """Test the default_folders method."""
 

=== modified file 'ubuntuone/controlpanel/utils/windows.py'
--- ubuntuone/controlpanel/utils/windows.py	2012-03-16 19:55:22 +0000
+++ ubuntuone/controlpanel/utils/windows.py	2012-03-27 15:50:42 +0000
@@ -23,6 +23,7 @@
 # Avoid pylint error on Linux
 # pylint: disable=F0401
 import win32api
+import _winreg
 
 from win32com.shell import shell, shellcon
 # pylint: enable=F0401
@@ -33,6 +34,7 @@
 
 logger = setup_logging('utils.windows')
 AUTOUPDATE_EXE_NAME = 'autoupdate-windows.exe'
+AUTORUN_KEY = r"Software\Microsoft\Windows\CurrentVersion\Run"
 
 
 def _get_update_path():
@@ -96,3 +98,21 @@
         win32api.ShellExecute(None, 'runas',
             update_path,
             '--unattendedmodeui none', '', 0)
+
+
+def add_to_autostart():
+    """Add syncdaemon to the session's autostart."""
+    if getattr(sys, "frozen", False):
+        sd_path = '"%s"' % os.path.join(os.path.dirname(
+            os.path.abspath(sys.executable)),
+            "ubuntuone-syncdaemon.exe")
+        u1cp_path = '"%s"' % os.path.join(os.path.dirname(
+            os.path.abspath(sys.executable)),
+            "ubuntuone-control-panel-qt.exe")
+
+        with _winreg.OpenKey(_winreg.HKEY_CURRENT_USER, AUTORUN_KEY,
+                             0, _winreg.KEY_ALL_ACCESS) as key:
+            # pylint: disable=E0602
+            _winreg.SetValueEx(key, "Ubuntu One", 0, _winreg.REG_SZ, sd_path)
+            _winreg.SetValueEx(key, "Ubuntu One Icon", 0, _winreg.REG_SZ,
+                               u1cp_path + " --minimized --with-icon")