raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed issues from merges.

Browse Source 
Set second page of wizard on edit.
This commit is contained in:
Raoul Snyman 2010-12-05 20:02:36 +02:00
parent 5b19753bf7
commit 3389e487ca
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/themeform.py
View File

@ -285,13 +285,15 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
self.footerHeightSpinBox.setEnabled(self.theme.font_footer_override) self.footerHeightSpinBox.setEnabled(self.theme.font_footer_override)
self.footerWidthSpinBox.setEnabled(self.theme.font_footer_override) self.footerWidthSpinBox.setEnabled(self.theme.font_footer_override)
def exec_(self): def exec_(self, edit=False):
""" """
Run the wizard. Run the wizard.
""" """
self.updateThemeAllowed = False self.updateThemeAllowed = False
self.setDefaults() self.setDefaults()
self.updateThemeAllowed = True self.updateThemeAllowed = True
if edit:
self.next()
return QtGui.QWizard.exec_(self) return QtGui.QWizard.exec_(self)
def initializePage(self, id): def initializePage(self, id):

2
openlp/core/ui/thememanager.py
View File

@ -280,7 +280,7 @@ class ThemeManager(QtGui.QWidget):
self.saveThemeName = unicode( self.saveThemeName = unicode(
item.data(QtCore.Qt.UserRole).toString()) item.data(QtCore.Qt.UserRole).toString())
self.themeForm.theme = theme self.themeForm.theme = theme
self.themeForm.exec_() self.themeForm.exec_(True)
def onDeleteTheme(self): def onDeleteTheme(self):
""" """

5
openlp/core/ui/themewizard.py
View File

@ -36,8 +36,7 @@ class Ui_ThemeWizard(object):
ThemeWizard.setWizardStyle(QtGui.QWizard.ModernStyle) ThemeWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
ThemeWizard.setOptions( ThemeWizard.setOptions(
QtGui.QWizard.IndependentPages | QtGui.QWizard.IndependentPages |
QtGui.QWizard.NoBackButtonOnStartPage | QtGui.QWizard.NoBackButtonOnStartPage)
QtGui.QWizard.NoBackButtonOnLastPage)
self.welcomePage = QtGui.QWizardPage() self.welcomePage = QtGui.QWizardPage()
self.welcomePage.setTitle(u'') self.welcomePage.setTitle(u'')
self.welcomePage.setSubTitle(u'') self.welcomePage.setSubTitle(u'')
@ -556,7 +555,7 @@ class Ui_ThemeWizard(object):
u'footerDefaultPositionCheckBox') u'footerDefaultPositionCheckBox')
self.footerPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.footerPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
self.footerDefaultPositionCheckBox) self.footerDefaultPositionCheckBox)
self.footerPositionGroupBox, 1, 1, 1, 1) self.areaPositionLayout.addWidget(self.footerPositionGroupBox, 1, 1, 1, 1)
ThemeWizard.addPage(self.areaPositionPage) ThemeWizard.addPage(self.areaPositionPage)
self.previewPage = QtGui.QWizardPage() self.previewPage = QtGui.QWizardPage()
self.previewPage.setObjectName(u'previewPage') self.previewPage.setObjectName(u'previewPage')