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)


General fixups:
- Theme loading ordering - fixes an issue with song image backgrounds
- Settings dialog parenting
- Remove unused imports
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/13572
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2009-09-26 18:22:10 +0000
+++ openlp/core/lib/renderer.py	2009-10-19 15:05:23 +0000
@@ -561,8 +561,6 @@
         ``image2``
             Defaults to *None*. Another image to save to disk.
         """
-        im = image.toImage()
-        im.save(u'renderer.png', u'png')
+        image.save(u'renderer.png', u'png')
         if image2 is not None:
-            im = image2.toImage()
-            im.save(u'renderer2.png', u'png')
+            image2.save(u'renderer2.png', u'png')

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2009-10-17 19:14:39 +0000
+++ openlp/core/ui/mainwindow.py	2009-10-19 15:05:23 +0000
@@ -438,7 +438,7 @@
         self.mainDisplay = MainDisplay(self, screens)
         self.alertForm = AlertForm(self)
         self.aboutForm = AboutForm(self)
-        self.settingsForm = SettingsForm(self.screenList, self)
+        self.settingsForm = SettingsForm(self.screenList, self, self)
         # Set up the path with plugins
         pluginpath = os.path.split(os.path.abspath(__file__))[0]
         pluginpath = os.path.abspath(

=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py	2009-10-17 06:12:38 +0000
+++ openlp/core/ui/settingsform.py	2009-10-19 15:05:23 +0000
@@ -35,7 +35,7 @@
 class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
 
     def __init__(self, screen_list, mainWindow, parent=None):
-        QtGui.QDialog.__init__(self, None)
+        QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
         # General tab
         self.GeneralTab = GeneralTab(screen_list)

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2009-10-17 19:13:11 +0000
+++ openlp/core/ui/thememanager.py	2009-10-19 15:05:24 +0000
@@ -292,8 +292,8 @@
             xml = newtheme.extract_xml()
         theme = ThemeXML()
         theme.parse(xml)
+        self.cleanTheme(theme)
         theme.extend_image_filename(self.path)
-        self.cleanTheme(theme)
         return theme
 
     def checkThemesExists(self, dir):

=== modified file 'openlp/plugins/audit/forms/auditdetailform.py'
--- openlp/plugins/audit/forms/auditdetailform.py	2009-10-12 04:43:02 +0000
+++ openlp/plugins/audit/forms/auditdetailform.py	2009-10-19 15:05:24 +0000
@@ -25,8 +25,6 @@
 from PyQt4 import QtCore, QtGui
 
 from auditdetaildialog import Ui_AuditDetailDialog
-from openlp.core.lib import translate
-#from openlp.plugins.audit.lib.models import CustomSlide
 
 class AuditDetailForm(QtGui.QDialog, Ui_AuditDetailDialog):
     """