Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/ui-fixes into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/ui-fixes/+merge/237677
Fix up the look and feel of the wizards after I messed it up with my changes
for OS X
lp:~raoul-snyman/openlp/ui-fixes (revision 2423)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/667/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/615/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/559/
[SUCCESS] http://ci.openlp.org/job/Branch-04a-Windows_Functional_Tests/508/
[SUCCESS] http://ci.openlp.org/job/Branch-04b-Windows_Interface_Tests/117/
[SUCCESS] http://ci.openlp.org/job/Branch-05a-Code_Analysis/324/
[SUCCESS] http://ci.openlp.org/job/Branch-05b-Test_Coverage/198/
--
https://code.launchpad.net/~raoul-snyman/openlp/ui-fixes/+merge/237677
Your team OpenLP Core is requested to review the proposed merge of
lp:~raoul-snyman/openlp/ui-fixes into lp:openlp.
=== modified file 'openlp/core/ui/firsttimewizard.py'
--- openlp/core/ui/firsttimewizard.py 2014-09-02 21:15:58 +0000
+++ openlp/core/ui/firsttimewizard.py 2014-10-08 19:51:56 +0000
@@ -68,6 +68,8 @@
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)
=== modified file 'openlp/core/ui/themewizard.py'
--- openlp/core/ui/themewizard.py 2014-09-07 22:30:21 +0000
+++ openlp/core/ui/themewizard.py 2014-10-08 19:51:56 +0000
@@ -53,6 +53,8 @@
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')
=== modified file 'openlp/core/ui/wizard.py'
--- openlp/core/ui/wizard.py 2014-09-07 22:30:21 +0000
+++ openlp/core/ui/wizard.py 2014-10-08 19:51:56 +0000
@@ -125,6 +125,8 @@
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:
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
