forked from openlp/openlp
continued working on 'merging' song books, topics, authors (NOT finished yet)
This commit is contained in:
parent
b844687abd
commit
94660ee798
@ -141,12 +141,9 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
|||||||
True.
|
True.
|
||||||
"""
|
"""
|
||||||
authors = self.songmanager.get_all_objects_filtered(Author,
|
authors = self.songmanager.get_all_objects_filtered(Author,
|
||||||
and_(
|
and_(Author.first_name == new_author.first_name,
|
||||||
Author.first_name == new_author.first_name,
|
|
||||||
Author.last_name == new_author.last_name,
|
Author.last_name == new_author.last_name,
|
||||||
Author.display_name == new_author.display_name
|
Author.display_name == new_author.display_name))
|
||||||
)
|
|
||||||
)
|
|
||||||
if len(authors) > 0:
|
if len(authors) > 0:
|
||||||
# If we edit an existing Author, we need to make sure that we do
|
# If we edit an existing Author, we need to make sure that we do
|
||||||
# not return False when nothing has changed (because this would
|
# not return False when nothing has changed (because this would
|
||||||
@ -242,8 +239,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
|||||||
|
|
||||||
def onBookAddButtonClick(self):
|
def onBookAddButtonClick(self):
|
||||||
if self.bookform.exec_():
|
if self.bookform.exec_():
|
||||||
book = Book.populate(
|
book = Book.populate(name=unicode(self.bookform.NameEdit.text()),
|
||||||
name=unicode(self.bookform.NameEdit.text()),
|
|
||||||
publisher=unicode(self.bookform.PublisherEdit.text()))
|
publisher=unicode(self.bookform.PublisherEdit.text()))
|
||||||
if self.checkBook(book):
|
if self.checkBook(book):
|
||||||
if self.songmanager.save_object(book):
|
if self.songmanager.save_object(book):
|
||||||
@ -286,6 +282,16 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
|||||||
translate('SongsPlugin.SongMaintenanceForm', 'Error'),
|
translate('SongsPlugin.SongMaintenanceForm', 'Error'),
|
||||||
translate('SongsPlugin.SongMaintenanceForm',
|
translate('SongsPlugin.SongMaintenanceForm',
|
||||||
'Could not save your changes.'))
|
'Could not save your changes.'))
|
||||||
|
elif QtGui.QMessageBox.critical(self,
|
||||||
|
translate('SongsPlugin.SongMaintenanceForm', 'Error'),
|
||||||
|
translate('SongsPlugin.SongMaintenanceForm', 'The author %s'
|
||||||
|
' already exists. Would you like to make songs with author '
|
||||||
|
'%s use the existing author %s?' % (author.display_name,
|
||||||
|
temp_display_name, author.display_name)),
|
||||||
|
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | \
|
||||||
|
QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.Yes:
|
||||||
|
self.mergeAuthors(authors)
|
||||||
|
self.resetAuthors()
|
||||||
else:
|
else:
|
||||||
# We restore the author's old first and last name as well as
|
# We restore the author's old first and last name as well as
|
||||||
# his display name.
|
# his display name.
|
||||||
@ -318,13 +324,14 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
|||||||
elif QtGui.QMessageBox.critical(self,
|
elif QtGui.QMessageBox.critical(self,
|
||||||
translate('SongsPlugin.SongMaintenanceForm', 'Error'),
|
translate('SongsPlugin.SongMaintenanceForm', 'Error'),
|
||||||
translate('SongsPlugin.SongMaintenanceForm', 'The topic %s '
|
translate('SongsPlugin.SongMaintenanceForm', 'The topic %s '
|
||||||
'already exists. Would you like to make songs with topic %s '
|
'already exists. Would you like to make songs with topic %s'
|
||||||
'use the existing topic %s?' % (topic.name, temp_name,
|
' use the existing topic %s?' % (topic.name, temp_name,
|
||||||
topic.name)),
|
topic.name)),
|
||||||
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | \
|
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | \
|
||||||
QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.Yes:
|
QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.Yes:
|
||||||
self.mergeTopics(topic)
|
self.mergeTopics(topic)
|
||||||
self.resetTopics()
|
self.resetTopics()
|
||||||
|
else:
|
||||||
# We restore the topics's old name.
|
# We restore the topics's old name.
|
||||||
topic.name = temp_name
|
topic.name = temp_name
|
||||||
QtGui.QMessageBox.critical(self,
|
QtGui.QMessageBox.critical(self,
|
||||||
@ -370,7 +377,19 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
|||||||
book.name = temp_name
|
book.name = temp_name
|
||||||
book.publisher = temp_publisher
|
book.publisher = temp_publisher
|
||||||
|
|
||||||
#def mergeAuthors(selfs, existing_author):
|
# def mergeAuthors(self, existing_author):
|
||||||
|
# '''
|
||||||
|
# '''
|
||||||
|
# new_author = self.songmanager.get_object_filtered(Author,
|
||||||
|
# and_(Author.first_name == existing_author.first_name,
|
||||||
|
# Author.last_name == existing_author.last_name,
|
||||||
|
# Author.display_name == existing_author.display_name))
|
||||||
|
# songs = self.songmanager.get_all_objects_filtered(......,
|
||||||
|
# Song.song_book_id == existing_book.id)
|
||||||
|
# for song in songs:
|
||||||
|
# #
|
||||||
|
# self.songmanager.save_object(song)
|
||||||
|
# self.songmanager.delete_object(Author, existing_author.id)
|
||||||
|
|
||||||
# def mergeTopics(self, existing_topic):
|
# def mergeTopics(self, existing_topic):
|
||||||
# '''
|
# '''
|
||||||
@ -380,7 +399,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
|||||||
# songs = self.songmanager.get_all_objects_filtered(.....,
|
# songs = self.songmanager.get_all_objects_filtered(.....,
|
||||||
# songs_topics.topic_id == existing_topic.id)
|
# songs_topics.topic_id == existing_topic.id)
|
||||||
# for song in songs:
|
# for song in songs:
|
||||||
# song.songs_topic.id = new_topic.id
|
# #
|
||||||
# self.songmanager.save_object(song)
|
# self.songmanager.save_object(song)
|
||||||
# self.songmanager.delete_object(Book, existing_topic.id)
|
# self.songmanager.delete_object(Book, existing_topic.id)
|
||||||
|
|
||||||
@ -388,11 +407,8 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
|||||||
'''
|
'''
|
||||||
'''
|
'''
|
||||||
new_book = self.songmanager.get_object_filtered(Book,
|
new_book = self.songmanager.get_object_filtered(Book,
|
||||||
and_(
|
and_(Book.name == existing_book.name,
|
||||||
Book.name == existing_book.name,
|
Book.publisher == existing_book.publisher))
|
||||||
Book.publisher == existing_book.publisher
|
|
||||||
)
|
|
||||||
)
|
|
||||||
songs = self.songmanager.get_all_objects_filtered(Song,
|
songs = self.songmanager.get_all_objects_filtered(Song,
|
||||||
Song.song_book_id == existing_book.id)
|
Song.song_book_id == existing_book.id)
|
||||||
for song in songs:
|
for song in songs:
|
||||||
@ -402,7 +418,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
|||||||
|
|
||||||
def onAuthorDeleteButtonClick(self):
|
def onAuthorDeleteButtonClick(self):
|
||||||
"""
|
"""
|
||||||
Delete the author if the author is not attached to any songs
|
Delete the author if the author is not attached to any songs.
|
||||||
"""
|
"""
|
||||||
self._deleteItem(Author, self.AuthorsListWidget, self.resetAuthors,
|
self._deleteItem(Author, self.AuthorsListWidget, self.resetAuthors,
|
||||||
translate('SongsPlugin.SongMaintenanceForm', 'Delete Author'),
|
translate('SongsPlugin.SongMaintenanceForm', 'Delete Author'),
|
||||||
@ -415,7 +431,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
|||||||
|
|
||||||
def onTopicDeleteButtonClick(self):
|
def onTopicDeleteButtonClick(self):
|
||||||
"""
|
"""
|
||||||
Delete the Book is the Book is not attached to any songs
|
Delete the Book is the Book is not attached to any songs.
|
||||||
"""
|
"""
|
||||||
self._deleteItem(Topic, self.TopicsListWidget, self.resetTopics,
|
self._deleteItem(Topic, self.TopicsListWidget, self.resetTopics,
|
||||||
translate('SongsPlugin.SongMaintenanceForm', 'Delete Topic'),
|
translate('SongsPlugin.SongMaintenanceForm', 'Delete Topic'),
|
||||||
@ -428,7 +444,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
|||||||
|
|
||||||
def onBookDeleteButtonClick(self):
|
def onBookDeleteButtonClick(self):
|
||||||
"""
|
"""
|
||||||
Delete the Book is the Book is not attached to any songs
|
Delete the Book is the Book is not attached to any songs.
|
||||||
"""
|
"""
|
||||||
self._deleteItem(Book, self.BooksListWidget, self.resetBooks,
|
self._deleteItem(Book, self.BooksListWidget, self.resetBooks,
|
||||||
translate('SongsPlugin.SongMaintenanceForm', 'Delete Book'),
|
translate('SongsPlugin.SongMaintenanceForm', 'Delete Book'),
|
||||||
|
Loading…
Reference in New Issue
Block a user