From 53905dec216dde9c73ebc4768b67eedfda622b82 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 8 Oct 2014 21:42:30 +0200 Subject: [PATCH] Fix up the look and feel of the wizards after I messed it up with my changes for OS X --- openlp/core/ui/firsttimewizard.py | 2 ++ openlp/core/ui/themewizard.py | 2 ++ openlp/core/ui/wizard.py | 2 ++ 3 files changed, 6 insertions(+) diff --git a/openlp/core/ui/firsttimewizard.py b/openlp/core/ui/firsttimewizard.py index c5098eda6..18d167371 100644 --- a/openlp/core/ui/firsttimewizard.py +++ b/openlp/core/ui/firsttimewizard.py @@ -68,6 +68,8 @@ class Ui_FirstTimeWizard(object): first_time_wizard.setPixmap(QtGui.QWizard.BackgroundPixmap, QtGui.QPixmap(':/wizards/openlp-osx-wizard.png')) first_time_wizard.resize(634, 386) + else: + first_time_wizard.setWizardStyle(QtGui.QWizard.ModernStyle) 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) diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py index 50200313f..be3fa4034 100644 --- a/openlp/core/ui/themewizard.py +++ b/openlp/core/ui/themewizard.py @@ -53,6 +53,8 @@ class Ui_ThemeWizard(object): if is_macosx(): theme_wizard.setPixmap(QtGui.QWizard.BackgroundPixmap, QtGui.QPixmap(':/wizards/openlp-osx-wizard.png')) theme_wizard.resize(646, 400) + else: + theme_wizard.setWizardStyle(QtGui.QWizard.ModernStyle) self.spacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum) # Welcome Page add_welcome_page(theme_wizard, ':/wizards/wizard_createtheme.bmp') diff --git a/openlp/core/ui/wizard.py b/openlp/core/ui/wizard.py index 7199d1742..0b568675b 100644 --- a/openlp/core/ui/wizard.py +++ b/openlp/core/ui/wizard.py @@ -125,6 +125,8 @@ class OpenLPWizard(QtGui.QWizard, RegistryProperties): QtGui.QWizard.NoBackButtonOnStartPage | QtGui.QWizard.NoBackButtonOnLastPage) if is_macosx(): self.setPixmap(QtGui.QWizard.BackgroundPixmap, QtGui.QPixmap(':/wizards/openlp-osx-wizard.png')) + else: + self.setWizardStyle(QtGui.QWizard.ModernStyle) add_welcome_page(self, image) self.add_custom_pages() if self.with_progress_page: