From c11454b02dfc80e32768438f8e7132de4aa89540 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Mon, 3 Jan 2011 08:56:17 +0000
Subject: [PATCH] Fix review comments

---
 openlp/core/ui/advancedtab.py | 8 ++++----
 openlp/core/ui/maindisplay.py | 3 +--
 openlp/core/ui/mainwindow.py  | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py
index e2cfa72bf..dd196d68d 100644
--- a/openlp/core/ui/advancedtab.py
+++ b/openlp/core/ui/advancedtab.py
@@ -155,7 +155,7 @@ class AdvancedTab(SettingsTab):
         self.expandServiceItemCheckBox.setText(translate('OpenLP.AdvancedTab',
             'Expand new service items on creation'))
         self.enableAutoCloseCheckBox.setText(translate('OpenLP.AdvancedTab',
-            'Enable confirm on closure'))
+            'Enable application exit confirmation'))
 #        self.sharedDirGroupBox.setTitle(
 #            translate('AdvancedTab', 'Central Data Store'))
 #        self.sharedCheckBox.setText(
@@ -187,7 +187,7 @@ class AdvancedTab(SettingsTab):
             settings.value(u'expand service item',
             QtCore.QVariant(False)).toBool())
         self.enableAutoCloseCheckBox.setChecked(
-            settings.value(u'enable auto close',
+            settings.value(u'enable exit confirmation',
             QtCore.QVariant(True)).toBool())
         settings.endGroup()
 
@@ -205,7 +205,7 @@ class AdvancedTab(SettingsTab):
             QtCore.QVariant(self.doubleClickLiveCheckBox.isChecked()))
         settings.setValue(u'expand service item',
             QtCore.QVariant(self.expandServiceItemCheckBox.isChecked()))
-        settings.setValue(u'enable auto close',
+        settings.setValue(u'enable exit confirmation',
             QtCore.QVariant(self.enableAutoCloseCheckBox.isChecked()))
         settings.endGroup()
 
@@ -215,4 +215,4 @@ class AdvancedTab(SettingsTab):
 #        """
 #        self.sharedLabel.setEnabled(checked)
 #        self.sharedTextEdit.setEnabled(checked)
-#        self.sharedPushButton.setEnabled(checked)
+#        self.sharedPushButton.setEnabled(checked)
\ No newline at end of file
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index dd24f172d..d243733dc 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -94,7 +94,6 @@ class MainDisplay(DisplayWidget):
     """
     This is the display screen.
     """
-
     def __init__(self, parent, screens, live):
         DisplayWidget.__init__(self, live, parent=None)
         self.parent = parent
@@ -116,7 +115,7 @@ class MainDisplay(DisplayWidget):
         """
         Set up and build the output screen
         """
-        log.debug(u'Setup live = %s for %s ' % (self.isLive,
+        log.debug(u'Setup live = %s for monitor %s ' % (self.isLive,
             self.screens.monitor_number))
         self.usePhonon = QtCore.QSettings().value(
             u'media/use phonon', QtCore.QVariant(True)).toBool()
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 5c30fdc71..867fb3c51 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -853,7 +853,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             else:
                 event.ignore()
         else:
-            if QtCore.QSettings().value(u'advanced/enable auto close',
+            if QtCore.QSettings().value(u'advanced/enable exit confirmation',
                 QtCore.QVariant(True)).toBool():
                 ret = QtGui.QMessageBox.question(self,
                     translate('OpenLP.MainWindow', 'Close OpenLP'),
@@ -1059,4 +1059,4 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             self.recentFiles.insert(0, QtCore.QString(filename))
             while self.recentFiles.count() > maxRecentFiles:
                 # Don't care what API says takeLast works, removeLast doesn't!
-                self.recentFiles.takeLast()
+                self.recentFiles.takeLast()
\ No newline at end of file