From 2f618d8504bf85aef3be9f8b13619f069a2a8585 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 18 Oct 2009 15:53:04 +0100
Subject: [PATCH] Fix Message popup on windows , load last service

---
 openlp/core/ui/mainwindow.py       |  7 ++++---
 openlp/core/ui/mediadockmanager.py |  2 +-
 openlp/core/ui/servicemanager.py   | 13 ++++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index cac0b8e0a..78d673db0 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -32,7 +32,7 @@ from openlp.core.ui import AboutForm, SettingsForm, AlertForm, \
     PluginForm, MediaDockManager
 from openlp.core.lib import translate, RenderManager, PluginConfig, \
     OpenLPDockWidget, SettingsManager, PluginManager, Receiver, \
-    buildIcon
+    buildIcon, str_to_bool
 from openlp.core.utils import check_latest_version
 
 media_manager_style = """
@@ -540,7 +540,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.ThemeManagerContents.loadThemes()
         log.info(u'Load data from Settings')
         self.settingsForm.postSetUp()
-        self.versionCheck()
 
     def versionCheck(self):
         applicationVersion = self.generalConfig.get_config(u'Application version', u'1.9.0-595')
@@ -569,7 +568,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
                 monitor_exists = True
         if not monitor_exists:
             screen_number = 0
-
         return screen_number
 
     def show(self):
@@ -580,6 +578,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         screen_number = self.getMonitorNumber()
         self.mainDisplay.setup(screen_number)
         self.setFocus()
+        self.versionCheck()
+        if str_to_bool(self.generalConfig.get_config(u'Auto Open', False)):
+            self.ServiceManagerContents.onLoadService(True)
 
     def onHelpAboutItemClicked(self):
         """
diff --git a/openlp/core/ui/mediadockmanager.py b/openlp/core/ui/mediadockmanager.py
index e7e7d53a1..4b1d64178 100644
--- a/openlp/core/ui/mediadockmanager.py
+++ b/openlp/core/ui/mediadockmanager.py
@@ -24,7 +24,7 @@
 
 import logging
 
-log = logging.getLogger(u'media_dockManager')
+log = logging.getLogger(u'MediaDockManager')
 
 class MediaDockManager(object):
 
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 29a0acf06..2b5838b3f 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -420,16 +420,19 @@ class ServiceManager(QtGui.QWidget):
     def onQuickSaveService(self):
         self.onSaveService(True)
 
-    def onLoadService(self):
+    def onLoadService(self, lastService = False):
         """
         Load an existing service from disk and rebuild the serviceitems.  All
         files retrieved from the zip file are placed in a temporary directory
         and will only be used for this service.
         """
-        filename = QtGui.QFileDialog.getOpenFileName(self,
-            translate(u'ThemeManager', u'Open Service'),
-            self.config.get_last_dir(),
-            u'Services (*.osz)')
+        if lastService:
+            filename = self.config.get_last_dir()
+        else:
+            filename = QtGui.QFileDialog.getOpenFileName(self,
+                translate(u'ThemeManager', u'Open Service'),
+                self.config.get_last_dir(),
+                u'Services (*.osz)')
         filename = unicode(filename)
         name = filename.split(os.path.sep)
         if filename != u'':