From 9f28874eb5984cc7ee835d925f4334783fe53136 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 29 Dec 2012 18:13:08 +0000 Subject: [PATCH] Code fixes --- openlp/core/ui/advancedtab.py | 2 +- openlp/core/ui/firsttimeform.py | 5 ++--- openlp/core/ui/mainwindow.py | 2 +- openlp/core/ui/themeform.py | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index bdb24c04b..29efddb76 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -596,7 +596,7 @@ class AdvancedTab(SettingsTab): # Check is they want to replace existing data. answer = QtGui.QMessageBox.warning(self, translate('OpenLP.AdvancedTab', 'Overwrite Existing Data'), - translate('OpenLP.AdvancedTab', 'WARNING: \n\n The location you have selected \n\n%s\n\n' + translate('OpenLP.AdvancedTab', 'WARNING: \n\nThe location you have selected \n\n%s\n\n' 'appears to contain OpenLP data files. Do you wish to replace these files with the current data files?' ).replace('%s', os.path.abspath(data_path,)), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No), QtGui.QMessageBox.No) diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py index 04320f6c1..a8fb342e4 100644 --- a/openlp/core/ui/firsttimeform.py +++ b/openlp/core/ui/firsttimeform.py @@ -91,8 +91,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard): self.config.readfp(io.BytesIO(files)) self.updateScreenListCombo() self.downloadCancelled = False - self.downloading = translate('OpenLP.FirstTimeWizard', - 'Downloading %s...') + self.downloading = translate('OpenLP.FirstTimeWizard', 'Downloading %s...') QtCore.QObject.connect(self.cancelButton, QtCore.SIGNAL('clicked()'), self.onCancelButtonClicked) QtCore.QObject.connect(self.noInternetFinishButton, QtCore.SIGNAL('clicked()'), @@ -382,7 +381,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard): self.progressBar.setValue(self.progressBar.maximum()) if self.hasRunWizard: self.progressLabel.setText(translate('OpenLP.FirstTimeWizard', - 'Download complete. Click the finish button to return to OpenLP.')) + 'Download complete. Click the finish button to return to OpenLP.')) else: self.progressLabel.setText(translate('OpenLP.FirstTimeWizard', 'Download complete. Click the finish button to start OpenLP.')) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index dd7677ae1..1258c552f 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -848,7 +848,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): if not section in setting_sections: QtGui.QMessageBox.critical(self, translate('OpenLP.MainWindow', 'Import settings'), translate('OpenLP.MainWindow', 'The file you selected does appear to be a valid OpenLP ' - 'settings file.\n\n Section [%s] is not valid \n\n' + 'settings file.\n\nSection [%s] is not valid \n\n' 'Processing has terminated and no changed have been made.').replace('%s', section), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) return diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index 16a123dec..0ffec4877 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -90,6 +90,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard): QtCore.QObject.connect(self.mainSizeSpinBox, QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines) QtCore.QObject.connect(self.lineSpacingSpinBox, QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines) QtCore.QObject.connect(self.outlineSizeSpinBox, QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines) + QtCore.QObject.connect(self.shadowSizeSpinBox, QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines) QtCore.QObject.connect(self.mainFontComboBox, QtCore.SIGNAL(u'activated(int)'), self.calculateLines) QtCore.QObject.connect(self.footerFontComboBox, QtCore.SIGNAL(u'activated(int)'), self.updateTheme) QtCore.QObject.connect(self.footerSizeSpinBox, QtCore.SIGNAL(u'valueChanged(int)'), self.updateTheme)