Andreas Preikschat has proposed merging lp:~googol-hush/openlp/fixes into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #598393 in OpenLP: "After adding a new image to a selected (image) item
in the service manager it is not selected anymore"
https://bugs.launchpad.net/openlp/+bug/598393
Bug #719102 in OpenLP: "editing author after editing song causes traceback"
https://bugs.launchpad.net/openlp/+bug/719102
Bug #730979 in OpenLP: "Song export crashes"
https://bugs.launchpad.net/openlp/+bug/730979
Bug #738706 in OpenLP: "First Time Wizard fails when there is no internet
connection"
https://bugs.launchpad.net/openlp/+bug/738706
For more details, see:
https://code.launchpad.net/~googol-hush/openlp/fixes/+merge/54129
Hello,
- fixed Bug #738706 by simply creating the openlp directory (in tmp) even when
there is no internet connection
- fixed re running the wizard (when the "Finish" button was pressed, as the
wizard should not run again)
--
https://code.launchpad.net/~googol-hush/openlp/fixes/+merge/54129
Your team OpenLP Core is requested to review the proposed merge of
lp:~googol-hush/openlp/fixes into lp:openlp.
=== modified file 'openlp.pyw'
--- openlp.pyw 2011-03-14 06:48:23 +0000
+++ openlp.pyw 2011-03-20 17:19:31 +0000
@@ -173,7 +173,9 @@
has_run_wizard = QtCore.QSettings().value(
u'general/has run wizard', QtCore.QVariant(False)).toBool()
if not has_run_wizard:
- FirstTimeForm(screens).exec_()
+ if FirstTimeForm(screens).exec_() == QtGui.QDialog.Accepted:
+ QtCore.QSettings().setValue(u'general/has run wizard',
+ QtCore.QVariant(True))
if os.name == u'nt':
self.setStyleSheet(application_stylesheet)
show_splash = QtCore.QSettings().value(
=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py 2011-03-17 16:12:59 +0000
+++ openlp/core/ui/firsttimeform.py 2011-03-20 17:19:31 +0000
@@ -33,7 +33,8 @@
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, PluginStatus, Receiver, build_icon
+from openlp.core.lib import translate, PluginStatus, Receiver, build_icon, \
+ check_directory_exists
from openlp.core.utils import get_web_page, AppLocation
from firsttimewizard import Ui_FirstTimeWizard, FirstTimePage
@@ -60,8 +61,7 @@
self.downloading = unicode(translate('OpenLP.FirstTimeWizard',
'Downloading %s...'))
QtCore.QObject.connect(self,
- QtCore.SIGNAL(u'currentIdChanged(int)'),
- self.onCurrentIdChanged)
+ QtCore.SIGNAL(u'currentIdChanged(int)'), self.onCurrentIdChanged)
def exec_(self, edit=False):
"""
@@ -75,6 +75,7 @@
Set up display at start of theme edit.
"""
self.restart()
+ check_directory_exists(os.path.join(gettempdir(), u'openlp'))
# Sort out internet access for downloads
if self.webAccess:
songs = self.config.get(u'songs', u'languages')
@@ -111,8 +112,6 @@
self.biblesTreeWidget.expandAll()
themes = self.config.get(u'themes', u'files')
themes = themes.split(u',')
- if not os.path.exists(os.path.join(gettempdir(), u'openlp')):
- os.makedirs(os.path.join(gettempdir(), u'openlp'))
for theme in themes:
title = self.config.get(u'theme_%s' % theme, u'title')
filename = self.config.get(u'theme_%s' % theme, u'filename')
@@ -294,8 +293,6 @@
if self.themeComboBox.currentIndex() != -1:
QtCore.QSettings().setValue(u'themes/global theme',
QtCore.QVariant(self.themeComboBox.currentText()))
- QtCore.QSettings().setValue(u'general/has run wizard',
- QtCore.QVariant(True))
def _setPluginStatus(self, field, tag):
status = PluginStatus.Active if field.checkState() \
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
