Add alternate_title field

This commit is contained in:
Jon Tibble 2010-07-17 18:36:03 +01:00
parent e83cb035ac
commit f964c5d1ce
2 changed files with 3 additions and 3 deletions

View File

@ -180,7 +180,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.loadBooks()
self.song = self.songmanager.get_object(Song, id)
self.TitleEditItem.setText(self.song.title)
title = self.song.search_title.split(u'@')
self.AlternativeEdit.setText(self.song.alternate_title)
if self.song.song_book_id != 0:
book_name = self.songmanager.get_object(Book,
self.song.song_book_id)
@ -198,8 +198,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
id = 0
self.song.theme_name = None
self.ThemeSelectionComboItem.setCurrentIndex(id)
if len(title) > 1:
self.AlternativeEdit.setText(title[1])
if self.song.copyright:
self.CopyrightEditItem.setText(self.song.copyright)
else:
@ -622,6 +620,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
def saveSong(self):
self.song.title = unicode(self.TitleEditItem.text())
self.song.alternate_title = unicode(self.AlternativeEdit.text())
self.song.copyright = unicode(self.CopyrightEditItem.text())
self.song.search_title = self.song.title + u'@' + \
unicode(self.AlternativeEdit.text())

View File

@ -88,6 +88,7 @@ def init_schema(url):
Column(u'song_book_id', types.Integer,
ForeignKey(u'song_books.id'), default=0),
Column(u'title', types.Unicode(255), nullable=False),
Column(u'alternate_title', types.Unicode(255)),
Column(u'lyrics', types.UnicodeText, nullable=False),
Column(u'verse_order', types.Unicode(128)),
Column(u'copyright', types.Unicode(255)),