Make the wizards look right on OS X

openlp/core/ui/firsttimeform.py

@@ -387,17 +387,21 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard, RegistryProperties):
             self.progress_bar.setValue(self.progress_bar.maximum())
             if self.has_run_wizard:
                 self.progress_label.setText(translate('OpenLP.FirstTimeWizard',
-                                            'Download complete. Click the finish button to return to OpenLP.'))
+                                            'Download complete. Click the %s button to return to OpenLP.') %
+                                            self.buttonText(QtGui.QWizard.FinishButton))
             else:
                 self.progress_label.setText(translate('OpenLP.FirstTimeWizard',
-                                            'Download complete. Click the finish button to start OpenLP.'))
+                                            'Download complete. Click the %s button to start OpenLP.') %
+                                            self.buttonText(QtGui.QWizard.FinishButton))
         else:
             if self.has_run_wizard:
                 self.progress_label.setText(translate('OpenLP.FirstTimeWizard',
-                                            'Click the finish button to return to OpenLP.'))
+                                            'Click the %s button to return to OpenLP.') %
+                                            self.buttonText(QtGui.QWizard.FinishButton))
             else:
                 self.progress_label.setText(translate('OpenLP.FirstTimeWizard',
-                                            'Click the finish button to start OpenLP.'))
+                                            'Click the %s button to start OpenLP.') %
+                                            self.buttonText(QtGui.QWizard.FinishButton))
         self.finish_button.setVisible(True)
         self.finish_button.setEnabled(True)
         self.cancel_button.setVisible(False)

openlp/core/ui/firsttimewizard.py

@@ -64,9 +64,12 @@ class Ui_FirstTimeWizard(object):
         first_time_wizard.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         first_time_wizard.resize(550, 386)
         first_time_wizard.setModal(True)
-        first_time_wizard.setWizardStyle(QtGui.QWizard.ModernStyle)
         first_time_wizard.setOptions(QtGui.QWizard.IndependentPages | QtGui.QWizard.NoBackButtonOnStartPage |
                                      QtGui.QWizard.NoBackButtonOnLastPage | QtGui.QWizard.HaveCustomButton1)
+        if sys.platform == 'darwin':
+            first_time_wizard.setPixmap(QtGui.QWizard.BackgroundPixmap,
+                                        QtGui.QPixmap(':/wizards/openlp-osx-wizard.png'))
+            first_time_wizard.resize(634, 386)
         self.finish_button = self.button(QtGui.QWizard.FinishButton)
         self.no_internet_finish_button = self.button(QtGui.QWizard.CustomButton1)
         self.cancel_button = self.button(QtGui.QWizard.CancelButton)
@@ -212,7 +215,8 @@ class Ui_FirstTimeWizard(object):
                                  translate('OpenLP.FirstTimeWizard', 'Welcome to the First Time Wizard'))
         self.information_label.setText(
             translate('OpenLP.FirstTimeWizard', 'This wizard will help you to configure OpenLP for initial use. '
-                                                'Click the next button below to start.'))
+                                                'Click the %s button below to start.') %
+            self.buttonText(QtGui.QWizard.NextButton))
         self.plugin_page.setTitle(translate('OpenLP.FirstTimeWizard', 'Activate required Plugins'))
         self.plugin_page.setSubTitle(translate('OpenLP.FirstTimeWizard', 'Select the Plugins you wish to use. '))
         self.songs_check_box.setText(translate('OpenLP.FirstTimeWizard', 'Songs'))
@@ -236,7 +240,7 @@ class Ui_FirstTimeWizard(object):
                                           'wizard by selecting "Tools/Re-run First Time Wizard" from OpenLP.')
         self.cancelWizardText = translate('OpenLP.FirstTimeWizard',
                                           '\n\nTo cancel the First Time Wizard completely (and not start OpenLP), '
-                                          'click the Cancel button now.')
+                                          'click the %s button now.') % self.buttonText(QtGui.QWizard.CancelButton)
         self.songs_page.setTitle(translate('OpenLP.FirstTimeWizard', 'Sample Songs'))
         self.songs_page.setSubTitle(translate('OpenLP.FirstTimeWizard', 'Select and download public domain songs.'))
         self.bibles_page.setTitle(translate('OpenLP.FirstTimeWizard', 'Sample Bibles'))

openlp/core/ui/themewizard.py

@@ -29,6 +29,8 @@
 """
 The Create/Edit theme wizard
 """
+import sys
+
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.common import UiStrings, translate
@@ -48,9 +50,11 @@ class Ui_ThemeWizard(object):
         themeWizard.setObjectName('OpenLP.ThemeWizard')
         themeWizard.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         themeWizard.setModal(True)
-        themeWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
         themeWizard.setOptions(QtGui.QWizard.IndependentPages |
                                QtGui.QWizard.NoBackButtonOnStartPage | QtGui.QWizard.HaveCustomButton1)
+        if sys.platform == 'darwin':
+            themeWizard.setPixmap(QtGui.QWizard.BackgroundPixmap, QtGui.QPixmap(':/wizards/openlp-osx-wizard.png'))
+            #themeWizard.resize(634, 386)
         self.spacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
         # Welcome Page
         add_welcome_page(themeWizard, ':/wizards/wizard_createtheme.bmp')

openlp/core/ui/wizard.py

@@ -31,6 +31,7 @@ The :mod:``wizard`` module provides generic wizard tools for OpenLP.
 """
 import logging
 import os
+import sys
 
 from PyQt4 import QtGui
 
@@ -121,9 +122,11 @@ class OpenLPWizard(QtGui.QWizard, RegistryProperties):
         """
         self.setWindowIcon(build_icon(u':/icon/openlp-logo.svg'))
         self.setModal(True)
-        self.setWizardStyle(QtGui.QWizard.ModernStyle)
         self.setOptions(QtGui.QWizard.IndependentPages |
                         QtGui.QWizard.NoBackButtonOnStartPage | QtGui.QWizard.NoBackButtonOnLastPage)
+        if sys.platform == 'darwin':
+            self.setPixmap(QtGui.QWizard.BackgroundPixmap, QtGui.QPixmap(':/wizards/openlp-osx-wizard.png'))
+            #self.resize(634, 386)
         add_welcome_page(self, image)
         self.add_custom_pages()
         if self.with_progress_page:

resources/images/openlp-2.qrc

@@ -99,6 +99,7 @@
     <file>export_load.png</file>
   </qresource>
   <qresource prefix="wizards">
+    <file>openlp-osx-wizard.png</file>
     <file>wizard_exportsong.bmp</file>
     <file>wizard_importsong.bmp</file>
     <file>wizard_importbible.bmp</file>
@@ -150,10 +151,10 @@
     <file>messagebox_warning.png</file>
   </qresource>
   <qresource prefix="remote">
-    <file>network_server.png</file>    
+    <file>network_server.png</file>
     <file>network_ssl.png</file>
-    <file>network_auth.png</file>    
-  </qresource>  
+    <file>network_auth.png</file>
+  </qresource>
   <qresource prefix="songusage">
     <file>song_usage_active.png</file>
     <file>song_usage_inactive.png</file>

scripts/generate_resources.sh

@@ -44,7 +44,7 @@
 mv openlp/core/resources.py openlp/core/resources.py.old
 
 # Create the new data from the updated qrc
-pyrcc4 -py3 -o openlp/core/resources.py.new resources/images/openlp-2.qrc
+pyrcc4-3.3 -py3 -o openlp/core/resources.py.new resources/images/openlp-2.qrc
 
 # Remove patch breaking lines
 cat openlp/core/resources.py.new | sed '/# Created: /d;/#      by: /d' > openlp/core/resources.py