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

More bug fixes

Browse Source 
Bibles have correct footers
Songs now save all data and have correct focus
This commit is contained in:
Tim Bentley 2009-07-13 18:02:38 +01:00
parent 6c30e67723
commit 66b6836406
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -350,7 +350,8 @@ class BibleMediaItem(MediaManagerItem):
chapter = unicode(self.search_results[0][1]) chapter = unicode(self.search_results[0][1])
verse = unicode(self.search_results[0][2]) verse = unicode(self.search_results[0][2])
text = self.search_results[0][3] text = self.search_results[0][3]
if self.parent.bibles_tab.paragraph_style: #Paragraph #Paragraph style force new line per verse
if self.parent.bibles_tab.paragraph_style:
text = text + u'\n\n' text = text + u'\n\n'
if self.parent.bibles_tab.display_style == 1: if self.parent.bibles_tab.display_style == 1:
loc = self.formatVerse(old_chapter, chapter, verse, u'(u', u')') loc = self.formatVerse(old_chapter, chapter, verse, u'(u', u')')

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

@ -139,6 +139,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.AuthorsListView.clear() self.AuthorsListView.clear()
self.TopicsListView.clear() self.TopicsListView.clear()
self.title_change = False self.title_change = False
self.TitleEditItem.setFocus(QtCore.Qt.OtherFocusReason)
def loadSong(self, id): def loadSong(self, id):
log.debug(u'Load Song') log.debug(u'Load Song')
@ -161,16 +162,19 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.SongbookCombo.setCurrentIndex(id) self.SongbookCombo.setCurrentIndex(id)
if len(title) > 1: if len(title) > 1:
self.AlternativeEdit.setText(title[1]) self.AlternativeEdit.setText(title[1])
if self.song.copyright is not None:
self.CopyrightEditItem.setText(self.song.copyright) self.CopyrightEditItem.setText(self.song.copyright)
else:
self.CopyrightEditItem.setText(u'')
self.VerseListWidget.clear() self.VerseListWidget.clear()
if self.song.verse_order is not None: if self.song.verse_order is not None:
self.VerseOrderEdit.setText(self.song.verse_order) self.VerseOrderEdit.setText(self.song.verse_order)
else: else:
self.VerseOrderEdit.setText(u'') self.VerseOrderEdit.setText(u'')
if self.song.comments is not None: if self.song.comments is not None:
self.CommentsEdit.setText(self.song.comments) self.CommentsEdit.setPlainText(self.song.comments)
else: else:
self.CommentsEdit.setText(u'') self.CommentsEdit.setPlainText(u'')
if self.song.ccli_number is not None: if self.song.ccli_number is not None:
self.CCLNumberEdit.setText(self.song.ccli_number) self.CCLNumberEdit.setText(self.song.ccli_number)
else: else:
@ -199,6 +203,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.TopicsListView.addItem(topic_name) self.TopicsListView.addItem(topic_name)
self._validate_song() self._validate_song()
self.title_change = False self.title_change = False
self.TitleEditItem.setFocus(QtCore.Qt.OtherFocusReason)
def onAuthorAddtoSongItemClicked(self): def onAuthorAddtoSongItemClicked(self):
item = int(self.AuthorsSelectionComboItem.currentIndex()) item = int(self.AuthorsSelectionComboItem.currentIndex())
@ -296,6 +301,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.verse_form.setVerse(item.text()) self.verse_form.setVerse(item.text())
self.verse_form.exec_() self.verse_form.exec_()
item.setText(self.verse_form.getVerse()) item.setText(self.verse_form.getVerse())
self.VerseListWidget.update()
self.EditButton.setEnabled(False) self.EditButton.setEnabled(False)
self.DeleteButton.setEnabled(False) self.DeleteButton.setEnabled(False)
@ -356,7 +362,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
return return
self.song.title = unicode(self.TitleEditItem.displayText()) self.song.title = unicode(self.TitleEditItem.displayText())
self.song.copyright = unicode(self.CopyrightEditItem.displayText()) self.song.copyright = unicode(self.CopyrightEditItem.displayText())
self.song.search_title = self.TitleEditItem.displayText() + u'@'+ self.AlternativeEdit.displayText() self.song.search_title = unicode(self.TitleEditItem.displayText()) + u'@'+ unicode(self.AlternativeEdit.displayText())
self.song.comments = unicode(self.CommentsEdit.toPlainText())
self.song.ccli_number = unicode(self.CCLNumberEdit.displayText())
self.processLyrics() self.processLyrics()
self.processTitle() self.processTitle()
self.song.song_book_id = 0 self.song.song_book_id = 0
@ -380,7 +388,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
count += 1 count += 1
if self.song.verse_order is None: if self.song.verse_order is None:
self.song.verse_order = verse_order self.song.verse_order = verse_order
text = text.replace("'", u'') text = text.replace(u'\'', u'')
text = text.replace(u',', u'') text = text.replace(u',', u'')
text = text.replace(u';', u'') text = text.replace(u';', u'')
text = text.replace(u':', u'') text = text.replace(u':', u'')
@ -394,7 +402,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
def processTitle(self): def processTitle(self):
log.debug(u'processTitle') log.debug(u'processTitle')
self.song.search_title = self.song.search_title.replace("'", u'') self.song.search_title = self.song.search_title.replace(u'\'', u'')
self.song.search_title = self.song.search_title.replace(u',', u'') self.song.search_title = self.song.search_title.replace(u',', u'')
self.song.search_title = self.song.search_title.replace(u';', u'') self.song.search_title = self.song.search_title.replace(u';', u'')
self.song.search_title = self.song.search_title.replace(u':', u'') self.song.search_title = self.song.search_title.replace(u':', u'')