openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Fixed some things from my last merge proposal.

This commit is contained in:
Raoul Snyman 2011-03-11 18:36:34 +02:00
parent b1b7b631fb
commit 648d33688a
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp.pyw
View File

@ -186,7 +186,7 @@ class OpenLP(QtGui.QApplication):
# start the main app window # start the main app window
self.appClipboard = self.clipboard() self.appClipboard = self.clipboard()
self.mainWindow = MainWindow(screens, app_version, self.appClipboard, self.mainWindow = MainWindow(screens, app_version, self.appClipboard,
firstTime) has_run_wizard)
self.mainWindow.show() self.mainWindow.show()
if show_splash: if show_splash:
# now kill the splashscreen # now kill the splashscreen
@ -271,11 +271,11 @@ def main():
# Now create and actually run the application. # Now create and actually run the application.
app = OpenLP(qt_args) app = OpenLP(qt_args)
# Define the settings environment # Define the settings environment
QtCore.QSettings(u'OpenLP', u'OpenLP') settings = QtCore.QSettings(u'OpenLP', u'OpenLP')
# First time checks in settings # First time checks in settings
# Use explicit reference as not inside a QT environment yet # Use explicit reference as not inside a QT environment yet
if QtCore.QSettings(u'OpenLP', u'OpenLP').value( if not settings.value(u'general/has run wizard',
u'general/first time', QtCore.QVariant(True)).toBool(): QtCore.QVariant(False)).toBool():
if not FirstTimeLanguageForm().exec_(): if not FirstTimeLanguageForm().exec_():
# if cancel then stop processing # if cancel then stop processing
sys.exit() sys.exit()

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

@ -28,7 +28,6 @@ import io
import logging import logging
import os import os
import urllib import urllib
from random import randint
from tempfile import gettempdir from tempfile import gettempdir
from ConfigParser import SafeConfigParser from ConfigParser import SafeConfigParser
@ -58,8 +57,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
if self.webAccess: if self.webAccess:
files = self.webAccess.read() files = self.webAccess.read()
self.config.readfp(io.BytesIO(files)) self.config.readfp(io.BytesIO(files))
for screen in screens.get_screen_list(): self.displayComboBox.addItems(screens.get_screen_list())
self.displayComboBox.addItem(screen)
self.downloading = unicode(translate('OpenLP.FirstTimeWizard', self.downloading = unicode(translate('OpenLP.FirstTimeWizard',
'Downloading %s...')) 'Downloading %s...'))
QtCore.QObject.connect(self, QtCore.QObject.connect(self,