Merge lp:~ralsina/ubuntu-sso-client/ubuntu-font-in-windows into lp:ubuntu-sso-client

[Roberto Alsina]

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

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

Also, fixed and unskipped a test for main()

[dobey (dobey)]

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

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

=== modified file 'data/qt/resources.qrc'
--- data/qt/resources.qrc	2012-02-16 14:13:36 +0000
+++ data/qt/resources.qrc	2012-03-16 22:41:20 +0000
@@ -6,5 +6,7 @@
     <file>../Ubuntu-B.ttf</file>
     <file>../balloon_shape.png</file>
     <file>stylesheet.qss</file>
+    <file>windows.qss</file>
+    <file>linux.qss</file>
   </qresource>
 </RCC>

=== modified file 'data/qt/stylesheet.qss'
--- data/qt/stylesheet.qss	2012-03-16 14:30:51 +0000
+++ data/qt/stylesheet.qss	2012-03-16 22:41:20 +0000
@@ -1,5 +1,4 @@
 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 22:41:20 +0000
@@ -0,0 +1,5 @@
+/* Styles specific to the windows platform */
+
+QWidget {
+    font-family: "Ubuntu";
+}

=== modified file 'ubuntu_sso/qt/main.py'
--- ubuntu_sso/qt/main.py	2012-02-24 19:54:48 +0000
+++ ubuntu_sso/qt/main.py	2012-03-16 22:41:20 +0000
@@ -25,6 +25,7 @@
 from ubuntu_sso.qt.ui import resources_rc
 # pylint: enable=W0611
 from ubuntu_sso.qt.ubuntu_sso_wizard import UbuntuSSOClientGUI
+from ubuntu_sso.utils import PLATFORM_QSS
 
 
 def main(**kwargs):
@@ -34,9 +35,11 @@
     QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
     QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
 
-    # Apply Style Sheet -- The windows version may be different
-    qss = QtCore.QResource(":/stylesheet.qss")
-    app.setStyleSheet(qss.data())
+    data = []
+    for qss_name in (PLATFORM_QSS, ":/stylesheet.qss"):
+        qss = QtCore.QResource(qss_name)
+        data.append(unicode(qss.data()))
+    app.setStyleSheet('\n'.join(data))
 
     # Unused variable 'ui', pylint: disable=W0612
     ui = UbuntuSSOClientGUI(close_callback=app.exit, **kwargs)

=== modified file 'ubuntu_sso/qt/tests/test_main.py'
--- ubuntu_sso/qt/tests/test_main.py	2012-02-13 15:43:59 +0000
+++ ubuntu_sso/qt/tests/test_main.py	2012-03-16 22:41:20 +0000
@@ -16,27 +16,63 @@
 
 """Tests for the main module."""
 
+from PyQt4 import QtCore
+from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
 from ubuntu_sso.qt import main
 
 
+# pylint: disable=C0103
+class FakeUi(object):
+
+    """A fake UI."""
+
+    def size(self):
+        """Fake size."""
+        return QtCore.QSize(100, 100)
+
+    def setGeometry(self, *args):
+        """Fake setGeometry."""
+
+    show = setGeometry
+# pylint: enable=C0103
+
+
 class BasicTestCase(TestCase):
     """Test case with a helper tracker."""
 
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(BasicTestCase, self).setUp()
+        self.called = []
+
+        def called_ui(**kw):
+            """record ui call."""
+            self.called.append(('GUI', kw))
+            return FakeUi()
+
+        self.patch(main, 'UbuntuSSOClientGUI', called_ui)
+        self.patch(main.QtGui.QApplication, 'exec_',
+                   lambda *a: self.called.append('main'))
+
     def test_main(self):
         """Calling main.main() a UI instance is created."""
-        called = []
-        self.patch(main, 'UbuntuSSOClientGUI',
-                   lambda **kw: called.append(('GUI', kw)))
-        self.patch(main.QtGui.QApplication, 'exec_',
-                   lambda *a: called.append('main'))
 
         kwargs = dict(foo='foo', bar='bar', baz='yadda', yadda=0)
         main.main(**kwargs)
 
         kwargs['close_callback'] = main.QtGui.QApplication.instance().exit
-        self.assertEqual(called, [('GUI', kwargs), 'main'])
+        self.assertEqual(self.called, [('GUI', kwargs), 'main'])
 
-    test_main.skip = 'Failing with QObject::startTimer: QTimer can only be ' \
-                     'used with threads started with QThread'
+    def test_styles_load(self):
+        """Test that all stylesheets load."""
+        kwargs = dict(foo='foo', bar='bar', baz='yadda', yadda=0)
+        main.main(**kwargs)
+        data = []
+        for qss_name in (main.PLATFORM_QSS, ":/stylesheet.qss"):
+            qss = QtCore.QResource(qss_name)
+            data.append(unicode(qss.data()))
+        self.assertEqual(
+        unicode(QtCore.QCoreApplication.instance().styleSheet()),
+            '\n'.join(data))

=== modified file 'ubuntu_sso/utils/__init__.py'
--- ubuntu_sso/utils/__init__.py	2012-03-15 19:25:34 +0000
+++ ubuntu_sso/utils/__init__.py	2012-03-16 22:41:20 +0000
@@ -32,8 +32,14 @@
 
 
 logger = setup_logging("ubuntu_sso.utils")
+BIN_SUFFIX = 'bin'
 DATA_SUFFIX = 'data'
-BIN_SUFFIX = 'bin'
+
+if sys.platform == "win32":
+    from ubuntu_sso.utils import windows as source
+else:
+    from ubuntu_sso.utils import linux as source
+PLATFORM_QSS = source.PLATFORM_QSS
 
 
 def _get_dir(dir_name, dir_constant):

=== added file 'ubuntu_sso/utils/linux.py'
--- ubuntu_sso/utils/linux.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/utils/linux.py	2012-03-16 22:41:20 +0000
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2010-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/>.
+
+"""Platform specific constants and functions (for Linux)."""
+
+PLATFORM_QSS = ":/linux.qss"

=== added file 'ubuntu_sso/utils/windows.py'
--- ubuntu_sso/utils/windows.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/utils/windows.py	2012-03-16 22:41:20 +0000
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2010-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/>.
+
+"""Platform specific constants and functions (for Windows)."""
+
+PLATFORM_QSS = ":/windows.qss"