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

Fixed code per comments. Fixed misc syntax errors.

This commit is contained in:
Stevan Pettit 2012-05-10 19:23:45 -04:00
parent 3f62cc16bb
commit cf0e8c184e
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,14 +160,14 @@ class AdvancedTab(SettingsTab):
# Data Directory # Data Directory
self.dataDirectoryGroupBox = QtGui.QGroupBox(self.leftColumn) self.dataDirectoryGroupBox = QtGui.QGroupBox(self.leftColumn)
self.dataDirectoryGroupBox.setObjectName(u'dataDirectoryGroupBox') self.dataDirectoryGroupBox.setObjectName(u'dataDirectoryGroupBox')
self.dataDirectoryLayout =QtGui.QFormLayout(self.dataDirectoryGroupBox) self.dataDirectoryLayout = QtGui.QFormLayout(self.dataDirectoryGroupBox)
self.dataDirectoryLayout.setObjectName(u'dataDirectoryLayout') self.dataDirectoryLayout.setObjectName(u'dataDirectoryLayout')
self.dataDirectoryCurrentLabel= QtGui.QLabel(self.dataDirectoryGroupBox) self.dataDirectoryCurrentLabel = QtGui.QLabel(self.dataDirectoryGroupBox)
self.dataDirectoryCurrentLabel.setObjectName( self.dataDirectoryCurrentLabel.setObjectName(
u'dataDirectoryCurrentLabel') u'dataDirectoryCurrentLabel')
self.dataDirectoryLabel= QtGui.QLabel(self.dataDirectoryGroupBox) self.dataDirectoryLabel = QtGui.QLabel(self.dataDirectoryGroupBox)
self.dataDirectoryLabel.setObjectName(u'dataDirectoryLabel') self.dataDirectoryLabel.setObjectName(u'dataDirectoryLabel')
self.dataDirectoryNewLabel= QtGui.QLabel(self.dataDirectoryGroupBox) self.dataDirectoryNewLabel = QtGui.QLabel(self.dataDirectoryGroupBox)
self.dataDirectoryNewLabel.setObjectName(u'dataDirectoryCurrentLabel') self.dataDirectoryNewLabel.setObjectName(u'dataDirectoryCurrentLabel')
self.newDataDirectoryEdit = QtGui.QLineEdit(self.dataDirectoryGroupBox) self.newDataDirectoryEdit = QtGui.QLineEdit(self.dataDirectoryGroupBox)
self.newDataDirectoryEdit.setObjectName(u'newDataDirectoryEdit') self.newDataDirectoryEdit.setObjectName(u'newDataDirectoryEdit')
@ -512,12 +512,12 @@ class AdvancedTab(SettingsTab):
# Since data location can be changed, make sure the path is present. # Since data location can be changed, make sure the path is present.
self.currentDataPath = AppLocation.get_data_path() self.currentDataPath = AppLocation.get_data_path()
if not os.path.exists(self.currentDataPath): if not os.path.exists(self.currentDataPath):
log.exception(u'Data path not found %s' % self.currentDataPath) log.error(u'Data path not found %s' % self.currentDataPath)
answer = QtGui.QMessageBox.critical(self, answer = QtGui.QMessageBox.critical(self,
translate('OpenLP.AdvancedTab', translate('OpenLP.AdvancedTab',
'Data Directory Error'), 'Data Directory Error'),
translate('OpenLP.AdvancedTab', translate('OpenLP.AdvancedTab',
'OpenLP data directory was not found \n\n %s \n\n' 'OpenLP data directory was not found\n\n%s\n\n'
'This data directory was previously changed from the OpenLP ' 'This data directory was previously changed from the OpenLP '
'default location. If the new location was on removable ' 'default location. If the new location was on removable '
'media, that media needs to be made available.\n\n' 'media, that media needs to be made available.\n\n'
@ -530,13 +530,13 @@ class AdvancedTab(SettingsTab):
QtGui.QMessageBox.No), QtGui.QMessageBox.No),
QtGui.QMessageBox.No) QtGui.QMessageBox.No)
if answer == QtGui.QMessageBox.No: if answer == QtGui.QMessageBox.No:
log.exception(u'User requested termination') log.info(u'User requested termination')
Receiver.send_message(u'cleanup') Receiver.send_message(u'cleanup')
sys.exit() sys.exit()
# Set data location to default. # Set data location to default.
settings.remove(u'advanced/data path') settings.remove(u'advanced/data path')
self.currentDataPath = AppLocation.get_data_path() self.currentDataPath = AppLocation.get_data_path()
log.exception(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'..'))) os.path.join(self.currentDataPath, u'..')))
@ -654,12 +654,12 @@ class AdvancedTab(SettingsTab):
""" """
Browse for a new data directory location. Browse for a new data directory location.
""" """
old_root_path = unicode(str(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_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') new_data_path = os.path.join(new_path, 'openlp_data')
if new_path: if new_path:
@ -673,7 +673,7 @@ class AdvancedTab(SettingsTab):
translate('OpenLP.AdvancedTab', 'Confirm Data Directory Change'), translate('OpenLP.AdvancedTab', 'Confirm Data Directory Change'),
translate('OpenLP.AdvancedTab', translate('OpenLP.AdvancedTab',
'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_path),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(
@ -700,7 +700,7 @@ class AdvancedTab(SettingsTab):
translate('OpenLP.AdvancedTab', 'Reset Data Directory'), translate('OpenLP.AdvancedTab', 'Reset Data Directory'),
translate('OpenLP.AdvancedTab', translate('OpenLP.AdvancedTab',
'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 the default location? \n\n' 'data directory to the default location?\n\n'
'This location will be used after OpenLP is closed.'), 'This location will be used after OpenLP is closed.'),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Yes | QtGui.QMessageBox.Yes |
@ -737,7 +737,7 @@ class AdvancedTab(SettingsTab):
translate('OpenLP.AdvancedTab', 'Overwrite Existing Data'), translate('OpenLP.AdvancedTab', 'Overwrite Existing Data'),
translate('OpenLP.AdvancedTab', translate('OpenLP.AdvancedTab',
'WARNING: \n\n' 'WARNING: \n\n'
'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(os.path.join(data_path, u'..'))),

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

@ -1479,7 +1479,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
def changeDataDirectory(self): def changeDataDirectory(self):
log.info(u'Changing data path to %s' % self.newDataPath ) log.info(u'Changing data path to %s' % self.newDataPath )
old_data_path = unicode(str(AppLocation.get_data_path())) old_data_path = unicode(AppLocation.get_data_path())
# Copy OpenLP data to new location if requested. # Copy OpenLP data to new location if requested.
if self.copyData: if self.copyData:
log.info(u'Copying data to new path') log.info(u'Copying data to new path')
@ -1495,12 +1495,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
log.info(u'Copy sucessful') log.info(u'Copy sucessful')
except (IOError, os.error, DistutilsFileError), why: except (IOError, os.error, DistutilsFileError), why:
Receiver.send_message(u'cursor_normal') Receiver.send_message(u'cursor_normal')
log.exception(u'Data copy failed %s' % unicode(str(why))) log.exception(u'Data copy failed %s' % unicode(why))
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
translate('OpenLP.MainWindow', 'New Data Directory Error'), translate('OpenLP.MainWindow', 'New Data Directory Error'),
translate('OpenLP.MainWindow', translate('OpenLP.MainWindow',
'OpenLP Data directory copy failed \n\n %s' 'OpenLP Data directory copy failed\n\n%s'
% unicode(str(why))), % unicode(why)),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Ok)) QtGui.QMessageBox.Ok))
return False return False

4
openlp/core/utils/__init__.py
View File

@ -128,9 +128,9 @@ class AppLocation(object):
Return the path OpenLP stores all its data under. Return the path OpenLP stores all its data under.
""" """
# Check if we have a different data location. # Check if we have a different data location.
if QtCore.QSettings().contains("advanced/data path"): if QtCore.QSettings().contains(u'advanced/data path'):
path = unicode(QtCore.QSettings().value( path = unicode(QtCore.QSettings().value(
u'advanced/data path', QtCore.QVariant(u'')).toString()) u'advanced/data path').toString())
else: else:
path = AppLocation.get_directory(AppLocation.DataDir) path = AppLocation.get_directory(AppLocation.DataDir)
check_directory_exists(path) check_directory_exists(path)