From db025be243d82fc01e27262d03d69f08a7198bdf Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 21 Jul 2010 02:34:27 +0100 Subject: [PATCH] Do not rename when name has not changed --- openlp/core/ui/thememanager.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index bf4dabb2d..5f4b934c4 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -605,19 +605,21 @@ class ThemeManager(QtGui.QWidget): if newThemeIndex != -1: self.serviceComboBox.setCurrentIndex(newThemeIndex) if self.editingDefault: - newThemeItem = self.ThemeListWidget.findItems(name, - QtCore.Qt.MatchExactly)[0] - newThemeIndex = self.ThemeListWidget.indexFromItem( - newThemeItem).row() - self.global_theme = unicode( - self.ThemeListWidget.item(newThemeIndex).text()) - newName = unicode(translate('ThemeManager', '%s (default)')) % \ - self.global_theme - self.ThemeListWidget.item(newThemeIndex).setText(newName) - QtCore.QSettings().setValue( - self.settingsSection + u'/global theme', - QtCore.QVariant(self.global_theme)) - Receiver.send_message(u'theme_update_global', self.global_theme) + if self.saveThemeName != name: + newThemeItem = self.ThemeListWidget.findItems(name, + QtCore.Qt.MatchExactly)[0] + newThemeIndex = self.ThemeListWidget.indexFromItem( + newThemeItem).row() + self.global_theme = unicode( + self.ThemeListWidget.item(newThemeIndex).text()) + newName = unicode(translate('ThemeManager', + '%s (default)')) % self.global_theme + self.ThemeListWidget.item(newThemeIndex).setText(newName) + QtCore.QSettings().setValue( + self.settingsSection + u'/global theme', + QtCore.QVariant(self.global_theme)) + Receiver.send_message(u'theme_update_global', + self.global_theme) self.editingDefault = False self.pushThemes() else: