openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-themes into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman)

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-themes/+merge/82080

Amend packaging infomation

Fix theme overriding so themes are preserved on edit ONLY if the theme was overridden.

Fix missed signal rename
-- 
https://code.launchpad.net/~trb143/openlp/bug-themes/+merge/82080
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2011-10-16 14:40:46 +0000
+++ openlp/core/lib/serviceitem.py	2011-11-13 16:34:28 +0000
@@ -118,6 +118,7 @@
         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 @@
             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 @@
             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 @@
         ``theme``
             The new theme to be replaced in the service item
         """
+        self.theme_overwritten = (theme == None)
         self.theme = theme
         self._new_item()
         self.render()

=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py	2011-08-17 02:58:07 +0000
+++ openlp/core/ui/aboutdialog.py	2011-11-13 16:34:28 +0000
@@ -123,7 +123,7 @@
         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)']

=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
--- openlp/plugins/remotes/lib/httpserver.py	2011-10-01 12:04:09 +0000
+++ openlp/plugins/remotes/lib/httpserver.py	2011-11-13 16:34:28 +0000
@@ -411,7 +411,7 @@
         ``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'})