From 2e02f1c94f9a8428651eb89228fe91736f12a95e Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 7 Nov 2009 07:42:18 +0000 Subject: [PATCH] Remove "Can_be_disabled" as no longer require Sort out status handling in plugin form. --- openlp/core/lib/plugin.py | 8 -------- openlp/core/lib/pluginmanager.py | 5 +---- openlp/core/ui/pluginform.py | 14 +++++--------- openlp/plugins/bibles/bibleplugin.py | 3 --- openlp/plugins/custom/customplugin.py | 3 --- openlp/plugins/images/imageplugin.py | 5 +---- openlp/plugins/media/mediaplugin.py | 3 --- openlp/plugins/presentations/presentationplugin.py | 3 --- openlp/plugins/remotes/remoteplugin.py | 3 --- openlp/plugins/songs/songsplugin.py | 3 --- openlp/plugins/songusage/songusageplugin.py | 3 --- 11 files changed, 7 insertions(+), 46 deletions(-) diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py index dba8666e3..38302cea1 100644 --- a/openlp/core/lib/plugin.py +++ b/openlp/core/lib/plugin.py @@ -139,14 +139,6 @@ class Plugin(QtCore.QObject): """ return True - def can_be_disabled(self): - """ - Indicates whether the plugin can be disabled by the plugin list. - - Returns True or False. - """ - return False - def set_status(self): """ Sets the status of the plugin diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py index 4ac23e6a2..60643a588 100644 --- a/openlp/core/lib/pluginmanager.py +++ b/openlp/core/lib/pluginmanager.py @@ -105,10 +105,7 @@ class PluginManager(object): for plugin in plugins_list: if plugin.check_pre_conditions(): log.debug(u'Plugin %s active', unicode(plugin.name)) - if plugin.can_be_disabled(): - plugin.set_status() - else: - plugin.status = PluginStatus.Active + plugin.set_status() else: plugin.status = PluginStatus.Disabled self.plugins.append(plugin) diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py index 2cbb4fef5..98a7b7d33 100644 --- a/openlp/core/ui/pluginform.py +++ b/openlp/core/ui/pluginform.py @@ -79,17 +79,16 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog): self.StatusComboBox.setCurrentIndex(-1) self.VersionNumberLabel.setText(u'') self.AboutTextBrowser.setHtml(u'') + self.StatusComboBox.setEnabled(False) def _setDetails(self): log.debug('PluginStatus: %s', str(self.activePlugin.status)) self.VersionNumberLabel.setText(self.activePlugin.version) self.AboutTextBrowser.setHtml(self.activePlugin.about()) - if self.activePlugin.can_be_disabled(): - self.programaticChange = True - self.StatusComboBox.setCurrentIndex(int(self.activePlugin.status)) - self.StatusComboBox.setEnabled(True) - else: - self.StatusComboBox.setEnabled(False) + self.programaticChange = True + self.StatusComboBox.setCurrentIndex(int(self.activePlugin.status)) + self.StatusComboBox.setEnabled(True) + self.programaticChange = False def onPluginListWidgetSelectionChanged(self): if self.PluginListWidget.currentItem() is None: @@ -107,9 +106,6 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog): self._clearDetails() def onStatusComboBoxChanged(self, status): - if self.programaticChange: - self.programaticChange = False - return self.activePlugin.toggle_status(status) if status == PluginStatus.Active: self.activePlugin.initialise() diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index ef0308925..dfc3595f7 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -41,9 +41,6 @@ class BiblePlugin(Plugin): #Register the bible Manager self.biblemanager = None - def can_be_disabled(self): - return True - def initialise(self): log.info(u'bibles Initialising') if self.biblemanager is None: diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py index bcd61f5bc..3ae693e1e 100644 --- a/openlp/plugins/custom/customplugin.py +++ b/openlp/plugins/custom/customplugin.py @@ -54,9 +54,6 @@ class CustomPlugin(Plugin): # Create the CustomManagerItem object return CustomMediaItem(self, self.icon, self.name) - def can_be_disabled(self): - return True - def initialise(self): log.info(u'Plugin Initialising') Plugin.initialise(self) diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py index 229b57f95..aba19f47f 100644 --- a/openlp/plugins/images/imageplugin.py +++ b/openlp/plugins/images/imageplugin.py @@ -37,9 +37,6 @@ class ImagePlugin(Plugin): self.weight = -7 self.icon = buildIcon(u':/media/media_image.png') - def can_be_disabled(self): - return True - def initialise(self): log.info(u'Plugin Initialising') Plugin.initialise(self) @@ -60,7 +57,7 @@ class ImagePlugin(Plugin): about_text = self.trUtf8(u'Image Plugin
Allows images of ' u'all types to be displayed. If a number of images are selected ' u'together and presented on the live controller it is possible ' - u'to turn them into a timed loop.
From the plugin if the ' + u'to turn them into a timed loop.From the plugin if the ' u'Override background is chosen and an image is selected ' u'any somgs which are rendered will use the selected image from ' u'the background instead of the one provied by the theme.
') diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py index acfd170d6..3295dabc2 100644 --- a/openlp/plugins/media/mediaplugin.py +++ b/openlp/plugins/media/mediaplugin.py @@ -42,9 +42,6 @@ class MediaPlugin(Plugin): def get_settings_tab(self): return MediaTab(self.name) - def can_be_disabled(self): - return True - def initialise(self): log.info(u'Plugin Initialising') Plugin.initialise(self) diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index e54220e08..11d582925 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -46,9 +46,6 @@ class PresentationPlugin(Plugin): """ return PresentationTab(self.name, self.controllers) - def can_be_disabled(self): - return True - def initialise(self): log.info(u'Presentations Initialising') Plugin.initialise(self) diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py index 3a350cd0c..451887751 100644 --- a/openlp/plugins/remotes/remoteplugin.py +++ b/openlp/plugins/remotes/remoteplugin.py @@ -40,9 +40,6 @@ class RemotesPlugin(Plugin): self.weight = -1 self.server = None - def can_be_disabled(self): - return True - def initialise(self): log.debug(u'initialise') Plugin.initialise(self) diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index a76642024..6c7b24d77 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -57,9 +57,6 @@ class SongsPlugin(Plugin): self.opensong_export_form = OpenSongExportForm() self.icon = buildIcon(u':/media/media_song.png') - def can_be_disabled(self): - return True - def get_settings_tab(self): return SongsTab(self.name) diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index 2e7282a98..7cb555647 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -44,9 +44,6 @@ class SongUsagePlugin(Plugin): self.songusagemanager = None self.songusageActive = False - def can_be_disabled(self): - return True - def add_tools_menu_item(self, tools_menu): """ Give the SongUsage plugin the opportunity to add items to the