Merge lp:~diegosarmentero/ubuntuone-windows-installer/icon-signin into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Moving StyleSheet and font setup to windows.py.
Adding application icon.
Fixing Sign in Page UI Style.

Moving StyleSheet and font setup to windows.py.
Adding application icon.
Fixing Sign in Page UI Style.

[lp:~diegosarmentero/ubuntuone-windows-installer/icon-signin]

27. By Diego Sarmentero on 2011-08-05

adding images and removing unnecessary xml from choose_sing_in.xml

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~diegosarmentero/ubuntuone-windows-installer/icon-signin]

28. By Diego Sarmentero on 2011-08-05

using QResource to load the qss file.

29. By Diego Sarmentero on 2011-08-05

removing comment lines

30. By Diego Sarmentero on 2011-08-05

merge and conflicts resolved.

31. By Diego Sarmentero on 2011-08-05

removing empty pointless line in qss

32. By Diego Sarmentero on 2011-08-05

fixing malformed qss.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'data/qt/choose_sign_in.ui'
--- data/qt/choose_sign_in.ui	2011-08-04 15:32:35 +0000
+++ data/qt/choose_sign_in.ui	2011-08-05 19:56:37 +0000
@@ -14,22 +14,15 @@
    <string>WizardPage</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
       <widget class="QLabel" name="image_label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -50,7 +43,7 @@
         <enum>Qt::PlainText</enum>
        </property>
        <property name="pixmap">
-        <pixmap resource="images.qrc">:/win_install_img_placeholder.png</pixmap>
+        <pixmap resource="images.qrc">:/win_installer_graphic.png</pixmap>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
@@ -60,19 +53,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <spacer name="horizontalSpacer_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
     </layout>
    </item>
    <item>
@@ -85,14 +65,30 @@
       </font>
      </property>
      <property name="text">
-      <string>Ubuntu One has installed!</string>
+      <string>Congratulations, Ubuntu One is installed!</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item>
+    <spacer name="verticalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>30</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <spacer name="horizontalSpacer_2">
 
=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2011-07-27 14:53:56 +0000
+++ data/qt/images.qrc	2011-08-05 19:56:37 +0000
@@ -13,6 +13,7 @@
     <file>../progress_finish_orange.png</file>
     <file>../progress_tick.png</file>
     <file>../u1icon.png</file>
-    <file>../win_install_img_placeholder.png</file>
+    <file>../ubuntu_one_favicon.png</file>
+    <file>../win_installer_graphic.png</file>
   </qresource>
 </RCC>
 
=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-08-03 12:54:56 +0000
+++ data/qt/ubuntuone.qss	2011-08-05 19:56:37 +0000
@@ -123,6 +123,13 @@
     font-size: 24px;
 }
 
+QLabel#image_label{
+    border-style: dotted;
+    border-color: #939389;
+    border-bottom-width: 1px;
+    border-top-width: 1px;
+}
+
 QLabel#title_label{
     font-size: 20px;
 }
 
=== added file 'data/ubuntu_one_favicon.png'
 Binary files data/ubuntu_one_favicon.png	1970-01-01 00:00:00 +0000 and data/ubuntu_one_favicon.png	2011-08-05 19:56:37 +0000 differ
=== removed file 'data/win_install_img_placeholder.png'
 Binary files data/win_install_img_placeholder.png	2011-07-27 14:53:56 +0000 and data/win_install_img_placeholder.png	1970-01-01 00:00:00 +0000 differ
=== added file 'data/win_installer_graphic.png'
 Binary files data/win_installer_graphic.png	1970-01-01 00:00:00 +0000 and data/win_installer_graphic.png	2011-08-05 19:56:37 +0000 differ
=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-08-05 19:01:03 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-08-05 19:56:37 +0000
@@ -70,11 +70,6 @@
     setup_account_ui,
 )
 
-# Module used to include the resources into this file
-# pylint: disable=W0611
-from ubuntuone_installer.gui.qt.ui import images_rc
-# pylint: enable=W0611
-
 from ubuntuone_installer.gui.qt.are_you_sure import AreYouSure
 from ubuntuone_installer.gui.qt.currentuser import CurrentUserController
 from ubuntuone_installer.gui.qt.forgotten import ForgottenPasswordController
@@ -398,15 +393,6 @@
         # Set Wizard buttons style
         self.button(QtGui.QWizard.NextButton).setDefault(True)
 
-        # Set Application Style Sheet
-        app = QtGui.QApplication.instance()
-        qss_file = QtCore.QFile(":/ubuntuone.qss")
-        qss_file.open(QtCore.QFile.ReadOnly)
-        stylesheet = QtCore.QLatin1String(qss_file.readAll())
-        app.setStyleSheet(stylesheet)
-        # Apply font to the entire application
-        QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
-        QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
         credtool = CredentialsManagementTool()
         d = credtool.find_credentials()
         d.addCallback(self.creds_cb)
 
=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-08-02 20:05:25 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-08-05 19:56:37 +0000
@@ -22,6 +22,13 @@
 import sys
 
 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
+from ubuntuone_installer.gui.qt.ui import images_rc
+# pylint: enable=W0611
 
 
 def stop(*args):
@@ -40,5 +47,16 @@
     from twisted.internet import reactor
     window = MainWindow(close_callback=stop)
     app.window = window
+
+    # Set Application Style Sheet
+    app = QtGui.QApplication.instance()
+    qss = QtCore.QResource(":/ubuntuone.qss")
+    app.setStyleSheet(QtCore.QString(qUncompress(qss.data())))
+    # Apply font to the entire application
+    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
+    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
+    # Set Application Icon
+    app.setWindowIcon(QtGui.QIcon(":/ubuntu_one_favicon.png"))
+
     window.show()
     reactor.run()