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

Modified code to use the directory choosen by user, don't append a sub-dir

Browse Source
This commit is contained in:
Stevan Pettit 2012-05-20 21:23:50 -04:00
parent cf0e8c184e
commit 0548bfb345
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -539,7 +539,7 @@ class AdvancedTab(SettingsTab):
log.warning(u'User requested data path set to default %s' log.warning(u'User requested data path set to default %s'
% self.currentDataPath) % self.currentDataPath)
self.dataDirectoryLabel.setText(os.path.abspath( self.dataDirectoryLabel.setText(os.path.abspath(
os.path.join(self.currentDataPath, u'..'))) self.currentDataPath))
self.defaultColorButton.setStyleSheet( self.defaultColorButton.setStyleSheet(
u'background-color: %s' % self.defaultColor) u'background-color: %s' % self.defaultColor)
@ -656,13 +656,12 @@ class AdvancedTab(SettingsTab):
""" """
old_root_path = unicode(self.dataDirectoryLabel.text()) old_root_path = unicode(self.dataDirectoryLabel.text())
# Get the new directory location. # Get the new directory location.
new_path = unicode(QtGui.QFileDialog.getExistingDirectory(self, new_data_path = unicode(QtGui.QFileDialog.getExistingDirectory(self,
translate('OpenLP.AdvancedTab', translate('OpenLP.AdvancedTab',
'Select Data Directory Location'), old_root_path, 'Select Data Directory Location'), old_root_path,
options = QtGui.QFileDialog.ShowDirsOnly)) options = QtGui.QFileDialog.ShowDirsOnly))
# Set the new data path. # Set the new data path.
new_data_path = os.path.join(new_path, 'openlp_data') if new_data_path:
if new_path:
if self.currentDataPath.lower() == new_data_path.lower(): if self.currentDataPath.lower() == new_data_path.lower():
self.onDataDirectoryCancelButtonClicked() self.onDataDirectoryCancelButtonClicked()
return return
@ -675,7 +674,7 @@ class AdvancedTab(SettingsTab):
'Are you sure you want to change the location of the OpenLP ' 'Are you sure you want to change the location of the OpenLP '
'data directory to:\n\n%s\n\n' 'data directory to:\n\n%s\n\n'
'The data directory will be changed when OpenLP is closed.' 'The data directory will be changed when OpenLP is closed.'
% new_path), % new_data_path),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Yes | QtGui.QMessageBox.Yes |
QtGui.QMessageBox.No), QtGui.QMessageBox.No),
@ -686,7 +685,7 @@ class AdvancedTab(SettingsTab):
self.checkDataOverwrite(new_data_path) self.checkDataOverwrite(new_data_path)
# Save the new location. # Save the new location.
Receiver.send_message(u'set_new_data_path', new_data_path) Receiver.send_message(u'set_new_data_path', new_data_path)
self.newDataDirectoryEdit.setText(new_path) self.newDataDirectoryEdit.setText(new_data_path)
self.dataDirectoryCancelButton.show() self.dataDirectoryCancelButton.show()
def onDataDirectoryDefaultButtonClicked(self): def onDataDirectoryDefaultButtonClicked(self):
@ -711,8 +710,7 @@ class AdvancedTab(SettingsTab):
self.checkDataOverwrite(new_data_path) self.checkDataOverwrite(new_data_path)
# Save the new location. # Save the new location.
Receiver.send_message(u'set_new_data_path', new_data_path) Receiver.send_message(u'set_new_data_path', new_data_path)
self.newDataDirectoryEdit.setText(os.path.abspath( self.newDataDirectoryEdit.setText(os.path.abspath(new_data_path))
os.path.join(new_data_path, u'..')))
self.dataDirectoryCancelButton.show() self.dataDirectoryCancelButton.show()
else: else:
# We cancel the change in case user changed their mind. # We cancel the change in case user changed their mind.
@ -740,7 +738,7 @@ class AdvancedTab(SettingsTab):
'The location you have selected \n\n%s\n\n' 'The location you have selected \n\n%s\n\n'
'appears to contain OpenLP data files. Do you wish to replace ' 'appears to contain OpenLP data files. Do you wish to replace '
'these files with the current data files?' 'these files with the current data files?'
% os.path.abspath(os.path.join(data_path, u'..'))), % os.path.abspath(data_path,)),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Yes | QtGui.QMessageBox.Yes |
QtGui.QMessageBox.No), QtGui.QMessageBox.No),

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

@ -1490,7 +1490,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
translate('OpenLP.MainWindow', translate('OpenLP.MainWindow',
'Copying OpenLP data to new data directory location - %s ' 'Copying OpenLP data to new data directory location - %s '
'- Please wait for copy to finish' '- Please wait for copy to finish'
% os.path.abspath(os.path.join(self.newDataPath, u'..')))) % self.newDataPath))
dir_util.copy_tree(old_data_path, self.newDataPath) dir_util.copy_tree(old_data_path, self.newDataPath)
log.info(u'Copy sucessful') log.info(u'Copy sucessful')
except (IOError, os.error, DistutilsFileError), why: except (IOError, os.error, DistutilsFileError), why: