Merge lp:~ralsina/ubuntuone-control-panel/ubuntu-font-in-windows into lp:ubuntuone-control-panel

[Roberto Alsina]

- Enable platform-specific styling (LP: #953318).

Load a composite stylesheet from a main file and a platform-specific one.

To test IRL: on ubuntu, you should not get the ubuntu font anymore. On windows, you should get the ubuntu font.

[dobey (dobey)]

review: Approve

[lp:~ralsina/ubuntuone-control-panel/ubuntu-font-in-windows]

290. By Roberto Alsina on 2012-03-15

updated system-font branch

291. By Roberto Alsina on 2012-03-16

trunk merged, conflicts resolved

292. By Roberto Alsina on 2012-03-16

newline at EOF

293. By Roberto Alsina on 2012-03-16

fix test

[Eric Casteleijn (thisfred)]

+1

review: Approve

=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2012-03-02 13:53:24 +0000
+++ data/qt/images.qrc	2012-03-16 21:18:20 +0000
@@ -23,5 +23,7 @@
     <file>../Ubuntu-R.ttf</file>
     <file>../Ubuntu-B.ttf</file>
     <file>ubuntuone.qss</file>
+    <file>linux.qss</file>
+    <file>windows.qss</file>
   </qresource>
 </RCC>

=== added file 'data/qt/linux.qss'
--- data/qt/linux.qss	1970-01-01 00:00:00 +0000
+++ data/qt/linux.qss	2012-03-16 21:18:20 +0000
@@ -0,0 +1,2 @@
+/* Styles specific to the linux platform */
+

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2012-03-12 20:29:41 +0000
+++ data/qt/ubuntuone.qss	2012-03-16 21:18:20 +0000
@@ -11,7 +11,6 @@
 }
 
 QWidget {
-    font-family: "Ubuntu";
     color: #333333;
 }
 

=== added file 'data/qt/windows.qss'
--- data/qt/windows.qss	1970-01-01 00:00:00 +0000
+++ data/qt/windows.qss	2012-03-16 21:18:20 +0000
@@ -0,0 +1,5 @@
+/* Styles specific to the windows platform */
+
+QWidget {
+    font-family: "Ubuntu";
+}

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-03-15 16:42:21 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-03-16 21:18:20 +0000
@@ -84,8 +84,11 @@
     with_icon = args.with_icon
     source.main(app)
 
-    qss = QtCore.QResource(":/ubuntuone.qss")
-    app.setStyleSheet(qss.data())
+    data = []
+    for qss_name in (source.PLATFORM_QSS, ":/ubuntuone.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),

=== modified file 'ubuntuone/controlpanel/gui/qt/main/linux.py'
--- ubuntuone/controlpanel/gui/qt/main/linux.py	2012-02-06 21:10:10 +0000
+++ ubuntuone/controlpanel/gui/qt/main/linux.py	2012-03-16 21:18:20 +0000
@@ -31,3 +31,5 @@
 def main_quit(app):
     """Stop the mainloop."""
     app.exit()
+
+PLATFORM_QSS = ":/linux.qss"

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-03-15 17:05:45 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-03-16 21:18:20 +0000
@@ -146,10 +146,14 @@
         self.assertEqual(self.start.args[1],
             {'minimized': False, 'with_icon': True})
 
-    def test_style_loads(self):
-        """Ensure the stylesheet is loaded."""
+    def test_all_styles_load(self):
+        """Ensure the platform style is loaded."""
         main.main([sys.argv[0]])
-        self.assertTrue(self.app.style)
+        data = []
+        for qss_name in (main.source.PLATFORM_QSS, ":/ubuntuone.qss"):
+            qss = QtCore.QResource(qss_name)
+            data.append(unicode(qss.data()))
+        self.assertEqual((('\n'.join(data),), {}), self.app.style)
 
     def test_switch_to_option(self):
         """Ensure the --switch-to option is parsed and passed correctly."""

=== modified file 'ubuntuone/controlpanel/gui/qt/main/windows.py'
--- ubuntuone/controlpanel/gui/qt/main/windows.py	2012-02-28 14:49:21 +0000
+++ ubuntuone/controlpanel/gui/qt/main/windows.py	2012-03-16 21:18:20 +0000
@@ -42,3 +42,5 @@
 
 
 # pylint: enable=E1101
+
+PLATFORM_QSS = ":/windows.qss"