diff --git a/openlp.pyw b/openlp.pyw index f5cb93ea7..07e987842 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -131,6 +131,10 @@ class OpenLP(QtGui.QApplication): return self.exec_() def isAlreadyRunning(self): + """ + Look to see if OpenLP is already running and ask if a 2nd copy + is to be started. + """ self.sharedMemory = QtCore.QSharedMemory('OpenLP') if self.sharedMemory.attach(): status = QtGui.QMessageBox.critical(None, diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py index 9f26f4056..6aa610d09 100644 --- a/openlp/core/lib/ui.py +++ b/openlp/core/lib/ui.py @@ -57,7 +57,7 @@ class UiStrings(object): Export = translate('OpenLP.Ui', 'Export') FontSizePtUnit = translate('OpenLP.Ui', 'pt', 'Abbreviated font pointsize unit') - H = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours') + Hours = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours') Image = translate('OpenLP.Ui', 'Image') Import = translate('OpenLP.Ui', 'Import') LengthTime = unicode(translate('OpenLP.Ui', 'Length %s')) @@ -65,7 +65,7 @@ class UiStrings(object): LiveBGError = translate('OpenLP.Ui', 'Live Background Error') LivePanel = translate('OpenLP.Ui', 'Live Panel') Load = translate('OpenLP.Ui', 'Load') - M = translate('OpenLP.Ui', 'm', 'The abbreviated unit for minutes') + Minutes = translate('OpenLP.Ui', 'm', 'The abbreviated unit for minutes') Middle = translate('OpenLP.Ui', 'Middle') New = translate('OpenLP.Ui', 'New') NewService = translate('OpenLP.Ui', 'New Service') @@ -77,7 +77,7 @@ class UiStrings(object): OLPV1 = translate('OpenLP.Ui', 'openlp.org 1.x') OLPV2 = translate('OpenLP.Ui', 'OpenLP 2.0') OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. Do you ' - 'wish continue.') + 'wish to continue.') OpenService = translate('OpenLP.Ui', 'Open Service') Preview = translate('OpenLP.Ui', 'Preview') PreviewPanel = translate('OpenLP.Ui', 'Preview Panel') @@ -86,7 +86,7 @@ class UiStrings(object): ReplaceLiveBG = translate('OpenLP.Ui', 'Replace Live Background') ResetBG = translate('OpenLP.Ui', 'Reset Background') ResetLiveBG = translate('OpenLP.Ui', 'Reset Live Background') - S = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds') + Seconds = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds') SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview') Search = translate('OpenLP.Ui', 'Search') SelectDelete = translate('OpenLP.Ui', 'You must select an item to delete.') diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index ccc81e4b3..232653326 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -185,7 +185,7 @@ class SlideController(QtGui.QWidget): self.delaySpinBox.setMinimum(1) self.delaySpinBox.setMaximum(180) self.toolbar.addToolbarWidget(u'Image SpinBox', self.delaySpinBox) - self.delaySpinBox.setSuffix(UiStrings.S) + self.delaySpinBox.setSuffix(UiStrings.Seconds) self.delaySpinBox.setToolTip(translate('OpenLP.SlideController', 'Delay between slides in seconds')) else: diff --git a/openlp/core/ui/starttimedialog.py b/openlp/core/ui/starttimedialog.py index c490a8a33..76690f686 100644 --- a/openlp/core/ui/starttimedialog.py +++ b/openlp/core/ui/starttimedialog.py @@ -95,12 +95,12 @@ class Ui_StartTimeDialog(object): def retranslateUi(self, StartTimeDialog): self.setWindowTitle(translate('OpenLP.StartTimeForm', 'Item Start and Fnish Time')) - self.hourSpinBox.setSuffix(UiStrings.H) - self.minuteSpinBox.setSuffix(UiStrings.M) - self.secondSpinBox.setSuffix(UiStrings.S) - self.hourFinishSpinBox.setSuffix(UiStrings.H) - self.minuteFinishSpinBox.setSuffix(UiStrings.M) - self.secondFinishSpinBox.setSuffix(UiStrings.S) + self.hourSpinBox.setSuffix(UiStrings.Hours) + self.minuteSpinBox.setSuffix(UiStrings.Minutes) + self.secondSpinBox.setSuffix(UiStrings.Seconds) + self.hourFinishSpinBox.setSuffix(UiStrings.Hours) + self.minuteFinishSpinBox.setSuffix(UiStrings.Minutes) + self.secondFinishSpinBox.setSuffix(UiStrings.Seconds) self.hourLabel.setText(translate('OpenLP.StartTimeForm', 'Hours:')) self.minuteLabel.setText(translate('OpenLP.StartTimeForm', 'Minutes:')) self.secondLabel.setText(translate('OpenLP.StartTimeForm', 'Seconds:')) diff --git a/openlp/core/ui/starttimeform.py b/openlp/core/ui/starttimeform.py index 89ece34c6..a30dd3b8e 100644 --- a/openlp/core/ui/starttimeform.py +++ b/openlp/core/ui/starttimeform.py @@ -53,11 +53,11 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog): self.hourFinishSpinBox.setValue(hours) self.minuteFinishSpinBox.setValue(minutes) self.secondFinishSpinBox.setValue(seconds) - self.hourFinishLabel.setText(u'%s%s' % (unicode(hour), UiStrings.H)) + self.hourFinishLabel.setText(u'%s%s' % (unicode(hour), UiStrings.Hours)) self.minuteFinishLabel.setText(u'%s%s' % - (unicode(minutes), UiStrings.M)) + (unicode(minutes), UiStrings.Minutes)) self.secondFinishLabel.setText(u'%s%s' % - (unicode(seconds), UiStrings.S)) + (unicode(seconds), UiStrings.Seconds)) return QtGui.QDialog.exec_(self) def accept(self): diff --git a/openlp/plugins/alerts/lib/alertstab.py b/openlp/plugins/alerts/lib/alertstab.py index 698cbfa2a..64a9801ca 100644 --- a/openlp/plugins/alerts/lib/alertstab.py +++ b/openlp/plugins/alerts/lib/alertstab.py @@ -112,7 +112,7 @@ class AlertsTab(SettingsTab): self.FontSizeSpinBox.setSuffix(UiStrings.FontSizePtUnit) self.TimeoutLabel.setText( translate('AlertsPlugin.AlertsTab', 'Alert timeout:')) - self.TimeoutSpinBox.setSuffix(UiStrings.S) + self.TimeoutSpinBox.setSuffix(UiStrings.Seconds) self.PreviewGroupBox.setTitle(UiStrings.Preview) self.FontPreview.setText(UiStrings.OLPV2)