raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

head

Browse Source
This commit is contained in:
Andreas Preikschat 2013-08-22 20:47:08 +02:00
commit 9b0b88718d
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/ui/mainwindow.py
View File

@ -1195,6 +1195,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.live_controller.splitter.restoreState(settings.value(u'live splitter geometry')) self.live_controller.splitter.restoreState(settings.value(u'live splitter geometry'))
self.preview_controller.splitter.restoreState(settings.value(u'preview splitter geometry')) self.preview_controller.splitter.restoreState(settings.value(u'preview splitter geometry'))
self.control_splitter.restoreState(settings.value(u'main window splitter geometry')) self.control_splitter.restoreState(settings.value(u'main window splitter geometry'))
#This needs to be called after restoreState(), because saveState() also saves the "Collapsible" property
#which was True (by default) < OpenLP 2.1.
self.control_splitter.setChildrenCollapsible(False)
settings.endGroup() settings.endGroup()
def save_settings(self): def save_settings(self):

14
openlp/plugins/songs/forms/editsongform.py
View File

@ -171,13 +171,15 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
if invalid_verses: if invalid_verses:
valid = create_separated_list(verse_names) valid = create_separated_list(verse_names)
if len(invalid_verses) > 1: if len(invalid_verses) > 1:
critical_error_message_box(message=translate('SongsPlugin.EditSongForm', msg = translate('SongsPlugin.EditSongForm', 'There are no verses corresponding to "%(invalid)s".'
'The verse order is invalid. There are no verses corresponding to %s. Valid entries are %s.') % 'Valid entries are %(valid)s.\nPlease enter the verses seperated by spaces.') \
(u', '.join(invalid_verses), valid)) % {'invalid' : u', '.join(invalid_verses), 'valid' : valid}
else: else:
critical_error_message_box(message=translate('SongsPlugin.EditSongForm', msg = translate('SongsPlugin.EditSongForm', 'There is no verse corresponding to "%(invalid)s".'
'The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s.') % 'Valid entries are %(valid)s.\nPlease enter the verses seperated by spaces.') \
(invalid_verses[0], valid)) % {'invalid' : invalid_verses[0], 'valid' : valid}
critical_error_message_box(title=translate('SongsPlugin.EditSongForm', 'Invalid Verse Order'),
message=msg)
return len(invalid_verses) == 0 return len(invalid_verses) == 0
def _validate_song(self): def _validate_song(self):