diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 7ac2a6f0a..c37336057 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -450,10 +450,10 @@ class MediaManagerItem(QtGui.QWidget):
self.trUtf8('You must select a existing service item to add to.'))
elif self.title.lower() == service_item.name.lower():
self.generateSlideData(service_item)
- self.parent.service_manager.addServiceItem(service_item)
+ self.parent.service_manager.addServiceItem(service_item,
+ replace=True)
else:
#Turn off the remote edit update message indicator
- self.parent.service_manager.remoteEditTriggered = False
QtGui.QMessageBox.information(self,
self.trUtf8('Invalid Service Item'),
self.trUtf8(unicode('You must select a %s service item.' % self.title)))
@@ -471,4 +471,4 @@ class MediaManagerItem(QtGui.QWidget):
if self.generateSlideData(service_item, item):
return service_item
else:
- return None
\ No newline at end of file
+ return None
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 92312429f..396989b22 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -46,25 +46,25 @@ class DisplayWidget(QtGui.QWidget):
self.parent = parent
self.hotkey_map = {
QtCore.Qt.Key_Return: 'servicemanager_next_item',
- QtCore.Qt.Key_Space: 'slidecontroller_live_next_noloop',
- QtCore.Qt.Key_Enter: 'slidecontroller_live_next_noloop',
+ QtCore.Qt.Key_Space: 'slidecontroller_live_go_next_noloop',
+ QtCore.Qt.Key_Enter: 'slidecontroller_live_go_next_noloop',
QtCore.Qt.Key_0: 'servicemanager_next_item',
- QtCore.Qt.Key_Backspace: 'slidecontroller_live_previous_noloop'}
+ QtCore.Qt.Key_Backspace: 'slidecontroller_live_go_previous_noloop'}
def keyPressEvent(self, event):
if type(event) == QtGui.QKeyEvent:
#here accept the event and do something
if event.key() == QtCore.Qt.Key_Up:
- Receiver.send_message(u'slidecontroller_live_previous')
+ Receiver.send_message(u'slidecontroller_go_live_previous')
event.accept()
elif event.key() == QtCore.Qt.Key_Down:
- Receiver.send_message(u'slidecontroller_live_next')
+ Receiver.send_message(u'slidecontroller_go_live_next')
event.accept()
elif event.key() == QtCore.Qt.Key_PageUp:
- Receiver.send_message(u'slidecontroller_live_first')
+ Receiver.send_message(u'slidecontroller_go_live_first')
event.accept()
elif event.key() == QtCore.Qt.Key_PageDown:
- Receiver.send_message(u'slidecontroller_live_last')
+ Receiver.send_message(u'slidecontroller_go_live_last')
event.accept()
elif event.key() in self.hotkey_map:
Receiver.send_message(self.hotkey_map[event.key()])
@@ -113,9 +113,9 @@ class MainDisplay(DisplayWidget):
self.hasTransition = False
self.mediaBackground = False
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'slide_live_hide'), self.hideDisplay)
+ QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'slide_live_show'), self.showDisplay)
+ QtCore.SIGNAL(u'maindisplay_show'), self.showDisplay)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'slidecontroller_live_mediastart'), self.onMediaQueue)
@@ -191,7 +191,7 @@ class MainDisplay(DisplayWidget):
if not self.primary:
self.setVisible(True)
self.showFullScreen()
- Receiver.send_message(u'slide_live_active')
+ Receiver.send_message(u'maindisplay_active')
def addImageWithText(self, frame):
log.debug(u'addImageWithText')
@@ -284,25 +284,25 @@ class VideoWidget(QtGui.QWidget):
self.parent = parent
self.hotkey_map = {
QtCore.Qt.Key_Return: 'servicemanager_next_item',
- QtCore.Qt.Key_Space: 'slidecontroller_live_next_noloop',
- QtCore.Qt.Key_Enter: 'slidecontroller_live_next_noloop',
+ QtCore.Qt.Key_Space: 'slidecontroller_live_go_next_noloop',
+ QtCore.Qt.Key_Enter: 'slidecontroller_live_go_next_noloop',
QtCore.Qt.Key_0: 'servicemanager_next_item',
- QtCore.Qt.Key_Backspace: 'slidecontroller_live_previous_noloop'}
+ QtCore.Qt.Key_Backspace: 'slidecontroller_live_go_previous_noloop'}
def keyPressEvent(self, event):
if type(event) == QtGui.QKeyEvent:
#here accept the event and do something
if event.key() == QtCore.Qt.Key_Up:
- Receiver.send_message(u'slidecontroller_live_previous')
+ Receiver.send_message(u'slidecontroller_live_go_previous')
event.accept()
elif event.key() == QtCore.Qt.Key_Down:
- Receiver.send_message(u'slidecontroller_live_next')
+ Receiver.send_message(u'slidecontroller_live_go_next')
event.accept()
elif event.key() == QtCore.Qt.Key_PageUp:
- Receiver.send_message(u'slidecontroller_live_first')
+ Receiver.send_message(u'slidecontroller_live_go_first')
event.accept()
elif event.key() == QtCore.Qt.Key_PageDown:
- Receiver.send_message(u'slidecontroller_live_last')
+ Receiver.send_message(u'slidecontroller_live_go_last')
event.accept()
elif event.key() in self.hotkey_map:
Receiver.send_message(self.hotkey_map[event.key()])
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 11ba067b0..9f0370e95 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -105,7 +105,6 @@ class ServiceManager(QtGui.QWidget):
self.isNew = True
#Indicates if remoteTriggering is active. If it is the next addServiceItem call
#will replace the currently selected one.
- self.remoteEditTriggered = False
self.serviceNoteForm = ServiceNoteForm()
self.serviceItemEditForm = ServiceItemEditForm()
#start with the layout
@@ -187,8 +186,6 @@ class ServiceManager(QtGui.QWidget):
QtCore.SIGNAL(u'itemExpanded(QTreeWidgetItem*)'), self.expanded)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'theme_update_list'), self.updateThemeList)
- QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'servicemanager_edit_clear'), self.onRemoteEditClear)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'servicemanager_next_item'), self.nextItem)
QtCore.QObject.connect(Receiver.get_receiver(),
@@ -638,7 +635,7 @@ class ServiceManager(QtGui.QWidget):
#does not impact the saved song so True may also be valid
self.parent.serviceChanged(False, self.serviceName)
- def addServiceItem(self, item, rebuild=False, expand=True):
+ def addServiceItem(self, item, rebuild=False, expand=True, replace=False):
"""
Add a Service item to the list
@@ -648,10 +645,9 @@ class ServiceManager(QtGui.QWidget):
"""
sitem, count = self.findServiceItem()
item.render()
- if self.remoteEditTriggered:
+ if replace:
item.merge(self.serviceItems[sitem][u'service_item'])
self.serviceItems[sitem][u'service_item'] = item
- self.remoteEditTriggered = False
self.repaintServiceList(sitem + 1, 0)
self.parent.LiveController.replaceServiceManagerItem(item)
else:
@@ -694,8 +690,6 @@ class ServiceManager(QtGui.QWidget):
if item == -1:
return False
else:
- #Switch on remote edit update functionality.
- self.remoteEditTriggered = True
return self.serviceItems[item][u'service_item']
def makeLive(self):
@@ -725,9 +719,6 @@ class ServiceManager(QtGui.QWidget):
self.serviceItems[item][u'service_item'].name, u'L:%s' %
self.serviceItems[item][u'service_item'].editId )
- def onRemoteEditClear(self):
- self.remoteEditTriggered = False
-
def findServiceItem(self):
"""
Finds a ServiceItem in the list
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 1d36bbdb7..2f31642c9 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -197,7 +197,7 @@ class SlideController(QtGui.QWidget):
u'Hide screen', u':/slides/slide_desktop.png',
self.trUtf8('Hide Screen'), self.onHideDisplay, True)
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'slide_live_blank'), self.blankScreen)
+ QtCore.SIGNAL(u'maindisplay_blank'), self.blankScreen)
if not self.isLive:
self.Toolbar.addToolbarSeparator(u'Close Separator')
self.Toolbar.addToolbarButton(
@@ -318,7 +318,7 @@ class SlideController(QtGui.QWidget):
QtCore.SIGNAL(u'slidecontroller_%s_go_first' % self.type_prefix),
self.onSlideSelectedFirst)
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'%slidecontroller_s_go_next' % self.type_prefix),
+ QtCore.SIGNAL(u'slidecontroller_%s_go_next' % self.type_prefix),
self.onSlideSelectedNext)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'slidecontroller_%s_go_previous' % self.type_prefix),
@@ -562,10 +562,9 @@ class SlideController(QtGui.QWidget):
"""
if not self.serviceItem:
return
+ Receiver.send_message(u'slidecontroller_first',
+ [self.serviceItem, self.isLive])
if self.serviceItem.is_command():
- Receiver.send_message(u'slidecontroller_%s_first' %
- self.type_prefix,
- self.serviceItem.name.lower(), self.isLive)
self.updatePreview()
else:
self.PreviewListWidget.selectRow(0)
@@ -704,8 +703,8 @@ class SlideController(QtGui.QWidget):
"""
if not self.serviceItem:
return
- Receiver.send_message(u'slidecontroller_%s_previous' %
- self.type_prefix, [self.serviceItem])
+ Receiver.send_message(u'slidecontroller_previous',
+ [self.serviceItem, self.isLive])
if self.serviceItem.is_command():
self.updatePreview()
else:
@@ -756,8 +755,9 @@ class SlideController(QtGui.QWidget):
def onEditSong(self):
self.songEdit = True
- Receiver.send_message(u'slidecontroller_edit',
- [self.serviceItem])
+ Receiver.send_message(u'%s_edit' %
+ self.serviceItem.name.lower(), u'L:%s' %
+ self.serviceItem.editId)
def onGoLive(self):
"""
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 2867ed84b..a651c6211 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -147,8 +147,7 @@ class ThemeManager(QtGui.QWidget):
name = u'%s (%s)' % (self.global_theme, self.trUtf8('default'))
self.ThemeListWidget.item(count).setText(name)
self.config.set_config(u'global theme', self.global_theme)
- Receiver.send_message(
- u'theme_update_global', self.global_theme)
+ Receiver.send_message(u'theme_update_global', self.global_theme)
self.pushThemes()
def onAddTheme(self):
@@ -564,4 +563,4 @@ class ThemeManager(QtGui.QWidget):
theme.font_main_y = int(theme.font_main_y.strip())
#theme.theme_mode
theme.theme_name = theme.theme_name.strip()
- #theme.theme_version
\ No newline at end of file
+ #theme.theme_version
diff --git a/openlp/plugins/alerts/lib/alertsmanager.py b/openlp/plugins/alerts/lib/alertsmanager.py
index 7f3d7a654..7ca7fe084 100644
--- a/openlp/plugins/alerts/lib/alertsmanager.py
+++ b/openlp/plugins/alerts/lib/alertsmanager.py
@@ -44,9 +44,9 @@ class AlertsManager(QtCore.QObject):
self.timer_id = 0
self.alertList = []
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'slide_live_active'), self.generateAlert)
+ QtCore.SIGNAL(u'maindisplay_active'), self.generateAlert)
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'alert_text'), self.displayAlert)
+ QtCore.SIGNAL(u'alerts_text'), self.displayAlert)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'config_screen_changed'), self.screenChanged)
diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py
index ff757d638..eff6bc835 100644
--- a/openlp/plugins/custom/forms/editcustomform.py
+++ b/openlp/plugins/custom/forms/editcustomform.py
@@ -135,7 +135,7 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
self.previewButton.setVisible(True)
def closePressed(self):
- Receiver.send_message(u'servicemanager_edit_clear')
+ Receiver.send_message(u'custom_edit_clear')
self.close()
def accept(self):
diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index a22c211e6..c79452c20 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -60,7 +60,7 @@ class CustomMediaItem(MediaManagerItem):
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'custom_edit'), self.onRemoteEdit)
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'servicemanager_edit_clear' ), self.onRemoteEditClear)
+ QtCore.SIGNAL(u'custom_edit_clear' ), self.onRemoteEditClear)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'custom_load_list'), self.initialise)
QtCore.QObject.connect(Receiver.get_receiver(),
diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index beede4019..37bfa564d 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -55,7 +55,7 @@ class Controller(object):
self.doc.start_presentation()
if isBlank:
self.blank()
- Receiver.send_message(u'live_slide_hide')
+ Receiver.send_message(u'maindisplay_hide')
self.doc.slidenumber = 0
def activate(self):
@@ -144,7 +144,7 @@ class Controller(object):
"""
log.debug(u'Live = %s, shutdown' % self.isLive)
if self.isLive:
- Receiver.send_message(u'live_slide_show')
+ Receiver.send_message(u'maindisplay_show')
self.doc.close_presentation()
self.doc = None
#self.doc.slidenumber = 0
@@ -283,7 +283,7 @@ class MessageListener(object):
if name != u'presentation':
return
if isLive:
- Receiver.send_message(u'slide_live_show')
+ Receiver.send_message(u'maindisplay_show')
self.liveHandler.shutdown()
else:
self.previewHandler.shutdown()
diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py
index 4e01e43ee..ede72c954 100644
--- a/openlp/plugins/remotes/remoteplugin.py
+++ b/openlp/plugins/remotes/remoteplugin.py
@@ -73,10 +73,12 @@ class RemotesPlugin(Plugin):
pos = datagram.find(u':')
event = unicode(datagram[:pos].lower())
if event == u'alert':
- Receiver.send_message(u'alert_text', unicode(datagram[pos + 1:]))
- if event == u'next_slide':
- Receiver.send_message(u'live_slide_next')
-
+ Receiver.send_message(u'alerts_text', unicode(datagram[pos + 1:]))
+ elif event == u'next_slide':
+ Receiver.send_message(u'slidecontroller_live_go_next')
+ else:
+ Receiver.send_message(event, unicode(datagram[pos + 1:]))
+
def about(self):
about_text = self.trUtf8('Remote Plugin
This plugin '
'provides the ability to send messages to a running version of '
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 176e3c2f6..45940623e 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -467,7 +467,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
Receiver.send_message(u'songs_preview')
def closePressed(self):
- Receiver.send_message(u'servicemanager_edit_clear')
+ Receiver.send_message(u'songs_edit_clear')
self.close()
def accept(self):
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index fabf1cc64..fb3f9c3e0 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -130,7 +130,7 @@ class SongMediaItem(MediaManagerItem):
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'songs_edit'), self.onRemoteEdit)
QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'servicemanager_edit_clear'), self.onRemoteEditClear)
+ QtCore.SIGNAL(u'songs_edit_clear'), self.onRemoteEditClear)
def configUpdated(self):
self.searchAsYouType = str_to_bool(