raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

More minor fixes

Browse Source
This commit is contained in:
Philip Ridout 2012-03-10 16:14:07 +00:00
parent 7d7e76fd9b
commit 24b817cccf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/ui/thememanager.py
View File

@ -513,9 +513,9 @@ class ThemeManager(QtGui.QWidget):
def overWriteMessageBox(self, theme_name): def overWriteMessageBox(self, theme_name):
ret = QtGui.QMessageBox.question(self, ret = QtGui.QMessageBox.question(self,
translate('OpenLP.ThemeManager', 'Theme Already Exists!'), translate('OpenLP.ThemeManager', 'Theme Already Exists.'),
translate('OpenLP.ThemeManager', translate('OpenLP.ThemeManager',
'The theme %s already exists. Do you want to replace it?' 'Theme %s already exists. Do you want to replace it?'
% theme_name), % theme_name),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
QtGui.QMessageBox.No), QtGui.QMessageBox.No),
@ -617,7 +617,7 @@ class ThemeManager(QtGui.QWidget):
theme_folder = os.path.join(dir, theme_name) theme_folder = os.path.join(dir, theme_name)
theme_exists = os.path.exists(theme_folder) theme_exists = os.path.exists(theme_folder)
if theme_exists and not self.overWriteMessageBox(theme_name): if theme_exists and not self.overWriteMessageBox(theme_name):
return '', '', '', True return '', '', '', True
themedir = os.path.join(dir, theme_name) themedir = os.path.join(dir, theme_name)
check_directory_exists(themedir) check_directory_exists(themedir)
file_xml = unicode(zip.read(xml_file), u'utf-8') file_xml = unicode(zip.read(xml_file), u'utf-8')