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

Merge fixes 3

Browse Source
This commit is contained in:
Tim Bentley 2011-03-06 20:09:03 +00:00
parent 3b9adbb1db
commit f1f6c6bd3e
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,12 +64,8 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
self.themesText = translate('OpenLP.FirstTimeWizard', 'Themes') self.themesText = translate('OpenLP.FirstTimeWizard', 'Themes')
self.startUpdates = translate('OpenLP.FirstTimeWizard', self.startUpdates = translate('OpenLP.FirstTimeWizard',
'Starting Updates') 'Starting Updates')
self.downloadSongs = unicode(translate('OpenLP.FirstTimeWizard', self.downloading = unicode(translate('OpenLP.FirstTimeWizard',
'Downloading songs: %s')) 'Downloading %s'))
self.downloadBible = unicode(translate('OpenLP.FirstTimeWizard',
'Downloading bible: %s'))
self.downloadTheme = unicode(translate('OpenLP.FirstTimeWizard',
'Downloading theme: %s'))
def exec_(self, edit=False): def exec_(self, edit=False):
""" """
@ -164,7 +160,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
if unicode(type.text(0)) == self.songsText: if unicode(type.text(0)) == self.songsText:
songs = unicode(listIterator.value().data(0, songs = unicode(listIterator.value().data(0,
QtCore.Qt.UserRole).toString()) QtCore.Qt.UserRole).toString())
message = self.downloadSongs % item message = self.downloading % item
self._updateMessage(message) self._updateMessage(message)
# Song database is a fixed file name # Song database is a fixed file name
urllib.urlretrieve(u'%s%s' % (self.web, songs), urllib.urlretrieve(u'%s%s' % (self.web, songs),
@ -173,7 +169,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
if unicode(type.text(0)) == self.biblesText: if unicode(type.text(0)) == self.biblesText:
bible = unicode(listIterator.value().data(0, bible = unicode(listIterator.value().data(0,
QtCore.Qt.UserRole).toString()) QtCore.Qt.UserRole).toString())
message = self.downloadBible % item message = self.downloading % item
self._updateMessage(message) self._updateMessage(message)
urllib.urlretrieve(u'%s%s' % (self.web, bible), urllib.urlretrieve(u'%s%s' % (self.web, bible),
os.path.join(bibleDestination, bible)) os.path.join(bibleDestination, bible))
@ -181,7 +177,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
if unicode(type.text(0)) == self.themesText: if unicode(type.text(0)) == self.themesText:
theme = unicode(listIterator.value().data(0, theme = unicode(listIterator.value().data(0,
QtCore.Qt.UserRole).toString()) QtCore.Qt.UserRole).toString())
message = self.downloadTheme % item message = self.downloading % item
self._updateMessage(message) self._updateMessage(message)
urllib.urlretrieve(u'%s%s' % (self.web, theme), urllib.urlretrieve(u'%s%s' % (self.web, theme),
os.path.join(themeDestination, theme)) os.path.join(themeDestination, theme))