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

Cleaned up some code

Browse Source
This commit is contained in:
Stevan Pettit 2011-09-05 09:03:30 -04:00
parent 30c09f9b4b
commit b90796da45
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
openlp/core/ui/mainwindow.py
View File

@ -988,22 +988,21 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.cleanUp() self.cleanUp()
QtCore.QCoreApplication.exit() QtCore.QCoreApplication.exit()
def onSettingsExportItemClicked(self, exportFileName=None): def onSettingsExportItemClicked(self):
""" """
Export settings to an INI file Export settings to a .conf file in INI format
""" """
if not exportFileName: export_file_name = unicode(QtGui.QFileDialog.getSaveFileName(self,
exportFileName = unicode(QtGui.QFileDialog.getSaveFileName(self, translate('OpenLP.MainWindow', 'Export Settings File'), '',
translate('OpenLP.MainWindow', 'Export Settings File'), '', translate('OpenLP.MainWindow',
translate('OpenLP.MainWindow', 'OpenLP Export Settings File (*.conf)')))
'OpenLP Export Settings File (*.conf)'))) if not export_file_name:
if not exportFileName:
return return
# Make sure it's an .ini file. # Make sure it's a .conf file.
if not exportFileName.endswith(u'conf'): if not export_file_name.endswith(u'conf'):
exportFileName = exportFileName + u'.conf' export_file_name = export_file_name + u'.conf'
temp_file = os.path.join(unicode(gettempdir()), temp_file = os.path.join(unicode(gettempdir()),
u'openlp', u'exportIni.tmp') u'openlp', u'exportConf.tmp')
self.saveSettings() self.saveSettings()
setting_sections = [] setting_sections = []
# Add main sections. # Add main sections.
@ -1020,8 +1019,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
# Delete old files if found. # Delete old files if found.
if os.path.exists(temp_file): if os.path.exists(temp_file):
os.remove(temp_file) os.remove(temp_file)
if os.path.exists(exportFileName): if os.path.exists(export_file_name):
os.remove(exportFileName) os.remove(export_file_name)
settings = QtCore.QSettings() settings = QtCore.QSettings()
settings.remove(self.headerSection) settings.remove(self.headerSection)
# Get the settings. # Get the settings.
@ -1029,7 +1028,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
export_settings = QtCore.QSettings(temp_file, export_settings = QtCore.QSettings(temp_file,
QtCore.QSettings.IniFormat) QtCore.QSettings.IniFormat)
# Add a header section. # Add a header section.
# This is to insure it's our ini file for import. # This is to insure it's our conf file for import.
now = datetime.now() now = datetime.now()
application_version = get_application_version() application_version = get_application_version()
# Write INI format using Qsettings. # Write INI format using Qsettings.
@ -1050,18 +1049,18 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
section_key = u'servicemanager/' + key section_key = u'servicemanager/' + key
export_settings.setValue(section_key, key_value) export_settings.setValue(section_key, key_value)
export_settings.sync() export_settings.sync()
# Temp INI file has been written. Blanks in keys are now '%20'. # Temp CONF file has been written. Blanks in keys are now '%20'.
# Read the temp file and output the user's INI file with blanks to # Read the temp file and output the user's CONF file with blanks to
# make it more readable. # make it more readable.
temp_ini = open(temp_file, u'r') temp_conf = open(temp_file, u'r')
export_ini = open(exportFileName, u'w') export_conf = open(export_file_name, u'w')
for file_record in temp_ini: for file_record in temp_conf:
file_record = file_record.replace(u'%20', u' ')
# Get rid of any invalid entries. # Get rid of any invalid entries.
if file_record.find(u'@Invalid()') == -1: if file_record.find(u'@Invalid()') == -1:
export_ini.write(file_record) file_record = file_record.replace(u'%20', u' ')
temp_ini.close() export_conf.write(file_record)
export_ini.close() temp_conf.close()
export_conf.close()
os.remove(temp_file) os.remove(temp_file)
return return