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

fixed other occurrences

Browse Source
This commit is contained in:
Andreas Preikschat 2012-06-19 18:09:59 +02:00
parent 826f83e8bf
commit 155e99d307
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ class ThemeScreenshotThread(QtCore.QThread):
filename = config.get(u'theme_%s' % theme, u'filename') filename = config.get(u'theme_%s' % theme, u'filename')
screenshot = config.get(u'theme_%s' % theme, u'screenshot') screenshot = config.get(u'theme_%s' % theme, u'screenshot')
urllib.urlretrieve(u'%s%s' % (self.parent().web, screenshot), urllib.urlretrieve(u'%s%s' % (self.parent().web, screenshot),
os.path.join(gettempdir(), u'openlp', screenshot)) os.path.join(unicode(gettempdir()), u'openlp', screenshot))
item = QtGui.QListWidgetItem(title, self.parent().themesListWidget) item = QtGui.QListWidgetItem(title, self.parent().themesListWidget)
item.setData(QtCore.Qt.UserRole, QtCore.QVariant(filename)) item.setData(QtCore.Qt.UserRole, QtCore.QVariant(filename))
item.setCheckState(QtCore.Qt.Unchecked) item.setCheckState(QtCore.Qt.Unchecked)
@ -114,7 +114,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
Set up display at start of theme edit. Set up display at start of theme edit.
""" """
self.restart() self.restart()
check_directory_exists(os.path.join(uniocde(gettempdir()), u'openlp')) check_directory_exists(os.path.join(unicode(gettempdir()), u'openlp'))
self.noInternetFinishButton.setVisible(False) self.noInternetFinishButton.setVisible(False)
# Check if this is a re-run of the wizard. # Check if this is a re-run of the wizard.
self.hasRunWizard = Settings().value( self.hasRunWizard = Settings().value(
@ -304,7 +304,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
if item.data(QtCore.Qt.UserRole) == QtCore.QVariant(filename): if item.data(QtCore.Qt.UserRole) == QtCore.QVariant(filename):
break break
item.setIcon(build_icon( item.setIcon(build_icon(
os.path.join(gettempdir(), u'openlp', screenshot))) os.path.join(unicode(gettempdir()), u'openlp', screenshot)))
def _getFileSize(self, url): def _getFileSize(self, url):
site = urllib.urlopen(url) site = urllib.urlopen(url)

2
openlp/plugins/bibles/forms/bibleupgradeform.py
View File

@ -71,7 +71,7 @@ class BibleUpgradeForm(OpenLPWizard):
self.suffix = u'.sqlite' self.suffix = u'.sqlite'
self.settingsSection = u'bibles' self.settingsSection = u'bibles'
self.path = AppLocation.get_section_data_path(self.settingsSection) self.path = AppLocation.get_section_data_path(self.settingsSection)
self.temp_dir = os.path.join(gettempdir(), u'openlp') self.temp_dir = os.path.join(unicode(gettempdir()), u'openlp')
self.files = self.manager.old_bible_databases self.files = self.manager.old_bible_databases
self.success = {} self.success = {}
self.newbibles = {} self.newbibles = {}

2
openlp/plugins/songs/songsplugin.py
View File

@ -233,7 +233,7 @@ class SongsPlugin(Plugin):
new songs into the database. new songs into the database.
""" """
self.onToolsReindexItemTriggered() self.onToolsReindexItemTriggered()
db_dir = unicode(os.path.join(gettempdir(), u'openlp')) db_dir = unicode(os.path.join(unicode(gettempdir()), u'openlp'))
if not os.path.exists(db_dir): if not os.path.exists(db_dir):
return return
song_dbs = [] song_dbs = []