Andreas Preikschat has proposed merging lp:~googol-hush/openlp/trivial into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/58031
Hello,
- do not show the error message (saying that a theme with this name already
exists) when you "rename" a theme, but do not change the theme name
- fixed a bug, where a theme "lost" its background image when you renamed or
copied the theme
--
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/58031
Your team OpenLP Core is requested to review the proposed merge of
lp:~googol-hush/openlp/trivial into lp:openlp.
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py 2011-04-15 21:43:59 +0000
+++ openlp/core/ui/thememanager.py 2011-04-17 12:43:25 +0000
@@ -280,6 +280,8 @@
self.fileRenameForm.fileNameEdit.setText(oldThemeName)
if self.fileRenameForm.exec_():
newThemeName = unicode(self.fileRenameForm.fileNameEdit.text())
+ if oldThemeName == newThemeName:
+ return
if self.checkIfThemeExists(newThemeName):
oldThemeData = self.getThemeData(oldThemeName)
self.cloneThemeData(oldThemeData, newThemeName)
@@ -333,6 +335,7 @@
self.oldBackgroundImage = theme.background_filename
self.themeForm.theme = theme
self.themeForm.exec_(True)
+ self.oldBackgroundImage = None
def onDeleteTheme(self):
"""
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
