forked from openlp/openlp
Add Song Book Handling
This commit is contained in:
parent
6640d79eb8
commit
fbc16a0270
@ -56,8 +56,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
QtCore.SIGNAL(u'clicked()'), self.onTopicRemovefromSongItemClicked)
|
QtCore.SIGNAL(u'clicked()'), self.onTopicRemovefromSongItemClicked)
|
||||||
QtCore.QObject.connect(self.TopicsListView,
|
QtCore.QObject.connect(self.TopicsListView,
|
||||||
QtCore.SIGNAL("itemClicked(QListWidgetItem*)"), self.onTopicListViewPressed)
|
QtCore.SIGNAL("itemClicked(QListWidgetItem*)"), self.onTopicListViewPressed)
|
||||||
|
|
||||||
|
|
||||||
QtCore.QObject.connect(self.AddSongBookButton,
|
QtCore.QObject.connect(self.AddSongBookButton,
|
||||||
QtCore.SIGNAL(u'clicked()'), self.onAddSongBookButtonClicked)
|
QtCore.SIGNAL(u'clicked()'), self.onAddSongBookButtonClicked)
|
||||||
QtCore.QObject.connect(self.CopyrightInsertItem,
|
QtCore.QObject.connect(self.CopyrightInsertItem,
|
||||||
@ -70,6 +68,8 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
QtCore.SIGNAL(u'clicked()'), self.onDeleteVerseButtonClicked)
|
QtCore.SIGNAL(u'clicked()'), self.onDeleteVerseButtonClicked)
|
||||||
QtCore.QObject.connect(self.VerseListWidget,
|
QtCore.QObject.connect(self.VerseListWidget,
|
||||||
QtCore.SIGNAL("itemClicked(QListWidgetItem*)"), self.onVerseListViewPressed)
|
QtCore.SIGNAL("itemClicked(QListWidgetItem*)"), self.onVerseListViewPressed)
|
||||||
|
QtCore.QObject.connect(self.SongbookCombo,
|
||||||
|
QtCore.SIGNAL(u'activated(int)'), self.onSongBookComboChanged)
|
||||||
# Create other objects and forms
|
# Create other objects and forms
|
||||||
self.songmanager = songmanager
|
self.songmanager = songmanager
|
||||||
self.authors_form = AuthorsForm(self.songmanager)
|
self.authors_form = AuthorsForm(self.songmanager)
|
||||||
@ -127,7 +127,11 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
title = self.song.search_title.split(u'@')
|
title = self.song.search_title.split(u'@')
|
||||||
if self.song.song_book_id != 0:
|
if self.song.song_book_id != 0:
|
||||||
book_name = self.songmanager.get_book(self.song.song_book_id)
|
book_name = self.songmanager.get_book(self.song.song_book_id)
|
||||||
|
id = self.SongbookCombo.findText(unicode(book_name), QtCore.Qt.MatchExactly)
|
||||||
|
if id == -1:
|
||||||
|
# Not Found
|
||||||
|
id = 0
|
||||||
|
book_name.setCurrentIndex(id)
|
||||||
if len(title) > 1:
|
if len(title) > 1:
|
||||||
self.AlternativeEdit.setText(title[1])
|
self.AlternativeEdit.setText(title[1])
|
||||||
self.CopyrightEditItem.setText(self.song.copyright)
|
self.CopyrightEditItem.setText(self.song.copyright)
|
||||||
@ -221,6 +225,14 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
self.song_book_form.exec_()
|
self.song_book_form.exec_()
|
||||||
self.loadBooks()
|
self.loadBooks()
|
||||||
|
|
||||||
|
def onSongBookComboChanged(self, item):
|
||||||
|
if item == 0:
|
||||||
|
self.song.song_book_id = 0
|
||||||
|
else:
|
||||||
|
book_name = unicode(self.SongbookCombo.itemText(item))
|
||||||
|
book = self.songmanager.get_book_by_name(book_name)
|
||||||
|
self.song.song_book_id = book.id
|
||||||
|
|
||||||
def onVerseListViewPressed(self):
|
def onVerseListViewPressed(self):
|
||||||
self.EditButton.setEnabled(True)
|
self.EditButton.setEnabled(True)
|
||||||
self.DeleteButton.setEnabled(True)
|
self.DeleteButton.setEnabled(True)
|
||||||
|
@ -217,6 +217,12 @@ class SongManager():
|
|||||||
"""
|
"""
|
||||||
return self.session.query(Book).get(id)
|
return self.session.query(Book).get(id)
|
||||||
|
|
||||||
|
def get_book_by_name(self, name):
|
||||||
|
"""
|
||||||
|
Details of the Books
|
||||||
|
"""
|
||||||
|
return self.session.query(Book).filter_by(name = name).first()
|
||||||
|
|
||||||
def save_book(self, book):
|
def save_book(self, book):
|
||||||
"""
|
"""
|
||||||
Save the Book
|
Save the Book
|
||||||
|
Loading…
Reference in New Issue
Block a user