From c7f32e280c63925d0b07aa43557404ff146591f1 Mon Sep 17 00:00:00 2001 From: andreas Date: Sat, 17 Jul 2010 17:10:46 +0200 Subject: [PATCH] docs --- openlp/plugins/songs/forms/songmaintenanceform.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py index 98dd42495..869130c40 100644 --- a/openlp/plugins/songs/forms/songmaintenanceform.py +++ b/openlp/plugins/songs/forms/songmaintenanceform.py @@ -359,7 +359,8 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): self.resetBooks() else: QtGui.QMessageBox.critical(self, - translate('SongsPlugin.SongMaintenanceForm', 'Error'), + translate('SongsPlugin.SongMaintenanceForm', + 'Error'), translate('SongsPlugin.SongMaintenanceForm', 'Could not save your changes.')) elif QtGui.QMessageBox.critical(self, @@ -380,6 +381,10 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): def mergeAuthors(self, existing_author): ''' + Merges two authors into one author. + + ``existing_author`` + The author which will be deleted afterwards. ''' new_author = self.songmanager.get_object_filtered(Author, and_(Author.first_name == existing_author.first_name, @@ -401,6 +406,10 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): def mergeTopics(self, existing_topic): ''' + Merges two topics into one topic. + + ``existing_topic`` + The topic which will be deleted afterwards. ''' new_topic = self.songmanager.get_object_filtered(Topic, Topic.name == existing_topic.name) @@ -420,6 +429,10 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): def mergeBooks(self, existing_book): ''' + Merges two books into one book. + + ``existing_book`` + The book which will be deleted afterwards. ''' new_book = self.songmanager.get_object_filtered(Book, and_(Book.name == existing_book.name,