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

Changed name of settings INI to conform to PortableApps Standards

Browse Source 
Disabled data path change when running portable
This commit is contained in:
Stevan Pettit 2012-05-14 23:17:20 -04:00
parent 2f38d55261
commit eb58ee10e8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/__init__.py
View File

@ -264,7 +264,7 @@ def main(args=None):
# Get location OpenLPPortable.ini # Get location OpenLPPortable.ini
app_path = AppLocation.get_directory(AppLocation.AppDir) app_path = AppLocation.get_directory(AppLocation.AppDir)
portable_settings_file = os.path.abspath(os.path.join(app_path, u'..', portable_settings_file = os.path.abspath(os.path.join(app_path, u'..',
u'..', u'Data', u'settings', u'OpenLPPortable.ini')) u'..', u'Data', u'settings', u'OpenLP.ini'))
# Make this our settings file # Make this our settings file
log.info(u'INI file: %s' % portable_settings_file) log.info(u'INI file: %s' % portable_settings_file)
Settings.setFilename(portable_settings_file) Settings.setFilename(portable_settings_file)
@ -275,6 +275,7 @@ def main(args=None):
log.info(u'Data path: %s' % data_path) log.info(u'Data path: %s' % data_path)
# Point to our data path # Point to our data path
portable_settings.setValue(u'advanced/data path',data_path) portable_settings.setValue(u'advanced/data path',data_path)
portable_settings.setValue(u'advanced/is portable',True)
portable_settings.sync() portable_settings.sync()
else: else:
app.setApplicationName(u'OpenLP') app.setApplicationName(u'OpenLP')

3
openlp/core/ui/advancedtab.py
View File

@ -543,6 +543,9 @@ class AdvancedTab(SettingsTab):
os.path.join(self.currentDataPath, u'..'))) os.path.join(self.currentDataPath, u'..')))
self.defaultColorButton.setStyleSheet( self.defaultColorButton.setStyleSheet(
u'background-color: %s' % self.defaultColor) u'background-color: %s' % self.defaultColor)
# Don't allow data directory change if running portable
if Settings().contains(u'advanced/is portable'):
self.dataDirectoryGroupBox.hide()
def save(self): def save(self):
""" """