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

Fix bug #788084, modified code to use object id instead of title.

Browse Source 
bzr-revno: 1580
This commit is contained in:
Stevan Pettit 2011-05-27 07:52:45 +02:00 committed by Raoul Snyman
commit 35e6d2f97e
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/custom/forms/editcustomform.py
View File

@ -116,7 +116,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
log.debug(u'accept') log.debug(u'accept')
if self.saveCustom(): if self.saveCustom():
Receiver.send_message(u'custom_set_autoselect_item', Receiver.send_message(u'custom_set_autoselect_item',
self.customSlide.title) self.customSlide.id)
Receiver.send_message(u'custom_load_list') Receiver.send_message(u'custom_load_list')
QtGui.QDialog.accept(self) QtGui.QDialog.accept(self)

2
openlp/plugins/custom/lib/mediaitem.py
View File

@ -147,7 +147,7 @@ class CustomMediaItem(MediaManagerItem):
QtCore.Qt.UserRole, QtCore.QVariant(custom_slide.id)) QtCore.Qt.UserRole, QtCore.QVariant(custom_slide.id))
self.listView.addItem(custom_name) self.listView.addItem(custom_name)
# Auto-select the item if name has been set # Auto-select the item if name has been set
if custom_slide.title == self.autoSelectItem: if custom_slide.id == self.autoSelectItem:
self.listView.setCurrentItem(custom_name) self.listView.setCurrentItem(custom_name)
def onNewClick(self): def onNewClick(self):

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

@ -696,9 +696,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.clearCaches() self.clearCaches()
if self._validate_song(): if self._validate_song():
self.saveSong() self.saveSong()
Receiver.send_message(u'songs_set_autoselect_item', Receiver.send_message(u'songs_set_autoselect_item',self.song.id)
unicode(self.titleEdit.text()))
Receiver.send_message(u'songs_load_list') Receiver.send_message(u'songs_load_list')
self.song = None
QtGui.QDialog.accept(self) QtGui.QDialog.accept(self)
def saveSong(self, preview=False): def saveSong(self, preview=False):
@ -756,8 +756,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.song.topics.append(self.manager.get_object(Topic, topicId)) self.song.topics.append(self.manager.get_object(Topic, topicId))
clean_song(self.manager, self.song) clean_song(self.manager, self.song)
self.manager.save_object(self.song) self.manager.save_object(self.song)
if not preview:
self.song = None
def _processLyrics(self): def _processLyrics(self):
""" """

2
openlp/plugins/songs/lib/mediaitem.py
View File

@ -245,7 +245,7 @@ class SongMediaItem(MediaManagerItem):
song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id)) song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
self.listView.addItem(song_name) self.listView.addItem(song_name)
# Auto-select the item if name has been set # Auto-select the item if name has been set
if song.title == self.autoSelectItem : if song.id == self.autoSelectItem :
self.listView.setCurrentItem(song_name) self.listView.setCurrentItem(song_name)
def displayResultsAuthor(self, searchresults): def displayResultsAuthor(self, searchresults):