openlp-core team mailing list archive

[Stevan Pettit <smpettit@xxxxxxxxxxxxxxx>]

Stevan Pettit has proposed merging lp:~smpettit/openlp/bug-789102 into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman)

For more details, see:
https://code.launchpad.net/~smpettit/openlp/bug-789102/+merge/62807

Fixed bug-789102.  Made changes to song and custom mediaitems and edit forms to not autoselect mediamanager items when doing item edits from preview or slidecontroller.
-- 
https://code.launchpad.net/~smpettit/openlp/bug-789102/+merge/62807
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2011-05-27 09:34:14 +0000
+++ openlp/core/lib/mediamanageritem.py	2011-05-29 23:56:35 +0000
@@ -455,7 +455,8 @@
         """
         if QtCore.QSettings().value(u'advanced/single click preview',
             QtCore.QVariant(False)).toBool() and self.quickPreviewAllowed \
-            and self.listView.selectedIndexes():
+            and self.listView.selectedIndexes() \
+            and self.auto_select_id == -1:
             self.onPreviewClick(True)
 
     def onPreviewClick(self, keepFocus=False):

=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py	2011-05-27 09:34:14 +0000
+++ openlp/plugins/custom/forms/editcustomform.py	2011-05-29 23:56:35 +0000
@@ -137,7 +137,6 @@
         self.customSlide.credits = unicode(self.creditEdit.text())
         self.customSlide.theme_name = unicode(self.themeComboBox.currentText())
         success = self.manager.save_object(self.customSlide)
-        self.parent.auto_select_id = self.customSlide.id
         return success
 
     def onUpButtonClicked(self):

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2011-05-27 09:34:14 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2011-05-29 23:56:35 +0000
@@ -755,7 +755,6 @@
             self.song.topics.append(self.manager.get_object(Topic, topicId))
         clean_song(self.manager, self.song)
         self.manager.save_object(self.song)
-        self.parent.auto_select_id = self.song.id
 
     def _processLyrics(self):
         """