diff --git a/copyright.txt b/copyright.txt
index 0fb988622..df5563844 100644
--- a/copyright.txt
+++ b/copyright.txt
@@ -7,7 +7,7 @@
# Copyright (c) 2008-2011 Raoul Snyman #
# Portions copyright (c) 2008-2011 Tim Bentley, Gerald Britton, Jonathan #
# Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, #
-# Armin Köhler, Joshua Millar, Stevan Pettit, Andreas Preikschat, Mattias #
+# 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 #
# --------------------------------------------------------------------------- #
diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py
index 3c8bdfe71..82a30b19f 100644
--- a/openlp/core/__init__.py
+++ b/openlp/core/__init__.py
@@ -143,7 +143,7 @@ class OpenLP(QtGui.QApplication):
u'general/update check', QtCore.QVariant(True)).toBool()
if update_check:
VersionThread(self.mainWindow).start()
- Receiver.send_message(u'maindisplay_blank_check')
+ Receiver.send_message(u'live_display_blank_check')
self.mainWindow.appStartup()
DelayStartThread(self.mainWindow).start()
# Skip exec_() for gui tests
diff --git a/openlp/core/lib/eventreceiver.py b/openlp/core/lib/eventreceiver.py
index 7c0115f89..14b6126bc 100644
--- a/openlp/core/lib/eventreceiver.py
+++ b/openlp/core/lib/eventreceiver.py
@@ -35,200 +35,190 @@ log = logging.getLogger(__name__)
class EventReceiver(QtCore.QObject):
"""
- Class to allow events to be passed from different parts of the
- system. This is a private class and should not be used directly
- but rather via the Receiver class.
+ Class to allow events to be passed from different parts of the system. This
+ is a private class and should not be used directly but rather via the
+ Receiver class.
+
+ **Mainwindow related and generic signals**
+
+ ``mainwindow_status_text``
+ Changes the bottom status bar text on the mainwindow.
+
+ ``openlp_warning_message``
+ Displays a standalone Warning Message.
+
+ ``openlp_error_message``
+ Displays a standalone Error Message.
+
+ ``openlp_information_message``
+ Displays a standalone Information Message.
+
+ ``cursor_busy``
+ Makes the cursor got to a busy form.
+
+ ``cursor_normal``
+ Resets the cursor to default.
``openlp_process_events``
- Requests the Application to flush the events queue
+ Requests the Application to flush the events queue.
``openlp_version_check``
Version has changed so pop up window.
+ ``openlp_stop_wizard``
+ Stops a wizard before completion.
+
+ **Setting related signals**
+
``config_updated``
- Informs components the config has changed
+ Informs components that the config has changed.
``config_screen_changed``
- The display monitor has been changed
+ The display monitor has been changed.
- ``slidecontroller_{live|preview}_first``
- Moves to the first slide
+ **Slidecontroller signals**
``slidecontroller_{live|preview}_next``
- Moves to the next slide
+ Moves to the next slide.
``slidecontroller_{live|preview}_next_noloop``
- Moves to the next slide without auto advance
+ Moves to the next slide without auto advance.
``slidecontroller_{live|preview}_previous``
- Moves to the previous slide
+ Moves to the previous slide.
``slidecontroller_{live|preview}_previous_noloop``
- Moves to the previous slide, without auto advance
-
- ``slidecontroller_{live|preview}_last``
- Moves to the last slide
+ Moves to the previous slide, without auto advance.
``slidecontroller_{live|preview}_set``
- Moves to a specific slide, by index
+ Moves to a specific slide, by index.
``slidecontroller_{live|preview}_started``
- Broadcasts that an item has been made live/previewed
+ Broadcasts that an item has been made live/previewed.
``slidecontroller_{live|preview}_change``
Informs the slidecontroller that a slide change has occurred and to
- update itself
+ update itself.
``slidecontroller_{live|preview}_changed``
- Broadcasts that the slidecontroller has changed the current slide
-
- ``slidecontroller_{live|preview}_text_request``
- Request the text for the current item in the controller
- Returns a slidecontroller_{live|preview}_text_response with an
- array of dictionaries with the tag and verse text
+ Broadcasts that the slidecontroller has changed the current slide.
``slidecontroller_{live|preview}_blank``
- Request that the output screen is blanked
+ Request that the output screen is blanked.
``slidecontroller_{live|preview}_unblank``
- Request that the output screen is unblanked
+ Request that the output screen is unblanked.
``slidecontroller_live_spin_delay``
- Pushes out the loop delay
+ Pushes out the loop delay.
``slidecontroller_live_stop_loop``
- Stop the loop on the main display
+ Stop the loop on the main display.
+
+ **Servicemanager related signals**
``servicemanager_previous_item``
- Display the previous item in the service
+ Display the previous item in the service.
``servicemanager_preview_live``
- Requests a Preview item from the Service Manager to update live and
- add a new item to the preview panel
+ Requests a Preview item from the Service Manager to update live and add
+ a new item to the preview panel.
``servicemanager_next_item``
- Display the next item in the service
+ Display the next item in the service.
``servicemanager_set_item``
- Go live on a specific item, by index
-
- ``maindisplay_blank``
- Blank the maindisplay window
-
- ``maindisplay_hide``
- Hide the maindisplay window
-
- ``maindisplay_show``
- Return the maindisplay window
-
- ``maindisplay_active``
- The maindisplay has been made active
-
- ``maindisplay_status_text``
- Changes the bottom status bar text on the maindisplay window
-
- ``maindisplay_blank_check``
- Check to see if the blank display message is required
-
- ``videodisplay_start``
- Open a media item and prepare for playing
-
- ``videodisplay_play``
- Start playing a media item
-
- ``videodisplay_pause``
- Pause a media item
-
- ``videodisplay_stop``
- Stop playing a media item
-
- ``videodisplay_background``
- Replace the background video
-
- ``theme_update_list``
- send out message with new themes
-
- ``theme_update_global``
- Tell the components we have a new global theme
-
- ``{plugin}_start``
- Requests a plugin to start a external program
- Path and file provided in message
-
- ``{plugin}_first``
- Requests a plugin to handle a first event
-
- ``{plugin}_previous``
- Requests a plugin to handle a previous event
-
- ``{plugin}_next``
- Requests a plugin to handle a next event
-
- ``{plugin}_last``
- Requests a plugin to handle a last event
-
- ``{plugin}_slide``
- Requests a plugin to handle a go to specific slide event
-
- ``{plugin}_stop``
- Requests a plugin to handle a stop event
-
- ``{plugin}_blank``
- Requests a plugin to handle a blank screen event
-
- ``{plugin}_unblank``
- Requests a plugin to handle an unblank screen event
-
- ``{plugin}_edit``
- Requests a plugin edit a database item with the key as the payload
-
- ``{plugin}_edit_clear``
- Editing has been completed
-
- ``{plugin}_load_list``
- Tells the the plugin to reload the media manager list
-
- ``{plugin}_preview``
- Tells the plugin it's item can be previewed
-
- ``{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
+ Go live on a specific item, by index.
``service_item_update``
Passes back to the service manager the service item after it has been
- processed by the plugin
+ processed by the plugin.
+
+ **Display signals**
+
+ ``update_display_css``
+ CSS has been updated which needs to be changed on the main display.
+
+ **Live Display signals**
+
+ ``live_display_hide``
+ Hide the live display.
+
+ ``live_display_show``
+ Return the live display.
+
+ ``live_display_active``
+ The live display has been made active.
+
+ ``live_display_blank_check``
+ Check to see if the blank display message is required.
+
+ **Theme related singlas**
+
+ ``theme_update_list``
+ send out message with new themes.
+
+ ``theme_update_global``
+ Tell the components we have a new global theme.
+
+ **Plugin specific signals**
+
+ ``{plugin}_start``
+ Requests a plugin to start a external program. Path and file have to
+ be provided in the message.
+
+ ``{plugin}_first``
+ Requests a plugin to handle a first event.
+
+ ``{plugin}_previous``
+ Requests a plugin to handle a previous event.
+
+ ``{plugin}_next``
+ Requests a plugin to handle a next event.
+
+ ``{plugin}_last``
+ Requests a plugin to handle a last event.
+
+ ``{plugin}_slide``
+ Requests a plugin to handle a go to specific slide event.
+
+ ``{plugin}_stop``
+ Requests a plugin to handle a stop event.
+
+ ``{plugin}_blank``
+ Requests a plugin to handle a blank screen event.
+
+ ``{plugin}_unblank``
+ Requests a plugin to handle an unblank screen event.
+
+ ``{plugin}_edit``
+ Requests a plugin edit a database item with the key as the payload.
+
+ ``{plugin}_edit_clear``
+ Editing has been completed.
+
+ ``{plugin}_load_list``
+ Tells the the plugin to reload the media manager list.
+
+ ``{plugin}_preview``
+ Tells the plugin it's item can be previewed.
+
+ ``{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.
``alerts_text``
- Displays an alert message
+ Displays an alert message.
``bibles_nobook``
- Attempt to find book resulted in no match
-
- ``openlp_stop_wizard``
- Stops a wizard before completion
+ Attempt to find book resulted in no match.
``remotes_poll_request``
Waits for openlp to do something "interesting" and sends a
- remotes_poll_response signal when it does
-
- ``openlp_warning_message``
- Displays a standalone Warning Message
-
- ``openlp_error_message``
- Displays a standalone Error Message
-
- ``openlp_information_message``
- Displays a standalone Information Message
-
- ``cursor_busy``
- Makes the cursor got to a busy form
-
- ``cursor_normal``
- Resets the cursor to default
+ ``remotes_poll_response`` signal when it does.
"""
def __init__(self):
diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 8e31d8950..5dfe00d36 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -73,13 +73,7 @@ body {
#video2 {
z-index: 3;
}
-#alert {
- position: absolute;
- left: 0px;
- top: 0px;
- z-index: 10;
- %s
-}
+%s
#footer {
position: absolute;
z-index: 6;
@@ -179,7 +173,7 @@ sup {
break;
}
}
-
+ %s
function show_image(src){
var img = document.getElementById('image');
img.src = src;
@@ -225,34 +219,6 @@ sup {
}
}
- function show_alert(alerttext, position){
- var text = document.getElementById('alert');
- text.innerHTML = alerttext;
- if(alerttext == '') {
- text.style.visibility = 'hidden';
- return 0;
- }
- if(position == ''){
- position = getComputedStyle(text, '').verticalAlign;
- }
- switch(position)
- {
- case 'top':
- text.style.top = '0px';
- break;
- case 'middle':
- text.style.top = ((window.innerHeight - text.clientHeight) / 2)
- + 'px';
- break;
- case 'bottom':
- text.style.top = (window.innerHeight - text.clientHeight)
- + 'px';
- break;
- }
- text.style.visibility = 'visible';
- return text.clientHeight;
- }
-
function show_footer(footertext){
document.getElementById('footer').innerHTML = footertext;
}
@@ -316,14 +282,15 @@ sup {
%s
+%s
-