Make plugin config updates generic

Fix up some copyright issues missed
2012-03-17 10:40:06 +00:00 · 2012-03-17 10:40:06 +00:00 · d00840d1e0
commit d00840d1e0
parent 283d85fbd9
9 changed files with 52 additions and 47 deletions
--- a/openlp/core/lib/eventreceiver.py
+++ b/openlp/core/lib/eventreceiver.py
@ -213,9 +213,10 @@ class EventReceiver(QtCore.QObject):
    ``{plugin}_add_service_item``
        Ask the plugin to push the selected items to the service item.

-    ``{plugin}_service_load``
-        Ask the plugin to process an individual service item after it has been
-        loaded.
+
+    ``{plugin}_config_updated``
+        The Plugn's config has changed so lets do some processing.
+

    ``alerts_text``
        Displays an alert message.
--- a/openlp/core/lib/plugin.py
+++ b/openlp/core/lib/plugin.py
@ -173,6 +173,9 @@ class Plugin(QtCore.QObject):
        QtCore.QObject.connect(Receiver.get_receiver(),
            QtCore.SIGNAL(u'%s_add_service_item' % self.name),
            self.processAddServiceEvent)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'%s_config_updated' % self.name),
+            self.configUpdated)

    def checkPreConditions(self):
        """
@ -395,3 +398,9 @@ class Plugin(QtCore.QObject):
        Add html code to htmlbuilder.
        """
        return u''
+
+    def configUpdatedl(self):
+        """
+        The plugin's config has changed
+        """
+        pass
--- a/openlp/plugins/remotes/html/index.html
+++ b/openlp/plugins/remotes/html/index.html
@ -4,12 +4,12 @@
 ###############################################################################
 # OpenLP - Open Source Lyrics Projection                                      #
 # --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2011 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler,        #
-# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout,      #
-# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode       #
-# Woldsund                                                                    #
+# Copyright (c) 2008-2012 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan      #
+# Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan,      #
+# Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias     #
+# Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,    #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund             #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
--- a/openlp/plugins/remotes/html/openlp.css
+++ b/openlp/plugins/remotes/html/openlp.css
@ -1,12 +1,12 @@
 /*****************************************************************************
 * OpenLP - Open Source Lyrics Projection                                    *
 * ------------------------------------------------------------------------- *
- * Copyright (c) 2008-2010 Raoul Snyman                                      *
- * Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael    *
- * Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler,      *
- * Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout,    *
- * Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode     *
- * Woldsund                                                                  *
+ * Copyright (c) 2008-2012 Raoul Snyman                                      *
+ * Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan    *
+ * Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan,    *
+ * Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias   *
+ * Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,  *
+ * Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund           *
 * ------------------------------------------------------------------------- *
 * This program is free software; you can redistribute it and/or modify it   *
 * under the terms of the GNU General Public License as published by the     *
--- a/openlp/plugins/remotes/html/openlp.js
+++ b/openlp/plugins/remotes/html/openlp.js
@ -1,12 +1,12 @@
 /*****************************************************************************
 * OpenLP - Open Source Lyrics Projection                                    *
 * ------------------------------------------------------------------------- *
- * Copyright (c) 2008-2010 Raoul Snyman                                      *
- * Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael    *
- * Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler,      *
- * Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout,    *
- * Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode     *
- * Woldsund                                                                  *
+ * Copyright (c) 2008-2012 Raoul Snyman                                      *
+ * Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan    *
+ * Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan,    *
+ * Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias   *
+ * Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,  *
+ * Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund           *
 * ------------------------------------------------------------------------- *
 * This program is free software; you can redistribute it and/or modify it   *
 * under the terms of the GNU General Public License as published by the     *
--- a/openlp/plugins/remotes/html/stage.css
+++ b/openlp/plugins/remotes/html/stage.css
@ -1,12 +1,12 @@
 /*****************************************************************************
 * OpenLP - Open Source Lyrics Projection                                    *
 * ------------------------------------------------------------------------- *
- * Copyright (c) 2008-2010 Raoul Snyman                                      *
- * Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael    *
- * Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin K<EFBFBD>hler,      *
- * Andreas Preikschat, Mattias P<EFBFBD>ldaru, Christian Richter, Philip Ridout,    *
- * Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode     *
- * Woldsund                                                                  *
+ * Copyright (c) 2008-2012 Raoul Snyman                                      *
+ * Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan    *
+ * Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan,    *
+ * Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias   *
+ * Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,  *
+ * Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund           *
 * ------------------------------------------------------------------------- *
 * This program is free software; you can redistribute it and/or modify it   *
 * under the terms of the GNU General Public License as published by the     *
--- a/openlp/plugins/remotes/html/stage.html
+++ b/openlp/plugins/remotes/html/stage.html
@ -4,12 +4,12 @@
 ###############################################################################
 # OpenLP - Open Source Lyrics Projection                                      #
 # --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2011 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler,        #
-# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout,      #
-# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode       #
-# Woldsund                                                                    #
+# Copyright (c) 2008-2012 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan      #
+# Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan,      #
+# Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias     #
+# Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,    #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund             #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
--- a/openlp/plugins/remotes/html/stage.js
+++ b/openlp/plugins/remotes/html/stage.js
@ -1,12 +1,12 @@
 /*****************************************************************************
 * OpenLP - Open Source Lyrics Projection                                    *
 * ------------------------------------------------------------------------- *
- * Copyright (c) 2008-2010 Raoul Snyman                                      *
- * Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael    *
- * Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler,      *
- * Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout,    *
- * Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode     *
- * Woldsund                                                                  *
+ * Copyright (c) 2008-2012 Raoul Snyman                                      *
+ * Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan    *
+ * Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan,    *
+ * Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias   *
+ * Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,  *
+ * Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund           *
 * ------------------------------------------------------------------------- *
 * This program is free software; you can redistribute it and/or modify it   *
 * under the terms of the GNU General Public License as published by the     *
--- a/openlp/plugins/remotes/remoteplugin.py
+++ b/openlp/plugins/remotes/remoteplugin.py
@ -27,10 +27,7 @@

 import logging

-from PyQt4 import QtCore
-
-from openlp.core.lib import Plugin, StringContent, translate, build_icon,\
-    Receiver
+from openlp.core.lib import Plugin, StringContent, translate, build_icon
 from openlp.plugins.remotes.lib import RemoteTab, HttpServer

 log = logging.getLogger(__name__)
@ -48,9 +45,7 @@ class RemotesPlugin(Plugin):
        self.icon = build_icon(self.icon_path)
        self.weight = -1
        self.server = None
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'remote_config_updated'),
-            self.config_updated)
+

    def initialise(self):
        """
@ -93,7 +88,7 @@ class RemotesPlugin(Plugin):
            u'title': translate('RemotePlugin', 'Remote', 'container title')
        }

-    def config_updated(self):
+    def configUpdated(self):
        """
        Called when Config is changed to restart the server on new address or
        port