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

Headr656

This commit is contained in:
Tim Bentley 2009-11-05 16:43:54 +00:00
parent 03607395eb cb9b39c493
commit 536d26f5db
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openlp/core/lib/mediamanageritem.py
View File

@ -377,7 +377,6 @@ class MediaManagerItem(QtGui.QWidget):
service_item = self.buildServiceItem() service_item = self.buildServiceItem()
if service_item: if service_item:
service_item.fromPlugin = True service_item.fromPlugin = True
service_item.uuid = unicode(uuid.uuid1())
self.parent.live_controller.addServiceItem(service_item) self.parent.live_controller.addServiceItem(service_item)
def onAddClick(self): def onAddClick(self):

2
openlp/core/ui/generaltab.py
View File

@ -151,7 +151,7 @@ class GeneralTab(SettingsTab):
self.AutoOpenCheckBox.setText(self.trUtf8(u'Automatically open the last service')) self.AutoOpenCheckBox.setText(self.trUtf8(u'Automatically open the last service'))
self.ShowSplashCheckBox.setText(self.trUtf8(u'Show the splash screen')) self.ShowSplashCheckBox.setText(self.trUtf8(u'Show the splash screen'))
self.SettingsGroupBox.setTitle(self.trUtf8(u'Application Settings')) self.SettingsGroupBox.setTitle(self.trUtf8(u'Application Settings'))
self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Sevice before starting New')) self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Service before starting New'))
self.CCLIGroupBox.setTitle(self.trUtf8(u'CCLI Details')) self.CCLIGroupBox.setTitle(self.trUtf8(u'CCLI Details'))
self.NumberLabel.setText(self.trUtf8(u'CCLI Number:')) self.NumberLabel.setText(self.trUtf8(u'CCLI Number:'))
self.UsernameLabel.setText(self.trUtf8(u'SongSelect Username:')) self.UsernameLabel.setText(self.trUtf8(u'SongSelect Username:'))

1
openlp/core/ui/thememanager.py
View File

@ -430,6 +430,7 @@ class ThemeManager(QtGui.QWidget):
log.debug(u'generateAndSaveImage %s %s %s', dir, name, theme_xml) log.debug(u'generateAndSaveImage %s %s %s', dir, name, theme_xml)
theme = ThemeXML() theme = ThemeXML()
theme.parse(theme_xml) theme.parse(theme_xml)
self.cleanTheme(theme)
theme.extend_image_filename(dir) theme.extend_image_filename(dir)
frame = self.generateImage(theme) frame = self.generateImage(theme)
samplepathname = os.path.join(self.path, name + u'.png') samplepathname = os.path.join(self.path, name + u'.png')

6
openlp/plugins/bibles/lib/manager.py
View File

@ -173,14 +173,14 @@ class BibleManager(object):
nbible.save_meta(u'WEB', biblesource) nbible.save_meta(u'WEB', biblesource)
# store the web id of the bible # store the web id of the bible
nbible.save_meta(u'bibleid', bibleid) nbible.save_meta(u'bibleid', bibleid)
if proxyurl and proxyurl != u'': if proxyurl:
# store the proxy URL # store the proxy URL
nbible.save_meta(u'proxy', proxyurl) nbible.save_meta(u'proxy', proxyurl)
nhttp.set_proxy(proxyurl) nhttp.set_proxy(proxyurl)
if proxyid and proxyid != u'': if proxyid:
# store the proxy userid # store the proxy userid
nbible.save_meta(u'proxyid', proxyid) nbible.save_meta(u'proxyid', proxyid)
if proxypass and proxypass != u'': if proxypass:
# store the proxy password # store the proxy password
nbible.save_meta(u'proxypass', proxypass) nbible.save_meta(u'proxypass', proxypass)
return True return True

2
version.txt
View File

@ -1 +1 @@
1.9.0-655 1.9.0-656