forked from openlp/openlp
bug-789102 - Removed code that auto-selects new items.
This commit is contained in:
parent
46f9153ea8
commit
fe35a5775c
@ -137,8 +137,6 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
|
||||
self.customSlide.credits = unicode(self.creditEdit.text())
|
||||
self.customSlide.theme_name = unicode(self.themeComboBox.currentText())
|
||||
success = self.manager.save_object(self.customSlide)
|
||||
if self.parent.new:
|
||||
self.parent.auto_select_id = self.customSlide.id
|
||||
return success
|
||||
|
||||
def onUpButtonClicked(self):
|
||||
|
@ -66,7 +66,6 @@ class CustomMediaItem(MediaManagerItem):
|
||||
# which Custom is required.
|
||||
self.remoteCustom = -1
|
||||
self.manager = parent.manager
|
||||
self.new = False
|
||||
|
||||
def addEndHeaderBar(self):
|
||||
self.addToolbarSeparator()
|
||||
@ -157,11 +156,9 @@ class CustomMediaItem(MediaManagerItem):
|
||||
self.auto_select_id = -1
|
||||
|
||||
def onNewClick(self):
|
||||
self.new = True
|
||||
self.edit_custom_form.loadCustom(0)
|
||||
self.edit_custom_form.exec_()
|
||||
self.initialise()
|
||||
self.new = False
|
||||
|
||||
def onRemoteEditClear(self):
|
||||
self.remoteTriggered = None
|
||||
|
@ -755,8 +755,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
||||
self.song.topics.append(self.manager.get_object(Topic, topicId))
|
||||
clean_song(self.manager, self.song)
|
||||
self.manager.save_object(self.song)
|
||||
if self.parent.new:
|
||||
self.parent.auto_select_id = self.song.id
|
||||
|
||||
def _processLyrics(self):
|
||||
"""
|
||||
|
@ -74,7 +74,6 @@ class SongMediaItem(MediaManagerItem):
|
||||
self.editItem = None
|
||||
self.quickPreviewAllowed = True
|
||||
self.hasSearch = True
|
||||
self.new = False
|
||||
|
||||
def addEndHeaderBar(self):
|
||||
self.addToolbarSeparator()
|
||||
@ -297,10 +296,8 @@ class SongMediaItem(MediaManagerItem):
|
||||
|
||||
def onNewClick(self):
|
||||
log.debug(u'onNewClick')
|
||||
self.new = True
|
||||
self.edit_song_form.newSong()
|
||||
self.edit_song_form.exec_()
|
||||
self.new = False
|
||||
|
||||
def onSongMaintenanceClick(self):
|
||||
self.song_maintenance_form.exec_()
|
||||
|
Loading…
Reference in New Issue
Block a user