Merge lp:~ralsina/ubuntuone-control-panel/fix_917322 into lp:ubuntuone-control-panel

[Roberto Alsina]

Use uncompressed resources and the same qss loading code in both platforms to avoid future inconsistencies.

IRL test:

python setup.py build
python bin/ubuntuone-control-panel-qt

See orange buttons? Yay! See gray buttons? Nay!

[Natalia Bidart (nataliabidart)]

Looks good!

Can we have the stylesheet loading code in the multiplatform main (since now is the same code), and perhaps have the .qss name be platform-dependent (no need to do that last bit now - perhaps when we actually have 2 different qss)?

review: Needs Fixing

[lp:~ralsina/ubuntuone-control-panel/fix_917322]

256. By Roberto Alsina on 2012-01-18

move qss loading into the cross-platform main

[Roberto Alsina (ralsina)]

> Looks good!
>
> Can we have the stylesheet loading code in the multiplatform main (since now
> is the same code), and perhaps have the .qss name be platform-dependent (no
> need to do that last bit now - perhaps when we actually have 2 different qss)?

Done in revno 256

[Natalia Bidart (nataliabidart)]

ubuntuone/controlpanel/gui/qt/main/__init__.py:
    45: [E0602, main] Undefined variable 'QtCore'

ubuntuone/controlpanel/gui/qt/main/linux.py:
    20: [W0611] Unused import QtCore

ubuntuone/controlpanel/gui/qt/main/windows.py:
    19: [W0611] Unused import QtCore

nessita@dali:~/canonical/controlpanel/review_fix_917322$ DEBUG=True PYTHONPATH=. bin/ubuntuone-control-panel-qt
Traceback (most recent call last):
  File "bin/ubuntuone-control-panel-qt", line 63, in <module>
    with_icon=options.with_icon)
  File "/home/nessita/canonical/controlpanel/review_fix_917322/ubuntuone/controlpanel/gui/qt/main/__init__.py", line 45, in main
    qss = QtCore.QResource(":/ubuntuone.qss")
NameError: global name 'QtCore' is not defined

review: Needs Fixing

[lp:~ralsina/ubuntuone-control-panel/fix_917322]

257. By Roberto Alsina on 2012-01-19

Note to self: when IRL testing on windows, make sure u1cp is not already running, or you will IRL test the old version

[Roberto Alsina (ralsina)]

Sorry, turns out that I really, really, really should take care to kill u1cp before doing IRL tests on windows ;-)

[Natalia Bidart (nataliabidart)]

These lint issues are still present:

== Python Lint Notices ==

ubuntuone/controlpanel/gui/qt/main/linux.py:
    20: [W0611] Unused import QtCore

ubuntuone/controlpanel/gui/qt/main/windows.py:
    19: [W0611] Unused import QtCore

review: Needs Fixing

[lp:~ralsina/ubuntuone-control-panel/fix_917322]

258. By Roberto Alsina on 2012-01-26

lint

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'setup.py'
--- setup.py	2011-12-16 14:58:44 +0000
+++ setup.py	2012-01-26 12:46:25 +0000
@@ -116,7 +116,8 @@
         path = os.getenv('PATH')
         os.putenv('PATH', path + os.path.pathsep + os.path.join(
                   os.path.dirname(PyQt4.__file__), 'bin'))
-        if os.system('pyrcc4 "%s" -o "%s"' % (qrc_file, py_file)) > 0:
+        if os.system('pyrcc4 -no-compress "%s" -o "%s"' %
+            (qrc_file, py_file)) > 0:
             self.warn('Unable to generate python module {py_file}'
                       ' for resource file {qrc_file}'.format(
                       py_file=py_file, qrc_file=qrc_file))

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-01-04 11:43:14 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-01-26 12:46:25 +0000
@@ -18,6 +18,8 @@
 
 import sys
 
+from PyQt4 import QtCore
+
 # Module used to include the resources into this file
 # Unused import images_rc, pylint: disable=W0611
 from ubuntuone.controlpanel.gui.qt.ui import images_rc
@@ -42,6 +44,8 @@
     # The main loop MUST be initialized before importing the reactor
     app = UniqueApplication(sys.argv, "ubuntuone-control-panel")
     source.main(app)
+    qss = QtCore.QResource(":/ubuntuone.qss")
+    app.setStyleSheet(qss.data())
 
     # Reimport 'qt4reactor', 'reactor', 'start', pylint: disable=W0404, F0401
     import qt4reactor

=== modified file 'ubuntuone/controlpanel/gui/qt/main/linux.py'
--- ubuntuone/controlpanel/gui/qt/main/linux.py	2011-11-11 19:27:07 +0000
+++ ubuntuone/controlpanel/gui/qt/main/linux.py	2012-01-26 12:46:25 +0000
@@ -17,14 +17,9 @@
 """Main method to be used on linux."""
 
 from dbus.mainloop.qt import DBusQtMainLoop
-from PyQt4 import QtCore
 
 
 def main(app):
     """Apply style sheet."""
     # The DBus main loop MUST be initialized before importing the reactor
     DBusQtMainLoop(set_as_default=True)
-
-    # Apply Style Sheet -- The linux version may be different
-    qss = QtCore.QResource(":/ubuntuone.qss")
-    app.setStyleSheet(qss.data())

=== modified file 'ubuntuone/controlpanel/gui/qt/main/windows.py'
--- ubuntuone/controlpanel/gui/qt/main/windows.py	2011-11-11 19:40:10 +0000
+++ ubuntuone/controlpanel/gui/qt/main/windows.py	2012-01-26 12:46:25 +0000
@@ -16,7 +16,7 @@
 
 """Main method to be used on windows."""
 
-from PyQt4 import QtGui, QtCore
+from PyQt4 import QtGui
 
 
 def main(app):
@@ -24,9 +24,3 @@
     # Apply font to the entire application
     QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
     QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
-
-    # Apply Style Sheet -- The windows version may be different
-    qss_file = QtCore.QFile(":/ubuntuone.qss")
-    qss_file.open(QtCore.QFile.ReadOnly)
-    stylesheet = QtCore.QLatin1String(qss_file.readAll())
-    app.setStyleSheet(stylesheet)