Merge lp:~ralsina/ubuntuone-windows-installer/not-compressed into lp:ubuntuone-windows-installer

[Roberto Alsina]

QSS are not compressed files, no need to call qUncompress.

QSS are not compressed files, no need to call qUncompress.

[Manuel de la Peña (mandel)]

trivial! But can you put a little longer comment in the commit so that we know the reason. Or even better make a blog post!

review: Approve

[Manuel de la Peña (mandel)]

trivial! But can you put a little longer comment in the commit so that we know the reason. Or even better make a blog post!

review: Approve

[Diego Sarmentero (diegosarmentero)]

Not working for me, when i changed to qUncompressed, it was because this was not working.

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/not-compressed]

31. By Roberto Alsina on 2011-08-12

generate uncompressed resource file

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'setup.py'
--- setup.py	2011-07-19 00:42:30 +0000
+++ setup.py	2011-08-12 13:12:40 +0000
@@ -114,7 +114,7 @@
         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_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-08-05 18:45:19 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-08-12 13:12:40 +0000
@@ -23,7 +23,6 @@
 
 from PyQt4 import QtGui
 from PyQt4 import QtCore
-from PyQt4.Qt import qUncompress
 
 # Module used to include the resources into this file
 # pylint: disable=W0611
@@ -51,7 +50,7 @@
     # Set Application Style Sheet
     app = QtGui.QApplication.instance()
     qss = QtCore.QResource(":/ubuntuone.qss")
-    app.setStyleSheet(QtCore.QString(qUncompress(qss.data())))
+    app.setStyleSheet(QtCore.QString(qss.data()))
     # Apply font to the entire application
     QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
     QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')