From 3389e487ca34a83bc1c42b7052b16a61fda73a0d Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Sun, 5 Dec 2010 20:02:36 +0200
Subject: [PATCH] Fixed issues from merges. Set second page of wizard on edit.

---
 openlp/core/ui/themeform.py    | 4 +++-
 openlp/core/ui/thememanager.py | 2 +-
 openlp/core/ui/themewizard.py  | 5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index 613670f01..3b2c4edba 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -285,13 +285,15 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         self.footerHeightSpinBox.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.
         """
         self.updateThemeAllowed = False
         self.setDefaults()
         self.updateThemeAllowed = True
+        if edit:
+            self.next()
         return QtGui.QWizard.exec_(self)
 
     def initializePage(self, id):
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index e69bdade1..da8597cc0 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -280,7 +280,7 @@ class ThemeManager(QtGui.QWidget):
             self.saveThemeName = unicode(
                 item.data(QtCore.Qt.UserRole).toString())
             self.themeForm.theme = theme
-            self.themeForm.exec_()
+            self.themeForm.exec_(True)
 
     def onDeleteTheme(self):
         """
diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py
index b4b5fcea3..76fd1d445 100644
--- a/openlp/core/ui/themewizard.py
+++ b/openlp/core/ui/themewizard.py
@@ -36,8 +36,7 @@ class Ui_ThemeWizard(object):
         ThemeWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
         ThemeWizard.setOptions(
             QtGui.QWizard.IndependentPages |
-            QtGui.QWizard.NoBackButtonOnStartPage |
-            QtGui.QWizard.NoBackButtonOnLastPage)
+            QtGui.QWizard.NoBackButtonOnStartPage)
         self.welcomePage = QtGui.QWizardPage()
         self.welcomePage.setTitle(u'')
         self.welcomePage.setSubTitle(u'')
@@ -556,7 +555,7 @@ class Ui_ThemeWizard(object):
             u'footerDefaultPositionCheckBox')
         self.footerPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
             self.footerDefaultPositionCheckBox)
-            self.footerPositionGroupBox, 1, 1, 1, 1)
+        self.areaPositionLayout.addWidget(self.footerPositionGroupBox, 1, 1, 1, 1)
         ThemeWizard.addPage(self.areaPositionPage)
         self.previewPage = QtGui.QWizardPage()
         self.previewPage.setObjectName(u'previewPage')