From 0d959fbfb1fa14fbcbc15cf1f5c49e3b2bfdc8ca Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 30 Oct 2009 06:43:28 +0000 Subject: [PATCH 1/5] Song Edit Preview button only active from Preview, Reset Theme Editor image text Edit --- openlp/core/ui/amendthemeform.py | 4 +- openlp/core/ui/servicemanager.py | 2 + openlp/plugins/songs/forms/editsongform.py | 66 ++++++++++++---------- openlp/plugins/songs/lib/mediaitem.py | 8 ++- 4 files changed, 48 insertions(+), 32 deletions(-) diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index b95a88ca2..11daa12c7 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -408,6 +408,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.theme.background_endColor = u'#ff0000' else: self.theme.background_type = u'image' + a=c self.stateChanging(self.theme) self.previewTheme(self.theme) @@ -431,7 +432,6 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): QtGui.QColor(self.theme.background_endColor), self).name() self.Color2PushButton.setStyleSheet( u'background-color: %s' % unicode(self.theme.background_endColor)) - self.previewTheme(self.theme) # #Other Tab @@ -486,12 +486,14 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): else: self.BackgroundComboBox.setCurrentIndex(1) + self.ImageLineEdit.setText(u'') if theme.background_type == u'solid': self.BackgroundTypeComboBox.setCurrentIndex(0) elif theme.background_type == u'gradient': self.BackgroundTypeComboBox.setCurrentIndex(1) else: self.BackgroundTypeComboBox.setCurrentIndex(2) + self.ImageLineEdit.setText(self.theme.background_filename) if self.theme.background_direction == u'horizontal': self.GradientComboBox.setCurrentIndex(0) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index ebd758bbc..2d0e43c30 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -129,6 +129,8 @@ class ServiceManager(QtGui.QWidget): self.serviceItems = [] self.serviceName = u'' self.isNew = True + #Indicates if remoteTriggering is active. If it is the next addServiceItem call + #will replace the currently selected one. self.remoteEditTriggered = False self.Layout = QtGui.QVBoxLayout(self) self.Layout.setSpacing(0) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 97b9eacb3..38a2117b2 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -95,9 +95,10 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): QtCore.SIGNAL(u'lostFocus()'), self.onCommentsEditLostFocus) QtCore.QObject.connect(self.VerseOrderEdit, QtCore.SIGNAL(u'lostFocus()'), self.onVerseOrderEditLostFocus) - previewButton = QtGui.QPushButton() - previewButton.setText(self.trUtf8(u'Save && Preview')) - self.ButtonBox.addButton(previewButton, QtGui.QDialogButtonBox.ActionRole) + self.previewButton = QtGui.QPushButton() + self.previewButton.setText(self.trUtf8(u'Save && Preview')) + self.ButtonBox.addButton( + self.previewButton, QtGui.QDialogButtonBox.ActionRole) QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'clicked(QAbstractButton*)'), self.onPreview) # Create other objects and forms @@ -167,7 +168,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.loadTopics() self.loadBooks() - def loadSong(self, id): + def loadSong(self, id, preview): log.debug(u'Load Song') self.SongTabWidget.setCurrentIndex(0) self.loadAuthors() @@ -236,6 +237,10 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self._validate_song() self.title_change = False self.TitleEditItem.setFocus(QtCore.Qt.OtherFocusReason) + #if not preview hide the preview button + self.previewButton.setVisible(False) + if preview: + self.previewButton.setVisible(True) def onAuthorAddButtonClicked(self): item = int(self.AuthorsSelectionComboItem.currentIndex()) @@ -434,31 +439,34 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): def processLyrics(self): log.debug(u'processLyrics') - sxml = SongXMLBuilder() - sxml.new_document() - sxml.add_lyrics_to_song() - count = 1 - text = u' ' - verse_order = u'' - for i in range (0, self.VerseListWidget.count()): - sxml.add_verse_to_lyrics(u'Verse', unicode(count), - unicode(self.VerseListWidget.item(i).text())) - text = text + unicode(self.VerseListWidget.item(i).text()) + u' ' - verse_order = verse_order + unicode(count) + u' ' - count += 1 - if self.song.verse_order is None: - self.song.verse_order = verse_order - text = text.replace(u'\'', u'') - text = text.replace(u',', u'') - text = text.replace(u';', u'') - text = text.replace(u':', u'') - text = text.replace(u'(', u'') - text = text.replace(u')', u'') - text = text.replace(u'{', u'') - text = text.replace(u'}', u'') - text = text.replace(u'?', u'') - self.song.search_lyrics = unicode(text) - self.song.lyrics = unicode(sxml.extract_xml()) + try: + sxml = SongXMLBuilder() + sxml.new_document() + sxml.add_lyrics_to_song() + count = 1 + text = u' ' + verse_order = u'' + for i in range (0, self.VerseListWidget.count()): + sxml.add_verse_to_lyrics(u'Verse', unicode(count), + unicode(self.VerseListWidget.item(i).text())) + text = text + unicode(self.VerseListWidget.item(i).text()) + u' ' + verse_order = verse_order + unicode(count) + u' ' + count += 1 + if self.song.verse_order is None: + self.song.verse_order = verse_order + text = text.replace(u'\'', u'') + text = text.replace(u',', u'') + text = text.replace(u';', u'') + text = text.replace(u':', u'') + text = text.replace(u'(', u'') + text = text.replace(u')', u'') + text = text.replace(u'{', u'') + text = text.replace(u'}', u'') + text = text.replace(u'?', u'') + self.song.search_lyrics = unicode(text) + self.song.lyrics = unicode(sxml.extract_xml()) + except: + log.exception(u'Problem processing song Lyrics') def processTitle(self): log.debug(u'processTitle') diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 11ccb0763..0ca0756a6 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -55,7 +55,11 @@ class SongMediaItem(MediaManagerItem): self.edit_song_form = EditSongForm(self.parent.songmanager, self) self.song_maintenance_form = SongMaintenanceForm( self.parent.songmanager, self) + #fromPreview holds the id of the item if the song editor needs to trigger a preview + #without closing. It is set to -1 if this function is inactive self.fromPreview = -1 + #fromServiceManager holds the id of the item if the song editor needs to trigger posting + #to the servicemanager without closing. It is set to -1 if this function is inactive self.fromServiceManager = -1 def initPluginNameVisible(self): @@ -244,7 +248,7 @@ class SongMediaItem(MediaManagerItem): valid = self.parent.songmanager.get_song(songid) if valid is not None: self.fromServiceManager = songid - self.edit_song_form.loadSong(songid) + self.edit_song_form.loadSong(songid, False) self.edit_song_form.exec_() def onEditClick(self, preview=False): @@ -254,7 +258,7 @@ class SongMediaItem(MediaManagerItem): self.fromPreview = -1 if preview: self.fromPreview = item_id - self.edit_song_form.loadSong(item_id) + self.edit_song_form.loadSong(item_id, preview) self.edit_song_form.exec_() def onEventEditSong (self): From 48e750ded268581f64a0191fa1b926a2e5c07369 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 30 Oct 2009 20:14:55 +0000 Subject: [PATCH 2/5] Add Save service on New code, and configuration to turn it off. --- openlp/core/ui/amendthemeform.py | 1 - openlp/core/ui/generaltab.py | 22 ++++++++++++++++++++++ openlp/core/ui/servicemanager.py | 17 ++++++++++++++++- openlp/plugins/songs/forms/editsongform.py | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index 11daa12c7..c3ec9bb36 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -408,7 +408,6 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.theme.background_endColor = u'#ff0000' else: self.theme.background_type = u'image' - a=c self.stateChanging(self.theme) self.previewTheme(self.theme) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 54031ec1a..5a69e372d 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -76,6 +76,18 @@ class GeneralTab(SettingsTab): self.ShowSplashCheckBox.setObjectName(u'ShowSplashCheckBox') self.StartupLayout.addWidget(self.ShowSplashCheckBox) self.GeneralLeftLayout.addWidget(self.StartupGroupBox) + + self.SettingsGroupBox = QtGui.QGroupBox(self.GeneralLeftWidget) + self.SettingsGroupBox.setObjectName(u'SettingsGroupBox') + self.SettingsLayout = QtGui.QVBoxLayout(self.SettingsGroupBox) + self.SettingsLayout.setSpacing(8) + self.SettingsLayout.setMargin(8) + self.SettingsLayout.setObjectName(u'SettingsLayout') + self.SaveCheckOOSCheckBox = QtGui.QCheckBox(self.SettingsGroupBox) + self.SaveCheckOOSCheckBox.setObjectName(u'SaveCheckOOSCheckBox') + self.SettingsLayout.addWidget(self.SaveCheckOOSCheckBox) + self.GeneralLeftLayout.addWidget(self.SettingsGroupBox) + self.GeneralLeftSpacer = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.GeneralLeftLayout.addItem(self.GeneralLeftSpacer) @@ -124,6 +136,8 @@ class GeneralTab(SettingsTab): QtCore.SIGNAL(u'stateChanged(int)'), self.onAutoOpenCheckBoxChanged) QtCore.QObject.connect(self.ShowSplashCheckBox, QtCore.SIGNAL(u'stateChanged(int)'), self.onShowSplashCheckBoxChanged) + QtCore.QObject.connect(self.SaveCheckOOSCheckBox, + QtCore.SIGNAL(u'stateChanged(int)'), self.onSaveCheckOOSCheckBox) QtCore.QObject.connect(self.NumberEdit, QtCore.SIGNAL(u'editingFinished()'), self.onNumberEditLostFocus) QtCore.QObject.connect(self.UsernameEdit, @@ -138,6 +152,8 @@ class GeneralTab(SettingsTab): self.WarningCheckBox.setText(self.trUtf8(u'Show blank screen warning')) self.AutoOpenCheckBox.setText(self.trUtf8(u'Automatically open the last service')) self.ShowSplashCheckBox.setText(self.trUtf8(u'Show the splash screen')) + self.SettingsGroupBox.setTitle(self.trUtf8(u'Application Settings')) + self.SaveCheckOOSCheckBox.setText(self.trUtf8(u'Prompt to save Sevice before starting New')) self.CCLIGroupBox.setTitle(self.trUtf8(u'CCLI Details')) self.NumberLabel.setText(self.trUtf8(u'CCLI Number:')) self.UsernameLabel.setText(self.trUtf8(u'SongSelect Username:')) @@ -155,6 +171,9 @@ class GeneralTab(SettingsTab): def onWarningCheckBoxChanged(self, value): self.Warning = (value == QtCore.Qt.Checked) + def onSaveCheckOOSCheckBox(self, value): + self.PromptSaveOOS = (value == QtCore.Qt.Checked) + def onNumberEditLostFocus(self): self.CCLNumber = self.NumberEdit.displayText() @@ -175,9 +194,11 @@ class GeneralTab(SettingsTab): self.Warning = str_to_bool(self.config.get_config(u'Blank Warning', u'False')) self.AutoOpen = str_to_bool(self.config.get_config(u'Auto Open', u'False')) self.ShowSplash = str_to_bool(self.config.get_config(u'show splash', u'True')) + self.PromptSaveOOS = str_to_bool(self.config.get_config(u'prompt save oos', u'False')) self.CCLNumber = unicode(self.config.get_config(u'CCL Number', u'XXX')) self.Username = unicode(self.config.get_config(u'User Name', u'')) self.Password = unicode(self.config.get_config(u'Password', u'')) + self.SaveCheckOOSCheckBox.setChecked(self.PromptSaveOOS) # Set a few things up self.MonitorComboBox.setCurrentIndex(self.MonitorNumber) self.WarningCheckBox.setChecked(self.Warning) @@ -192,6 +213,7 @@ class GeneralTab(SettingsTab): self.config.set_config(u'Blank Warning', self.Warning) self.config.set_config(u'Auto Open', self.AutoOpen) self.config.set_config(u'show splash', self.ShowSplash) + self.config.set_config(u'prompt save oos', self.PromptSaveOOS) self.config.set_config(u'CCL Number', self.CCLNumber) self.config.set_config(u'User Name', self.Username) self.config.set_config(u'Password', self.Password) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 2d0e43c30..ba0f2cd8d 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -30,7 +30,8 @@ import zipfile from PyQt4 import QtCore, QtGui from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \ - ServiceType, contextMenuAction, contextMenuSeparator, Receiver, contextMenu + ServiceType, contextMenuAction, contextMenuSeparator, Receiver, \ + contextMenu, str_to_bool class ServiceManagerList(QtGui.QTreeWidget): @@ -128,10 +129,12 @@ class ServiceManager(QtGui.QWidget): self.parent = parent self.serviceItems = [] self.serviceName = u'' + #is a new service and has not been saved self.isNew = True #Indicates if remoteTriggering is active. If it is the next addServiceItem call #will replace the currently selected one. self.remoteEditTriggered = False + #start with the layout self.Layout = QtGui.QVBoxLayout(self) self.Layout.setSpacing(0) self.Layout.setMargin(0) @@ -356,6 +359,18 @@ class ServiceManager(QtGui.QWidget): """ Clear the list to create a new service """ + if self.parent.serviceNotSaved and \ + str_to_bool(PluginConfig(u'General').get_config(u'prompt save oos', u'False')): + ret = QtGui.QMessageBox.question(None, + self.trUtf8(u'Save Changes to Service?'), + self.trUtf8(u'Your service is unsaved, do you want to save those ' + u'changes before creating a new one ?'), + QtGui.QMessageBox.StandardButtons( + QtGui.QMessageBox.Cancel | + QtGui.QMessageBox.Save), + QtGui.QMessageBox.Save) + if ret == QtGui.QMessageBox.Save: + self.onSaveService() self.ServiceManagerList.clear() self.serviceItems = [] self.serviceName = u'' diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 38a2117b2..7fa0f9a52 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -466,7 +466,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.song.search_lyrics = unicode(text) self.song.lyrics = unicode(sxml.extract_xml()) except: - log.exception(u'Problem processing song Lyrics') + log.exception(u'Problem processing song Lyrics \n%s', sxml.dump_xml()) def processTitle(self): log.debug(u'processTitle') From 2f12c075c2b682653a304333d59ba5711ced6c9a Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 30 Oct 2009 20:21:36 +0000 Subject: [PATCH 3/5] Fix theme editing where previous image is cached on change of image --- openlp/core/lib/renderer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 79c58f6af..dc4a3c44b 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -72,9 +72,11 @@ class Renderer(object): self._theme = theme self.bg_frame = None self.bg_image = None + self._bg_image_filename = None self.theme_name = theme.theme_name self._set_theme_font() if theme.background_type == u'image': + print theme.background_filename if theme.background_filename is not None: self.set_bg_image(theme.background_filename) @@ -110,8 +112,8 @@ class Renderer(object): painter.begin(self.bg_image) self.background_offsetx = (width - realwidth) / 2 self.background_offsety = (height - realheight) / 2 - painter.drawImage(self.background_offsetx, self.background_offsety, - preview) + painter.drawImage(self.background_offsetx, + self.background_offsety, preview) painter.end() def set_frame_dest(self, frame_width, frame_height, preview=False): From 7b1de0f995dac241d551a09de4a939e9617eb54b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 30 Oct 2009 21:45:38 +0000 Subject: [PATCH 4/5] Move version check --- openlp.pyw | 1 + openlp/core/ui/mainwindow.py | 1 - openlp/plugins/songs/lib/mediaitem.py | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp.pyw b/openlp.pyw index ebd449bf8..4c0eb9b14 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -105,6 +105,7 @@ class OpenLP(QtGui.QApplication): if show_splash: # now kill the splashscreen self.splash.finish(self.mainWindow) + self.mainWindow.versionCheck() return self.exec_() def main(): diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 4a79f6cae..d98a94d09 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -562,7 +562,6 @@ 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) if str_to_bool(self.generalConfig.get_config(u'Screen Blank', False)) \ diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 0ca0756a6..fa236f96f 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -292,6 +292,7 @@ class SongMediaItem(MediaManagerItem): service_item.theme = song.theme_name service_item.editEnabled = True service_item.editId = item_id + service_item.verse_order = song.verse_order if song.lyrics.startswith(u' Date: Fri, 30 Oct 2009 22:03:09 +0000 Subject: [PATCH 5/5] Fix names before Raoul sees them --- openlp/core/ui/generaltab.py | 24 +++++++++++------------- openlp/core/ui/servicemanager.py | 3 ++- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index be8f0bee3..4af3faeb7 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -76,18 +76,16 @@ class GeneralTab(SettingsTab): self.ShowSplashCheckBox.setObjectName(u'ShowSplashCheckBox') self.StartupLayout.addWidget(self.ShowSplashCheckBox) self.GeneralLeftLayout.addWidget(self.StartupGroupBox) - self.SettingsGroupBox = QtGui.QGroupBox(self.GeneralLeftWidget) self.SettingsGroupBox.setObjectName(u'SettingsGroupBox') self.SettingsLayout = QtGui.QVBoxLayout(self.SettingsGroupBox) self.SettingsLayout.setSpacing(8) self.SettingsLayout.setMargin(8) self.SettingsLayout.setObjectName(u'SettingsLayout') - self.SaveCheckOOSCheckBox = QtGui.QCheckBox(self.SettingsGroupBox) - self.SaveCheckOOSCheckBox.setObjectName(u'SaveCheckOOSCheckBox') - self.SettingsLayout.addWidget(self.SaveCheckOOSCheckBox) + self.SaveCheckServiceCheckBox = QtGui.QCheckBox(self.SettingsGroupBox) + self.SaveCheckServiceCheckBox.setObjectName(u'SaveCheckServiceCheckBox') + self.SettingsLayout.addWidget(self.SaveCheckServiceCheckBox) self.GeneralLeftLayout.addWidget(self.SettingsGroupBox) - self.GeneralLeftSpacer = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.GeneralLeftLayout.addItem(self.GeneralLeftSpacer) @@ -136,8 +134,8 @@ class GeneralTab(SettingsTab): QtCore.SIGNAL(u'stateChanged(int)'), self.onAutoOpenCheckBoxChanged) QtCore.QObject.connect(self.ShowSplashCheckBox, QtCore.SIGNAL(u'stateChanged(int)'), self.onShowSplashCheckBoxChanged) - QtCore.QObject.connect(self.SaveCheckOOSCheckBox, - QtCore.SIGNAL(u'stateChanged(int)'), self.onSaveCheckOOSCheckBox) + QtCore.QObject.connect(self.SaveCheckServiceCheckBox, + QtCore.SIGNAL(u'stateChanged(int)'), self.onSaveCheckServiceCheckBox) QtCore.QObject.connect(self.NumberEdit, QtCore.SIGNAL(u'editingFinished()'), self.onNumberEditLostFocus) QtCore.QObject.connect(self.UsernameEdit, @@ -153,7 +151,7 @@ class GeneralTab(SettingsTab): self.AutoOpenCheckBox.setText(self.trUtf8(u'Automatically open the last service')) self.ShowSplashCheckBox.setText(self.trUtf8(u'Show the splash screen')) self.SettingsGroupBox.setTitle(self.trUtf8(u'Application Settings')) - self.SaveCheckOOSCheckBox.setText(self.trUtf8(u'Prompt to save Sevice before starting New')) + self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Sevice before starting New')) self.CCLIGroupBox.setTitle(self.trUtf8(u'CCLI Details')) self.NumberLabel.setText(self.trUtf8(u'CCLI Number:')) self.UsernameLabel.setText(self.trUtf8(u'SongSelect Username:')) @@ -171,8 +169,8 @@ class GeneralTab(SettingsTab): def onWarningCheckBoxChanged(self, value): self.Warning = (value == QtCore.Qt.Checked) - def onSaveCheckOOSCheckBox(self, value): - self.PromptSaveOOS = (value == QtCore.Qt.Checked) + def onSaveCheckServiceCheckBox(self, value): + self.PromptSaveService = (value == QtCore.Qt.Checked) def onNumberEditLostFocus(self): self.CCLNumber = self.NumberEdit.displayText() @@ -194,11 +192,11 @@ class GeneralTab(SettingsTab): self.Warning = str_to_bool(self.config.get_config(u'Blank Warning', u'False')) self.AutoOpen = str_to_bool(self.config.get_config(u'Auto Open', u'False')) self.ShowSplash = str_to_bool(self.config.get_config(u'show splash', u'True')) - self.PromptSaveOOS = str_to_bool(self.config.get_config(u'prompt save oos', u'False')) + self.PromptSaveService = str_to_bool(self.config.get_config(u'prompt save service', u'False')) self.CCLNumber = unicode(self.config.get_config(u'CCL Number', u'XXX')) self.Username = unicode(self.config.get_config(u'User Name', u'')) self.Password = unicode(self.config.get_config(u'Password', u'')) - self.SaveCheckOOSCheckBox.setChecked(self.PromptSaveOOS) + self.SaveCheckServiceCheckBox.setChecked(self.PromptSaveService) # Set a few things up self.MonitorComboBox.setCurrentIndex(self.MonitorNumber) self.WarningCheckBox.setChecked(self.Warning) @@ -213,7 +211,7 @@ class GeneralTab(SettingsTab): self.config.set_config(u'Blank Warning', self.Warning) self.config.set_config(u'Auto Open', self.AutoOpen) self.config.set_config(u'show splash', self.ShowSplash) - self.config.set_config(u'prompt save oos', self.PromptSaveOOS) + self.config.set_config(u'prompt save service', self.PromptSaveService) self.config.set_config(u'CCL Number', self.CCLNumber) self.config.set_config(u'User Name', self.Username) self.config.set_config(u'Password', self.Password) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index ba0f2cd8d..9a331fccb 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -360,7 +360,8 @@ class ServiceManager(QtGui.QWidget): Clear the list to create a new service """ if self.parent.serviceNotSaved and \ - str_to_bool(PluginConfig(u'General').get_config(u'prompt save oos', u'False')): + str_to_bool(PluginConfig(u'General'). + get_config(u'prompt save service', u'False')): ret = QtGui.QMessageBox.question(None, self.trUtf8(u'Save Changes to Service?'), self.trUtf8(u'Your service is unsaved, do you want to save those '