diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 0eb0c866f..b12a27f1d 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -118,6 +118,7 @@ class ServiceItem(object): self.from_service = False self.image_border = u'#000000' self.background_audio = [] + self.theme_overwritten = False self._new_item() def _new_item(self): @@ -273,7 +274,8 @@ class ServiceItem(object): u'start_time': self.start_time, u'end_time': self.end_time, u'media_length': self.media_length, - u'background_audio': self.background_audio + u'background_audio': self.background_audio, + u'theme_overwritten': self.theme_overwritten } service_data = [] if self.service_item_type == ServiceItemType.Text: @@ -323,6 +325,7 @@ class ServiceItem(object): self.media_length = header[u'media_length'] if u'background_audio' in header: self.background_audio = header[u'background_audio'] + self.theme_overwritten = header.get(u'theme_overwritten', False) if self.service_item_type == ServiceItemType.Text: for slide in serviceitem[u'serviceitem'][u'data']: self._raw_frames.append(slide) @@ -484,6 +487,7 @@ class ServiceItem(object): ``theme`` The new theme to be replaced in the service item """ + self.theme_overwritten = (theme == None) self.theme = theme self._new_item() self.render() diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py index f4a732fb6..8216d3e7a 100644 --- a/openlp/core/ui/aboutdialog.py +++ b/openlp/core/ui/aboutdialog.py @@ -123,7 +123,7 @@ class Ui_AboutDialog(object): testers = [u'Philip "Phill" Ridout', u'Wesley "wrst" Stout', u'John "jseagull1" Cegalis (lead)'] packagers = ['Thomas "tabthorpe" Abthorpe (FreeBSD)', - u'Tim "TRB143" Bentley (Fedora)', + u'Tim "TRB143" Bentley (Fedora and Android)', u'Matthias "matthub" Hub (Mac OS X)', u'Stevan "ElderP" Pettit (Windows)', u'Raoul "superfly" Snyman (Ubuntu)'] diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py index 522c354b8..acbe103a7 100644 --- a/openlp/plugins/remotes/lib/httpserver.py +++ b/openlp/plugins/remotes/lib/httpserver.py @@ -411,7 +411,7 @@ class HttpConnection(object): ``action`` This is the action, either ``hide`` or ``show``. """ - event = u'maindisplay_%s' % action + event = u'live_display_%s' % action Receiver.send_message(event, HideMode.Blank) return HttpResponse(json.dumps({u'results': {u'success': True}}), {u'Content-Type': u'application/json'})