openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bugfixes1 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #637547 Editing a song in a loaded service file crashes
  https://bugs.launchpad.net/bugs/637547
  #637886 Replacing live video background with nothing live causes crash
  https://bugs.launchpad.net/bugs/637886
  #642778 enchant.DictNotFoundError: Dictionary for language 'ja_JP' could not be found
  https://bugs.launchpad.net/bugs/642778
  #656177 saved ppt file to order of service
  https://bugs.launchpad.net/bugs/656177


Fix for bug 656177.  Nice old bug pre alpha 1
Fix DnD not working post translation changes.
-- 
https://code.launchpad.net/~trb143/openlp/bugfixes1/+merge/37884
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugfixes1 into lp:openlp.

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2010-10-06 19:27:30 +0000
+++ openlp/core/lib/mediamanageritem.py	2010-10-07 18:01:11 +0000
@@ -96,7 +96,7 @@
         #TODO: plugin should not be the parent in future
         self.plugin = parent # plugin
         visible_title = self.plugin.getString(StringContent.VisibleName)
-        self.title = visible_title[u'title']
+        self.title = unicode(visible_title[u'title'])
         self.settingsSection = self.plugin.name.lower()
         if isinstance(icon, QtGui.QIcon):
             self.icon = icon

=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py	2010-10-05 16:09:48 +0000
+++ openlp/core/lib/plugin.py	2010-10-07 18:01:11 +0000
@@ -303,7 +303,7 @@
             The new name the plugin should now use.
         """
         pass
-     
+
     def getString(self, name):
         """
         encapsulate access of plugins translated text strings
@@ -314,4 +314,4 @@
         """
         Called to define all translatable texts of the plugin
         """
-        pass
\ No newline at end of file
+        pass

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2010-10-06 04:55:00 +0000
+++ openlp/core/lib/serviceitem.py	2010-10-07 18:01:11 +0000
@@ -101,9 +101,9 @@
         self.main = None
         self.footer = None
         self.bg_image_bytes = None
-        self._new_item()
         self.search_string = u''
         self.data_string = u''
+        self._new_item()
 
     def _new_item(self):
         """

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2010-10-06 20:30:49 +0000
+++ openlp/core/ui/servicemanager.py	2010-10-07 18:01:11 +0000
@@ -602,6 +602,7 @@
             zip = None
             file = None
             try:
+                write_list = []
                 zip = zipfile.ZipFile(unicode(filename), 'w')
                 for item in self.serviceItems:
                     service.append({u'serviceitem':item[u'service_item']
@@ -611,7 +612,10 @@
                             path_from = unicode(os.path.join(
                                 frame[u'path'],
                                 frame[u'title']))
-                            zip.write(path_from.encode(u'utf-8'))
+                            # On write a file once
+                            if not path_from in write_list:
+                                write_list.append(path_from)
+                                zip.write(path_from.encode(u'utf-8'))
                 file = open(servicefile, u'wb')
                 cPickle.dump(service, file)
                 file.close()