From 4206d11228e19112a17c5645521da2e505ea6e55 Mon Sep 17 00:00:00 2001 From: Simon Hanna Date: Mon, 4 Jan 2016 01:18:01 +0100 Subject: [PATCH] Make methods static where possible --- openlp/plugins/alerts/alertsplugin.py | 9 ++++++--- openlp/plugins/bibles/bibleplugin.py | 3 ++- openlp/plugins/custom/customplugin.py | 3 ++- openlp/plugins/images/imageplugin.py | 3 ++- openlp/plugins/media/mediaplugin.py | 3 ++- openlp/plugins/presentations/presentationplugin.py | 3 ++- openlp/plugins/remotes/remoteplugin.py | 3 ++- openlp/plugins/songs/songsplugin.py | 6 ++++-- openlp/plugins/songusage/songusageplugin.py | 5 +++-- 9 files changed, 25 insertions(+), 13 deletions(-) diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py index 9e1f44613..14b1f7805 100644 --- a/openlp/plugins/alerts/alertsplugin.py +++ b/openlp/plugins/alerts/alertsplugin.py @@ -191,7 +191,8 @@ class AlertsPlugin(Plugin): self.alert_form.load_list() self.alert_form.exec() - def about(self): + @staticmethod + def about(): """ Plugin Alerts about method @@ -215,7 +216,8 @@ class AlertsPlugin(Plugin): 'title': translate('AlertsPlugin', 'Alerts', 'container title') } - def get_display_javascript(self): + @staticmethod + def get_display_javascript(): """ Add Javascript to the main display. """ @@ -229,7 +231,8 @@ class AlertsPlugin(Plugin): return CSS % (align, self.settings_tab.font_face, self.settings_tab.font_size, self.settings_tab.font_color, self.settings_tab.background_color) - def get_display_html(self): + @staticmethod + def get_display_html(): """ Add HTML to the main display. """ diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 022790c58..289f8cc32 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -167,7 +167,8 @@ class BiblePlugin(Plugin): if self.media_item: self.media_item.on_import_click() - def about(self): + @staticmethod + def about(): """ Return the about text for the plugin manager """ diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py index c5412199d..d9b3369af 100644 --- a/openlp/plugins/custom/customplugin.py +++ b/openlp/plugins/custom/customplugin.py @@ -62,7 +62,8 @@ class CustomPlugin(Plugin): self.icon_path = ':/plugins/plugin_custom.png' self.icon = build_icon(self.icon_path) - def about(self): + @staticmethod + def about(): about_text = translate('CustomPlugin', 'Custom Slide Plugin
The custom slide plugin ' 'provides the ability to set up custom text slides that can be displayed on the screen ' 'the same way songs are. This plugin provides greater freedom over the songs plugin.') diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py index 4ec0f9c2b..f3b84943d 100644 --- a/openlp/plugins/images/imageplugin.py +++ b/openlp/plugins/images/imageplugin.py @@ -53,7 +53,8 @@ class ImagePlugin(Plugin): self.icon_path = ':/plugins/plugin_images.png' self.icon = build_icon(self.icon_path) - def about(self): + @staticmethod + def about(): about_text = translate('ImagePlugin', 'Image Plugin' '
The image plugin provides displaying of images.
One ' 'of the distinguishing features of this plugin is the ability to ' diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py index 8c83acfef..a1e54a132 100644 --- a/openlp/plugins/media/mediaplugin.py +++ b/openlp/plugins/media/mediaplugin.py @@ -84,7 +84,8 @@ class MediaPlugin(Plugin): visible_name = self.get_string(StringContent.VisibleName) self.settings_tab = MediaTab(parent, self.name, visible_name['title'], self.icon_path) - def about(self): + @staticmethod + def about(): """ Return the about text for the plugin manager """ diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index 0d5dde029..e076922cd 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -137,7 +137,8 @@ class PresentationPlugin(Plugin): self.register_controllers(controller) return bool(self.controllers) - def about(self): + @staticmethod + def about(): """ Return information about this plugin. """ diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py index 27bf6f16f..0d093fab5 100644 --- a/openlp/plugins/remotes/remoteplugin.py +++ b/openlp/plugins/remotes/remoteplugin.py @@ -88,7 +88,8 @@ class RemotesPlugin(Plugin): self.server.stop_server() self.server = None - def about(self): + @staticmethod + def about(): """ Information about this plugin """ diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 1dc486182..ba35f8be9 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -211,7 +211,8 @@ class SongsPlugin(Plugin): if self.media_item: self.media_item.on_export_click() - def about(self): + @staticmethod + def about(): """ Provides information for the plugin manager to display. @@ -343,7 +344,8 @@ class SongsPlugin(Plugin): for song in songs: self.manager.delete_object(Song, song.id) - def _count_songs(self, db_file): + @staticmethod + def _count_songs(db_file): """ Provide a count of the songs in the database diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index 0bf8ed9a5..b433d96e0 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -226,8 +226,9 @@ class SongUsagePlugin(Plugin): """ self.song_usage_detail_form.initialise() self.song_usage_detail_form.exec() - - def about(self): + + @staticmethod + def about(): """ The plugin about text