openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/dialogs into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Fix AmendThemeForm's parentage.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/dialogs/+merge/28110
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/dialogs into lp:openlp.

=== modified file 'openlp/core/ui/amendthemeform.py'
--- openlp/core/ui/amendthemeform.py	2010-06-19 18:29:08 +0000
+++ openlp/core/ui/amendthemeform.py	2010-06-21 20:13:28 +0000
@@ -37,9 +37,9 @@
 
 class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
 
-    def __init__(self, thememanager, parent=None):
+    def __init__(self, parent):
         QtGui.QDialog.__init__(self, parent)
-        self.thememanager = thememanager
+        self.thememanager = parent
         self.path = None
         self.theme = ThemeXML()
         self.setupUi(self)

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2010-06-19 20:21:36 +0000
+++ openlp/core/ui/thememanager.py	2010-06-21 20:13:28 +0000
@@ -66,7 +66,7 @@
             translate('ThemeManager', 'Delete a theme.'), self.onDeleteTheme)
         self.Toolbar.addSeparator()
         self.Toolbar.addToolbarButton(
-            translate('ThemeManager', 'Import Theme'), 
+            translate('ThemeManager', 'Import Theme'),
             u':/general/general_import.png',
             translate('ThemeManager', 'Import a theme.'), self.onImportTheme)
         self.Toolbar.addToolbarButton(
@@ -211,7 +211,7 @@
             else:
                 for plugin in self.parent.plugin_manager.plugins:
                     if not plugin.can_delete_theme(theme):
-                        QtGui.QMessageBox.critical(self, 
+                        QtGui.QMessageBox.critical(self,
                             translate('ThemeManager', 'Error'),
                             unicode(translate('ThemeManager',
                                 'Theme %s is use in %s plugin.')) % \
@@ -248,7 +248,7 @@
         """
         item = self.ThemeListWidget.currentItem()
         if item is None:
-            QtGui.QMessageBox.critical(self, 
+            QtGui.QMessageBox.critical(self,
                 translate('ThemeManager', 'Error'),
                 translate('ThemeManager', 'You have not selected a theme.'))
             return