Merge lp:~ralsina/ubuntuone-control-panel/scroll-harder into lp:ubuntuone-control-panel

[Roberto Alsina]

- Fixed share/UDF list scrolling on Mac (LP:1018918)

To test IRL:

Run it on mac, with an account that has many shares and UDFs. You should be able to scroll it normally.

[lp:~ralsina/ubuntuone-control-panel/scroll-harder]

352. By Roberto Alsina on 2012-08-24

start on the right tab

[Alejandro J. Cura (alecu)]

Looks good, passes all tests on darwin 10.8.

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2012-08-20 20:17:35 +0000
+++ data/qt/controlpanel.ui	2012-08-24 19:41:23 +0000
@@ -229,7 +229,7 @@
             </sizepolicy>
            </property>
            <property name="currentIndex">
-            <number>1</number>
+            <number>0</number>
            </property>
            <widget class="FoldersPanel" name="folders_tab">
             <attribute name="title">

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-08-20 20:30:39 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-08-24 19:41:23 +0000
@@ -85,6 +85,8 @@
     # because u1trial already provides a reactor.
 
     args = ['ubuntuone-installer'] + args
+    if sys.platform == 'darwin':
+        args += ['-graphicssystem', 'raster']
     app = UniqueApplication(args, "ubuntuone-control-panel")
 
     # on darwin, must install qt4reactor after UniqueApplication init.

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-08-04 00:05:23 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-08-24 19:41:23 +0000
@@ -47,11 +47,17 @@
         self.style = None
         self.translator = None
         self.new_instance = FakeSignal()
+        self.raster = False
 
     def __call__(self, argv, *args, **kwargs):
         """Fake arg filtering function."""
-        if '-title' in argv:
-            argv.remove('-title')
+        if 'raster' in argv and '-graphicssystem' in argv:
+            self.raster = True
+        for arg in ('-title', '-graphicssystem', 'raster'):
+            try:
+                argv.remove(arg)
+            except ValueError:
+                pass
         self.args = (argv, args, kwargs)
         return self
 
@@ -222,6 +228,18 @@
         self.assertEqual(self.start.args[1],
             {'minimized': True, 'with_icon': True, 'installer': False})
 
+    def test_nondarwin_is_not_raster(self):
+        """Ensure the raster argument is not injected in non-darwin."""
+        self.patch(sys, 'platform', 'not-darwin')
+        main.main([sys.argv[0]])
+        self.assertFalse(self.app.raster)
+
+    def test_darwin_is_raster(self):
+        """Ensure the raster argument is injected in darwin."""
+        self.patch(sys, 'platform', 'darwin')
+        main.main([sys.argv[0]])
+        self.assertTrue(self.app.raster)
+
     def test_translator(self):
         """Ensure the Qt translator is loaded."""
         main.main([sys.argv[0]])