From 7edae012dc1d4e91712c0e79b175834418adbe25 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 30 Oct 2010 12:09:36 +0100
Subject: [PATCH] UI works with independent mode

---
 openlp/core/ui/mainwindow.py        |  3 ++-
 openlp/core/ui/themedialog.py       |  4 ++--
 openlp/plugins/media/mediaplugin.py | 14 +++++++-------
 resources/forms/themedialog.ui      |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 0797a7a3e..c500b7a15 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -808,7 +808,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.plugin_manager.finalise_plugins()
         # Save settings
         self.saveSettings()
-        #Close down the display
+        # Close down the display
         self.LiveController.display.close()
 
     def serviceChanged(self, reset=False, serviceName=None):
@@ -904,6 +904,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         """
         Save the main window settings.
         """
+        print self.saveState()
         log.debug(u'Saving QSettings')
         settings = QtCore.QSettings()
         settings.beginGroup(self.generalSettingsSection)
diff --git a/openlp/core/ui/themedialog.py b/openlp/core/ui/themedialog.py
index abf676c95..87c09aeba 100644
--- a/openlp/core/ui/themedialog.py
+++ b/openlp/core/ui/themedialog.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'themedialog.ui'
 #
-# Created: Sun Oct 17 19:46:30 2010
+# Created: Sat Oct 30 12:07:46 2010
 #      by: PyQt4 UI code generator 4.7.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -15,7 +15,7 @@ class Ui_ThemeDialog(object):
         ThemeDialog.resize(550, 386)
         ThemeDialog.setModal(True)
         ThemeDialog.setWizardStyle(QtGui.QWizard.ModernStyle)
-        ThemeDialog.setOptions(QtGui.QWizard.NoBackButtonOnStartPage)
+        ThemeDialog.setOptions(QtGui.QWizard.IndependentPages|QtGui.QWizard.NoBackButtonOnStartPage)
         self.welcomePage = QtGui.QWizardPage()
         self.welcomePage.setTitle("")
         self.welcomePage.setSubTitle("")
diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index 5e300fcf4..7d6272b6a 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -97,42 +97,42 @@ class MediaPlugin(Plugin):
         ## Load Button ##
         self.textStrings[StringContent.Load] = {
             u'title': translate('MediaPlugin', 'Load'),
-            u'tooltip': translate('MediaPlugin', 
+            u'tooltip': translate('MediaPlugin',
                 'Load a new Media')
         }
         ## New Button ##
         self.textStrings[StringContent.New] = {
             u'title': translate('MediaPlugin', 'Add'),
-            u'tooltip': translate('MediaPlugin', 
+            u'tooltip': translate('MediaPlugin',
                 'Add a new Media')
         }
         ## Edit Button ##
         self.textStrings[StringContent.Edit] = {
             u'title': translate('MediaPlugin', 'Edit'),
-            u'tooltip': translate('MediaPlugin', 
+            u'tooltip': translate('MediaPlugin',
                 'Edit the selected Media')
         }
         ## Delete Button ##
         self.textStrings[StringContent.Delete] = {
             u'title': translate('MediaPlugin', 'Delete'),
-            u'tooltip': translate('MediaPlugin', 
+            u'tooltip': translate('MediaPlugin',
                 'Delete the selected Media')
         }
         ## Preview ##
         self.textStrings[StringContent.Preview] = {
             u'title': translate('MediaPlugin', 'Preview'),
-            u'tooltip': translate('MediaPlugin', 
+            u'tooltip': translate('MediaPlugin',
                 'Preview the selected Media')
         }
         ## Live  Button ##
         self.textStrings[StringContent.Live] = {
             u'title': translate('MediaPlugin', 'Live'),
-            u'tooltip': translate('MediaPlugin', 
+            u'tooltip': translate('MediaPlugin',
                 'Send the selected Media live')
         }
         ## Add to service Button ##
         self.textStrings[StringContent.Service] = {
             u'title': translate('MediaPlugin', 'Service'),
-            u'tooltip': translate('MediaPlugin', 
+            u'tooltip': translate('MediaPlugin',
                 'Add the selected Media to the service')
         }
diff --git a/resources/forms/themedialog.ui b/resources/forms/themedialog.ui
index bc3fb9b2d..c29ce873d 100644
--- a/resources/forms/themedialog.ui
+++ b/resources/forms/themedialog.ui
@@ -20,7 +20,7 @@
    <enum>QWizard::ModernStyle</enum>
   </property>
   <property name="options">
-   <set>QWizard::NoBackButtonOnStartPage</set>
+   <set>QWizard::IndependentPages|QWizard::NoBackButtonOnStartPage</set>
   </property>
   <widget class="QWizardPage" name="welcomePage">
    <property name="title">