openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)

-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/14451
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2009-11-04 18:21:08 +0000
+++ openlp/core/lib/mediamanageritem.py	2009-11-05 00:30:27 +0000
@@ -377,7 +377,6 @@
         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):

=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py	2009-10-30 22:03:09 +0000
+++ openlp/core/ui/generaltab.py	2009-11-05 00:30:27 +0000
@@ -151,7 +151,7 @@
         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:'))

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2009-11-04 01:16:15 +0000
+++ openlp/core/ui/thememanager.py	2009-11-05 00:30:27 +0000
@@ -430,6 +430,7 @@
         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')

=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py	2009-11-03 19:01:53 +0000
+++ openlp/plugins/bibles/lib/manager.py	2009-11-05 00:30:27 +0000
@@ -173,14 +173,14 @@
             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