From ea7c5c4b9e3712e55bce47c3270f12f9c936980b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 9 Sep 2011 19:19:48 +0100 Subject: [PATCH 1/5] Head --- openlp/core/ui/slidecontroller.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 3171d67d3..b731391b0 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -414,8 +414,9 @@ class SlideController(QtGui.QWidget): translate('OpenLP.SlideController', 'Escape Item')) def liveEscape(self): - self.display.setVisible(False) - self.display.videoStop() + if not self.display.primary: + self.display.setVisible(False) + self.display.videoStop() def servicePrevious(self): time.sleep(0.1) From b3cb4a21f44684961da63923ca046fee22293f0a Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 9 Sep 2011 20:14:19 +0100 Subject: [PATCH 2/5] fixes --- openlp/core/ui/slidecontroller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index b731391b0..62a14e941 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -414,7 +414,7 @@ class SlideController(QtGui.QWidget): translate('OpenLP.SlideController', 'Escape Item')) def liveEscape(self): - if not self.display.primary: + if self.display.primary: self.display.setVisible(False) self.display.videoStop() From 53b3b394e9e10ded0839aa651ad5e6b1cf6274bc Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 14 Sep 2011 21:27:30 +0100 Subject: [PATCH 3/5] Turn off autopreview when deleting images. Stops images being deleted trying to preview themselves. Fixes: https://launchpad.net/bugs/835033 --- openlp/plugins/images/lib/mediaitem.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index cf217d8dc..cb73a132f 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -99,6 +99,8 @@ class ImageMediaItem(MediaManagerItem): """ 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 @@ class ImageMediaItem(MediaManagerItem): 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: From 52c63d96655bf338079c32835ddbe5ad9dd94d75 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 14 Sep 2011 21:35:32 +0100 Subject: [PATCH 4/5] Undo fix --- openlp/core/ui/slidecontroller.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index c71170b32..6615d0e35 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -414,9 +414,8 @@ class SlideController(QtGui.QWidget): translate('OpenLP.SlideController', 'Escape Item')) def liveEscape(self): - if self.display.primary: - self.display.setVisible(False) - self.display.videoStop() + self.display.setVisible(False) + self.display.videoStop() def servicePrevious(self): time.sleep(0.1) From 1afcbbc8379278ad180219e1bdec1d7a19b7ae61 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Fri, 16 Sep 2011 10:15:37 +0200 Subject: [PATCH 5/5] Fixed bug #851653, added an if statement, and fixed the orphaned variable. Fixes: https://launchpad.net/bugs/851653 --- openlp/plugins/songs/lib/mediaitem.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 381e2611c..7d5e85af5 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -399,8 +399,10 @@ class SongMediaItem(MediaManagerItem): except: log.exception('Could not remove file: %s', audio) try: - os.rmdir(os.path.join(AppLocation.get_section_data_path( - self.plugin.name), 'audio', str(item_id))) + save_path = os.path.join(AppLocation.get_section_data_path( + self.plugin.name), 'audio', str(item_id)) + if os.path.exists(save_path): + os.rmdir(save_path) except OSError: log.exception(u'Could not remove directory: %s', save_path) self.plugin.manager.delete_object(Song, item_id)