From d7bd2c507404ed5cc990129e3157b61b76acf86e Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Mon, 21 Jun 2010 22:06:36 +0200 Subject: [PATCH] Fix up Theme form parentage. Some new lines? --- openlp/core/ui/amendthemeform.py | 4 ++-- openlp/core/ui/thememanager.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index 1439e711e..c85eff4b8 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -37,9 +37,9 @@ log = logging.getLogger(u'AmendThemeForm') 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) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 7849175a3..6da526af0 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -66,7 +66,7 @@ class ThemeManager(QtGui.QWidget): 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 @@ class ThemeManager(QtGui.QWidget): 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 @@ class ThemeManager(QtGui.QWidget): """ 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