From e1a4837a1965ab07e1984ac8e9ddb1a508ebd237 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Sat, 31 Dec 2011 17:36:23 +0000 Subject: [PATCH 1/3] Long line --- openlp/core/ui/media/mediacontroller.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 8697cc7a0..1a4b3a2cd 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -318,7 +318,8 @@ class MediaController(object): controller.media_info.start_time = 0 controller.media_info.end_time = 0 else: - controller.media_info.start_time = display.serviceItem.start_time + controller.media_info.start_time = \ + display.serviceItem.start_time controller.media_info.end_time = display.serviceItem.end_time elif controller.previewDisplay: display = controller.previewDisplay From 768c0999715de3bc096d1dd7ce5810d7107e90a1 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Sat, 31 Dec 2011 17:36:58 +0000 Subject: [PATCH 2/3] Indentation --- openlp/core/utils/actions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py index a66d7a270..d363f1426 100644 --- a/openlp/core/utils/actions.py +++ b/openlp/core/utils/actions.py @@ -358,7 +358,7 @@ class ActionList(object): if action is existing_action: continue if existing_action.parent() is action.parent(): - return False + return False if existing_action.shortcutContext() in [QtCore.Qt.WindowShortcut, QtCore.Qt.ApplicationShortcut]: return False From fb34a3e86d679236a1fde2e351b0c759fb9e5082 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Sat, 31 Dec 2011 17:37:56 +0000 Subject: [PATCH 3/3] Fix crashes in media settings (Bug #908252) --- openlp/plugins/media/lib/mediatab.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index d175e1b88..aed6b96cc 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -36,6 +36,7 @@ class MediaTab(SettingsTab): """ def __init__(self, parent, title, visible_title, media_players, icon_path): self.mediaPlayers = media_players + self.savedUsedPlayers = None SettingsTab.__init__(self, parent, title, visible_title, icon_path) def setupUi(self): @@ -138,7 +139,8 @@ class MediaTab(SettingsTab): if player not in self.usedPlayers: self.usedPlayers.append(player) else: - self.usedPlayers.takeAt(self.usedPlayers.indexOf(player)) + if player in self.usedPlayers: + self.usedPlayers.takeAt(self.usedPlayers.indexOf(player)) self.updatePlayerList() def updatePlayerList(self): @@ -146,7 +148,7 @@ class MediaTab(SettingsTab): for player in self.usedPlayers: if player in self.playerCheckBoxes.keys(): if len(self.usedPlayers) == 1: - # at least one media player have to stay active + # At least one media player has to stay active self.playerCheckBoxes[u'%s' % player].setEnabled(False) else: self.playerCheckBoxes[u'%s' % player].setEnabled(True) @@ -169,14 +171,20 @@ class MediaTab(SettingsTab): self.usedPlayers.move(currentRow, currentRow + 1) def load(self): + if self.savedUsedPlayers: + self.usedPlayers = self.savedUsedPlayers + self.savedUsedPlayers = None self.usedPlayers = QtCore.QSettings().value( self.settingsSection + u'/players', QtCore.QVariant(u'webkit')).toString().split(u',') + self.savedUsedPlayers = self.usedPlayers for key in self.mediaPlayers: player = self.mediaPlayers[key] checkbox = self.playerCheckBoxes[player.name] if player.available and player.name in self.usedPlayers: checkbox.setChecked(True) + else: + checkbox.setChecked(False) self.updatePlayerList() self.overridePlayerCheckBox.setChecked(QtCore.QSettings().value( self.settingsSection + u'/override player',