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

Fix up issues with merge proposal.

Browse Source
This commit is contained in:
Raoul Snyman 2011-03-11 17:18:51 +02:00
parent 6db02c0ce1
commit b7aa0e4c70
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp.pyw
View File

@ -170,9 +170,9 @@ class OpenLP(QtGui.QApplication):
# Decide how many screens we have and their size # Decide how many screens we have and their size
screens = ScreenList(self.desktop()) screens = ScreenList(self.desktop())
# First time checks in settings # First time checks in settings
firstTime = QtCore.QSettings().value( has_run_wizard = QtCore.QSettings().value(
u'general/has run wizard', QtCore.QVariant(False)).toBool() u'general/has run wizard', QtCore.QVariant(False)).toBool()
if not firstTime: if not has_run_wizard:
FirstTimeForm(screens).exec_() FirstTimeForm(screens).exec_()
if os.name == u'nt': if os.name == u'nt':
self.setStyleSheet(application_stylesheet) self.setStyleSheet(application_stylesheet)

5
openlp/core/ui/firsttimeform.py
View File

@ -253,8 +253,9 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
translate('OpenLP.FirstTimeWizard', translate('OpenLP.FirstTimeWizard',
'Overwrite Existing Songs?'), 'Overwrite Existing Songs?'),
translate('OpenLP.FirstTimeWizard', 'Your songs ' translate('OpenLP.FirstTimeWizard', 'Your songs '
'database already exists, are you sure you want to ' 'database already exists and your current songs will '
'overwrite it?'), 'be permanently lost, are you sure you want to '
'replace it ?'),
QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, QtGui.QMessageBox.Yes | QtGui.QMessageBox.No,
QtGui.QMessageBox.No) != QtGui.QMessageBox.Yes: QtGui.QMessageBox.No) != QtGui.QMessageBox.Yes:
continue continue