openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-835033 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #835033 in OpenLP: "Multiple repeating message boxes"
  https://bugs.launchpad.net/openlp/+bug/835033

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-835033/+merge/75420

Images being deleted try to preview them selves if single click enabled.
If they do not exists they pop up an error.
Turn off selection during the deletion process to stop this. 
-- 
https://code.launchpad.net/~trb143/openlp/bug-835033/+merge/75420
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-835033 into lp:openlp.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2011-09-12 20:04:46 +0000
+++ openlp/core/ui/slidecontroller.py	2011-09-14 20:32:28 +0000
@@ -414,8 +414,9 @@
             translate('OpenLP.SlideController', 'Escape Item'))
 
     def liveEscape(self):
-        self.display.setVisible(False)
-        self.display.videoStop()
+        if self.display.primary:
+            self.display.setVisible(False)
+            self.display.videoStop()
 
     def servicePrevious(self):
         time.sleep(0.1)

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2011-09-06 17:53:43 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2011-09-14 20:32:28 +0000
@@ -99,6 +99,8 @@
         """
         Remove an image item from the list
         """
+        # Turn off auto preview triggers.
+        self.listView.blockSignals(True)
         if check_item_selected(self.listView, translate('ImagePlugin.MediaItem',
             'You must select an image to delete.')):
             row_list = [item.row() for item in self.listView.selectedIndexes()]
@@ -111,6 +113,7 @@
                 self.listView.takeItem(row)
             SettingsManager.set_list(self.settingsSection,
                 u'images', self.getFileList())
+        self.listView.blockSignals(False)
 
     def loadList(self, images, initialLoad=False):
         if not initialLoad: