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:
  OpenLP Core (openlp-core)

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

Fix the impress flags to handle latest version of impress

Amend packaging infomation

Fix theme overriding so themes are preserved on edit ONLY if the theme was overridden.
-- 
https://code.launchpad.net/~trb143/openlp/bug-themes/+merge/81354
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-themes into 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-05 08:15:29 +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,8 @@
             self.media_length = header[u'media_length']
         if u'background_audio' in header:
             self.background_audio = header[u'background_audio']
+        if u'theme_overwritten' in header:
+            self.theme_overwritten = header[u'theme_overwritten']
         if self.service_item_type == ServiceItemType.Text:
             for slide in serviceitem[u'serviceitem'][u'data']:
                 self._raw_frames.append(slide)
@@ -484,6 +488,7 @@
         ``theme``
             The new theme to be replaced in the service item
         """
+        self.theme_overwritten = False if theme == None else True
         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-05 08:15:29 +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/core/utils/__init__.py'
--- openlp/core/utils/__init__.py	2011-09-20 23:08:46 +0000
+++ openlp/core/utils/__init__.py	2011-11-05 08:15:29 +0000
@@ -480,11 +480,12 @@
     Returns the UNO command to launch an openoffice.org instance.
     """
     COMMAND = u'soffice'
-    OPTIONS = u'-nologo -norestore -minimized -nodefault -nofirststartwizard'
+    OPTIONS = u'--nologo --norestore --minimized --nodefault' \
+            u' --nofirststartwizard'
     if UNO_CONNECTION_TYPE == u'pipe':
-        CONNECTION = u'"-accept=pipe,name=openlp_pipe;urp;"'
+        CONNECTION = u'"--accept=pipe,name=openlp_pipe;urp;"'
     else:
-        CONNECTION = u'"-accept=socket,host=localhost,port=2002;urp;"'
+        CONNECTION = u'"--accept=socket,host=localhost,port=2002;urp;"'
     return u'%s %s %s' % (COMMAND, OPTIONS, CONNECTION)
 
 def get_uno_instance(resolver):