Headr656

openlp/core/lib/mediamanageritem.py

@@ -377,7 +377,6 @@ class MediaManagerItem(QtGui.QWidget):
         service_item = self.buildServiceItem()
         if service_item:
             service_item.fromPlugin = True
-            service_item.uuid = unicode(uuid.uuid1())
             self.parent.live_controller.addServiceItem(service_item)
 
     def onAddClick(self):

openlp/core/ui/generaltab.py

@@ -151,7 +151,7 @@ class GeneralTab(SettingsTab):
         self.AutoOpenCheckBox.setText(self.trUtf8(u'Automatically open the last service'))
         self.ShowSplashCheckBox.setText(self.trUtf8(u'Show the splash screen'))
         self.SettingsGroupBox.setTitle(self.trUtf8(u'Application Settings'))
-        self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Sevice before starting New'))
+        self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Service before starting New'))
         self.CCLIGroupBox.setTitle(self.trUtf8(u'CCLI Details'))
         self.NumberLabel.setText(self.trUtf8(u'CCLI Number:'))
         self.UsernameLabel.setText(self.trUtf8(u'SongSelect Username:'))

openlp/core/ui/thememanager.py

@@ -430,6 +430,7 @@ class ThemeManager(QtGui.QWidget):
         log.debug(u'generateAndSaveImage %s %s %s', dir, name, theme_xml)
         theme = ThemeXML()
         theme.parse(theme_xml)
+        self.cleanTheme(theme)
         theme.extend_image_filename(dir)
         frame = self.generateImage(theme)
         samplepathname = os.path.join(self.path, name + u'.png')

openlp/plugins/bibles/lib/manager.py

@@ -173,14 +173,14 @@ class BibleManager(object):
             nbible.save_meta(u'WEB', biblesource)
             # store the web id of the bible
             nbible.save_meta(u'bibleid', bibleid)
-            if proxyurl and proxyurl != u'':
+            if proxyurl:
                 # store the proxy URL
                 nbible.save_meta(u'proxy', proxyurl)
                 nhttp.set_proxy(proxyurl)
-            if proxyid and proxyid != u'':
+            if proxyid:
                 # store the proxy userid
                 nbible.save_meta(u'proxyid', proxyid)
-            if proxypass and proxypass != u'':
+            if proxypass:
                 # store the proxy password
                 nbible.save_meta(u'proxypass', proxypass)
             return True

version.txt

@@ -1 +1 @@
-1.9.0-655
+1.9.0-656