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

Cleanups and a version check fix 

bzr-revno: 992
This commit is contained in:
Jon Tibble 2010-08-26 14:45:56 +01:00
parent 438856a978 06fd68b3d8
commit 53295b08e0
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/core/utils/__init__.py
View File

@ -206,11 +206,14 @@ def check_latest_version(current_version):
else: else:
req = urllib2.Request(u'http://www.openlp.org/files/version.txt') req = urllib2.Request(u'http://www.openlp.org/files/version.txt')
req.add_header(u'User-Agent', u'OpenLP/%s' % current_version[u'full']) req.add_header(u'User-Agent', u'OpenLP/%s' % current_version[u'full'])
remote_version = None
try: try:
version_string = unicode(urllib2.urlopen(req, None).read()).strip() remote_version = unicode(urllib2.urlopen(req, None).read()).strip()
except IOError, e: except IOError, e:
if hasattr(e, u'reason'): if hasattr(e, u'reason'):
log.exception(u'Reason for failure: %s', e.reason) log.exception(u'Reason for failure: %s', e.reason)
if remote_version:
version_string = remote_version
return version_string return version_string
def add_actions(target, actions): def add_actions(target, actions):

2
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -641,7 +641,7 @@ class BibleMediaItem(MediaManagerItem):
''' '''
version = self.parent.manager.get_meta_data(bible, u'Version') version = self.parent.manager.get_meta_data(bible, u'Version')
copyright = self.parent.manager.get_meta_data(bible, u'Copyright') copyright = self.parent.manager.get_meta_data(bible, u'Copyright')
permission = self.parent.manager.get_meta_data(bible, u'Permissions') #permission = self.parent.manager.get_meta_data(bible, u'Permissions')
if dual_bible: if dual_bible:
dual_version = self.parent.manager.get_meta_data(dual_bible, dual_version = self.parent.manager.get_meta_data(dual_bible,
u'Version') u'Version')

5
openlp/plugins/songs/forms/songmaintenanceform.py
View File

@ -88,9 +88,8 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
item = self.songmanager.get_object(item_class, item_id) item = self.songmanager.get_object(item_class, item_id)
if item and len(item.songs) == 0: if item and len(item.songs) == 0:
if QtGui.QMessageBox.warning(self, dlg_title, del_text, if QtGui.QMessageBox.warning(self, dlg_title, del_text,
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
QtGui.QMessageBox.No | QtGui.QMessageBox.Yes) QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.Yes:
) == QtGui.QMessageBox.Yes:
self.songmanager.delete_object(item_class, item.id) self.songmanager.delete_object(item_class, item.id)
reset_func() reset_func()
else: else: