OpenLP

Merge lp:~trb143/openlp/bug-943843 into lp:openlp

  1. bug-943843
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: 1909
Proposed branch: lp:~trb143/openlp/bug-943843
Merge into: lp:openlp
Diff against target: 249 lines (+69/-39)
11 files modified
openlp/core/lib/eventreceiver.py (+3/-0)
openlp/core/lib/plugin.py (+9/-0)
openlp/plugins/remotes/html/index.html (+6/-6)
openlp/plugins/remotes/html/openlp.css (+6/-6)
openlp/plugins/remotes/html/openlp.js (+6/-6)
openlp/plugins/remotes/html/stage.css (+7/-7)
openlp/plugins/remotes/html/stage.html (+6/-6)
openlp/plugins/remotes/html/stage.js (+6/-6)
openlp/plugins/remotes/lib/httpserver.py (+3/-1)
openlp/plugins/remotes/lib/remotetab.py (+9/-1)
openlp/plugins/remotes/remoteplugin.py (+8/-0)
To merge this branch: bzr merge lp:~trb143/openlp/bug-943843
Reviewer Review Type Date Requested Status
Jonathan Corwin (community) Approve
Review via email: mp+98089@code.launchpad.net

This proposal supersedes a proposal from 2012-03-17.

Description of the change

A number of fixes .
 = Correct copyright headers
 = Allow remotes to change IP and Port without restarting
 = Make the clock smaller in stage view.
 = Stop Alerts posting if the plugin is disabled.

To post a comment you must log in.
Revision history for this message
Jonathan Corwin (j-corwin) wrote : Posted in a previous version of this proposal

In places you've removed Armin Köhler and Mattias Põldaru (line 172/173) and replaced with Armin Köhler and Mattias Põldaru. Could the ö and õ be used throughout?

242: Why another blank line?

review: Approve
Revision history for this message
Jonathan Corwin (j-corwin) wrote : Posted in a previous version of this proposal

Oops, meant Needs Fixing

review: Needs Fixing
Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

Well that is interesting as they are correct in my editors so cannot fix.

Revision history for this message
Jonathan Corwin (j-corwin) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openlp/core/lib/eventreceiver.py'
--- openlp/core/lib/eventreceiver.py 2012-01-28 08:07:54 +0000
+++ openlp/core/lib/eventreceiver.py 2012-03-18 08:20:24 +0000
@@ -217,6 +217,9 @@
217 Ask the plugin to process an individual service item after it has been217 Ask the plugin to process an individual service item after it has been
218 loaded.218 loaded.
219219
220 ``{plugin}_config_updated``
221 The config has changed so tell the plugin about it.
222
220 ``alerts_text``223 ``alerts_text``
221 Displays an alert message.224 Displays an alert message.
222225
223226
=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py 2011-12-27 10:33:55 +0000
+++ openlp/core/lib/plugin.py 2012-03-18 08:20:24 +0000
@@ -173,6 +173,9 @@
173 QtCore.QObject.connect(Receiver.get_receiver(),173 QtCore.QObject.connect(Receiver.get_receiver(),
174 QtCore.SIGNAL(u'%s_add_service_item' % self.name),174 QtCore.SIGNAL(u'%s_add_service_item' % self.name),
175 self.processAddServiceEvent)175 self.processAddServiceEvent)
176 QtCore.QObject.connect(Receiver.get_receiver(),
177 QtCore.SIGNAL(u'%s_config_updated' % self.name),
178 self.configUpdated)
176179
177 def checkPreConditions(self):180 def checkPreConditions(self):
178 """181 """
@@ -395,3 +398,9 @@
395 Add html code to htmlbuilder.398 Add html code to htmlbuilder.
396 """399 """
397 return u''400 return u''
401
402 def configUpdated(self):
403 """
404 The plugin's config has changed
405 """
406 pass
398407
=== modified file 'openlp/plugins/remotes/html/index.html'
--- openlp/plugins/remotes/html/index.html 2012-03-03 05:13:48 +0000
+++ openlp/plugins/remotes/html/index.html 2012-03-18 08:20:24 +0000
@@ -4,12 +4,12 @@
4###############################################################################4###############################################################################
5# OpenLP - Open Source Lyrics Projection #5# OpenLP - Open Source Lyrics Projection #
6# --------------------------------------------------------------------------- #6# --------------------------------------------------------------------------- #
7# Copyright (c) 2008-2011 Raoul Snyman #7# Copyright (c) 2008-2012 Raoul Snyman #
8# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #8# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan #
9# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #9# Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, #
10# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #10# Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias #
11# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode #11# Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
12# Woldsund #12# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
13# --------------------------------------------------------------------------- #13# --------------------------------------------------------------------------- #
14# This program is free software; you can redistribute it and/or modify it #14# This program is free software; you can redistribute it and/or modify it #
15# under the terms of the GNU General Public License as published by the Free #15# under the terms of the GNU General Public License as published by the Free #
1616
=== modified file 'openlp/plugins/remotes/html/openlp.css'
--- openlp/plugins/remotes/html/openlp.css 2011-05-24 20:47:05 +0000
+++ openlp/plugins/remotes/html/openlp.css 2012-03-18 08:20:24 +0000
@@ -1,12 +1,12 @@
1/*****************************************************************************1/*****************************************************************************
2 * OpenLP - Open Source Lyrics Projection *2 * OpenLP - Open Source Lyrics Projection *
3 * ------------------------------------------------------------------------- *3 * ------------------------------------------------------------------------- *
4 * Copyright (c) 2008-2010 Raoul Snyman *4 * Copyright (c) 2008-2012 Raoul Snyman *
5 * Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael *5 * Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan *
6 * Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, *6 * Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, *
7 * Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, *7 * Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias *
8 * Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode *8 * Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, *
9 * Woldsund *9 * Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund *
10 * ------------------------------------------------------------------------- *10 * ------------------------------------------------------------------------- *
11 * This program is free software; you can redistribute it and/or modify it *11 * This program is free software; you can redistribute it and/or modify it *
12 * under the terms of the GNU General Public License as published by the *12 * under the terms of the GNU General Public License as published by the *
1313
=== modified file 'openlp/plugins/remotes/html/openlp.js'
--- openlp/plugins/remotes/html/openlp.js 2011-12-23 16:03:37 +0000
+++ openlp/plugins/remotes/html/openlp.js 2012-03-18 08:20:24 +0000
@@ -1,12 +1,12 @@
1/*****************************************************************************1/*****************************************************************************
2 * OpenLP - Open Source Lyrics Projection *2 * OpenLP - Open Source Lyrics Projection *
3 * ------------------------------------------------------------------------- *3 * ------------------------------------------------------------------------- *
4 * Copyright (c) 2008-2010 Raoul Snyman *4 * Copyright (c) 2008-2012 Raoul Snyman *
5 * Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael *5 * Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan *
6 * Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, *6 * Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, *
7 * Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, *7 * Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias *
8 * Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode *8 * Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, *
9 * Woldsund *9 * Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund *
10 * ------------------------------------------------------------------------- *10 * ------------------------------------------------------------------------- *
11 * This program is free software; you can redistribute it and/or modify it *11 * This program is free software; you can redistribute it and/or modify it *
12 * under the terms of the GNU General Public License as published by the *12 * under the terms of the GNU General Public License as published by the *
1313
=== modified file 'openlp/plugins/remotes/html/stage.css'
--- openlp/plugins/remotes/html/stage.css 2011-05-24 20:47:05 +0000
+++ openlp/plugins/remotes/html/stage.css 2012-03-18 08:20:24 +0000
@@ -1,12 +1,12 @@
1/*****************************************************************************1/*****************************************************************************
2 * OpenLP - Open Source Lyrics Projection *2 * OpenLP - Open Source Lyrics Projection *
3 * ------------------------------------------------------------------------- *3 * ------------------------------------------------------------------------- *
4 * Copyright (c) 2008-2010 Raoul Snyman *4 * Copyright (c) 2008-2012 Raoul Snyman *
5 * Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael *5 * Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan *
6 * Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, *6 * Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, *
7 * Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, *7 * Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias *
8 * Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode *8 * Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, *
9 * Woldsund *9 * Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund *
10 * ------------------------------------------------------------------------- *10 * ------------------------------------------------------------------------- *
11 * This program is free software; you can redistribute it and/or modify it *11 * This program is free software; you can redistribute it and/or modify it *
12 * under the terms of the GNU General Public License as published by the *12 * under the terms of the GNU General Public License as published by the *
@@ -46,7 +46,7 @@
46}46}
4747
48#clock {48#clock {
49 font-size: 40pt;49 font-size: 30pt;
50 color: yellow;50 color: yellow;
51 text-align: right;51 text-align: right;
52}52}
5353
=== modified file 'openlp/plugins/remotes/html/stage.html'
--- openlp/plugins/remotes/html/stage.html 2011-05-31 11:25:35 +0000
+++ openlp/plugins/remotes/html/stage.html 2012-03-18 08:20:24 +0000
@@ -4,12 +4,12 @@
4###############################################################################4###############################################################################
5# OpenLP - Open Source Lyrics Projection #5# OpenLP - Open Source Lyrics Projection #
6# --------------------------------------------------------------------------- #6# --------------------------------------------------------------------------- #
7# Copyright (c) 2008-2011 Raoul Snyman #7# Copyright (c) 2008-2012 Raoul Snyman #
8# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #8# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan #
9# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, #9# Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, #
10# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, #10# Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias #
11# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode #11# Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
12# Woldsund #12# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund #
13# --------------------------------------------------------------------------- #13# --------------------------------------------------------------------------- #
14# This program is free software; you can redistribute it and/or modify it #14# This program is free software; you can redistribute it and/or modify it #
15# under the terms of the GNU General Public License as published by the Free #15# under the terms of the GNU General Public License as published by the Free #
1616
=== modified file 'openlp/plugins/remotes/html/stage.js'
--- openlp/plugins/remotes/html/stage.js 2011-11-27 19:39:39 +0000
+++ openlp/plugins/remotes/html/stage.js 2012-03-18 08:20:24 +0000
@@ -1,12 +1,12 @@
1/*****************************************************************************1/*****************************************************************************
2 * OpenLP - Open Source Lyrics Projection *2 * OpenLP - Open Source Lyrics Projection *
3 * ------------------------------------------------------------------------- *3 * ------------------------------------------------------------------------- *
4 * Copyright (c) 2008-2010 Raoul Snyman *4 * Copyright (c) 2008-2012 Raoul Snyman *
5 * Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael *5 * Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan *
6 * Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, *6 * Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, *
7 * Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, *7 * Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias *
8 * Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode *8 * Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, *
9 * Woldsund *9 * Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund *
10 * ------------------------------------------------------------------------- *10 * ------------------------------------------------------------------------- *
11 * This program is free software; you can redistribute it and/or modify it *11 * This program is free software; you can redistribute it and/or modify it *
12 * under the terms of the GNU General Public License as published by the *12 * under the terms of the GNU General Public License as published by the *
1313
=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
--- openlp/plugins/remotes/lib/httpserver.py 2012-03-15 06:15:21 +0000
+++ openlp/plugins/remotes/lib/httpserver.py 2012-03-18 08:20:24 +0000
@@ -427,7 +427,9 @@
427 Send an alert.427 Send an alert.
428 """428 """
429 text = json.loads(self.url_params[u'data'][0])[u'request'][u'text']429 text = json.loads(self.url_params[u'data'][0])[u'request'][u'text']
430 Receiver.send_message(u'alerts_text', [text])430 plugin = self.parent.plugin.pluginManager.get_plugin_by_name("alerts")
431 if plugin.status == PluginStatus.Active:
432 Receiver.send_message(u'alerts_text', [text])
431 return HttpResponse(json.dumps({u'results': {u'success': True}}),433 return HttpResponse(json.dumps({u'results': {u'success': True}}),
432 {u'Content-Type': u'application/json'})434 {u'Content-Type': u'application/json'})
433435
434436
=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py 2012-01-30 17:44:37 +0000
+++ openlp/plugins/remotes/lib/remotetab.py 2012-03-18 08:20:24 +0000
@@ -27,7 +27,7 @@
2727
28from PyQt4 import QtCore, QtGui, QtNetwork28from PyQt4 import QtCore, QtGui, QtNetwork
2929
30from openlp.core.lib import SettingsTab, translate30from openlp.core.lib import SettingsTab, translate, Receiver
3131
32ZERO_URL = u'0.0.0.0'32ZERO_URL = u'0.0.0.0'
3333
@@ -160,12 +160,20 @@
160 self.setUrls()160 self.setUrls()
161161
162 def save(self):162 def save(self):
163 changed = False
164 if QtCore.QSettings().value(self.settingsSection + u'/ip address',
165 QtCore.QVariant(ZERO_URL).toString() != self.addressEdit.text() or
166 QtCore.QSettings().value(self.settingsSection + u'/port',
167 QtCore.QVariant(4316).toInt()[0]) != self.portSpinBox.value()):
168 changed = True
163 QtCore.QSettings().setValue(self.settingsSection + u'/port',169 QtCore.QSettings().setValue(self.settingsSection + u'/port',
164 QtCore.QVariant(self.portSpinBox.value()))170 QtCore.QVariant(self.portSpinBox.value()))
165 QtCore.QSettings().setValue(self.settingsSection + u'/ip address',171 QtCore.QSettings().setValue(self.settingsSection + u'/ip address',
166 QtCore.QVariant(self.addressEdit.text()))172 QtCore.QVariant(self.addressEdit.text()))
167 QtCore.QSettings().setValue(self.settingsSection + u'/twelve hour',173 QtCore.QSettings().setValue(self.settingsSection + u'/twelve hour',
168 QtCore.QVariant(self.twelveHour))174 QtCore.QVariant(self.twelveHour))
175 if changed:
176 Receiver.send_message(u'remotes_config_updated')
169177
170 def onTwelveHourCheckBoxChanged(self, check_state):178 def onTwelveHourCheckBoxChanged(self, check_state):
171 self.twelveHour = False179 self.twelveHour = False
172180
=== modified file 'openlp/plugins/remotes/remoteplugin.py'
--- openlp/plugins/remotes/remoteplugin.py 2011-12-27 10:33:55 +0000
+++ openlp/plugins/remotes/remoteplugin.py 2012-03-18 08:20:24 +0000
@@ -86,3 +86,11 @@
86 self.textStrings[StringContent.VisibleName] = {86 self.textStrings[StringContent.VisibleName] = {
87 u'title': translate('RemotePlugin', 'Remote', 'container title')87 u'title': translate('RemotePlugin', 'Remote', 'container title')
88 }88 }
89
90 def configUpdated(self):
91 """
92 Called when Config is changed to restart the server on new address or
93 port
94 """
95 self.finalise()
96 self.initialise()