forked from openlp/openlp
Fix theme saving
This commit is contained in:
parent
f5e3c046df
commit
e9800d8ecc
@ -153,6 +153,7 @@ class ThemeManager(QtGui.QWidget):
|
|||||||
|
|
||||||
def onAddTheme(self):
|
def onAddTheme(self):
|
||||||
self.amendThemeForm.loadTheme(None)
|
self.amendThemeForm.loadTheme(None)
|
||||||
|
self.saveThemeName = u''
|
||||||
self.amendThemeForm.exec_()
|
self.amendThemeForm.exec_()
|
||||||
|
|
||||||
def onEditTheme(self):
|
def onEditTheme(self):
|
||||||
@ -160,6 +161,7 @@ class ThemeManager(QtGui.QWidget):
|
|||||||
if item is not None:
|
if item is not None:
|
||||||
self.amendThemeForm.loadTheme(
|
self.amendThemeForm.loadTheme(
|
||||||
unicode(item.data(QtCore.Qt.UserRole).toString()))
|
unicode(item.data(QtCore.Qt.UserRole).toString()))
|
||||||
|
self.saveThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
|
||||||
self.amendThemeForm.exec_()
|
self.amendThemeForm.exec_()
|
||||||
|
|
||||||
def onDeleteTheme(self):
|
def onDeleteTheme(self):
|
||||||
@ -412,8 +414,9 @@ class ThemeManager(QtGui.QWidget):
|
|||||||
os.mkdir(os.path.join(self.path, name))
|
os.mkdir(os.path.join(self.path, name))
|
||||||
theme_file = os.path.join(theme_dir, name + u'.xml')
|
theme_file = os.path.join(theme_dir, name + u'.xml')
|
||||||
log.debug(theme_file)
|
log.debug(theme_file)
|
||||||
|
|
||||||
result = QtGui.QMessageBox.Yes
|
result = QtGui.QMessageBox.Yes
|
||||||
|
print self.saveThemeName , name
|
||||||
|
if self.saveThemeName != name:
|
||||||
if os.path.exists(theme_file):
|
if os.path.exists(theme_file):
|
||||||
result = QtGui.QMessageBox.question(
|
result = QtGui.QMessageBox.question(
|
||||||
self,
|
self,
|
||||||
@ -421,6 +424,8 @@ class ThemeManager(QtGui.QWidget):
|
|||||||
translate(u'ThemeManager', u'A theme with this name already exists, would you like to overwrite it?'),
|
translate(u'ThemeManager', u'A theme with this name already exists, would you like to overwrite it?'),
|
||||||
(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
|
(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
|
||||||
QtGui.QMessageBox.No)
|
QtGui.QMessageBox.No)
|
||||||
|
else:
|
||||||
|
result == QtGui.QMessageBox.Yes
|
||||||
if result == QtGui.QMessageBox.Yes:
|
if result == QtGui.QMessageBox.Yes:
|
||||||
# Save the theme, overwriting the existing theme if necessary.
|
# Save the theme, overwriting the existing theme if necessary.
|
||||||
outfile = open(theme_file, u'w')
|
outfile = open(theme_file, u'w')
|
||||||
|
Loading…
Reference in New Issue
Block a user