Head993

openlp/core/utils/__init__.py

@@ -70,6 +70,8 @@ class VersionThread(QtCore.QThread):
             remote_version[u'release'] = int(match.group(3))
             if len(match.groups()) > 3 and match.group(4):
                 remote_version[u'revision'] = int(match.group(4))
+        else:
+            return
         match = self.version_splitter.match(self.app_version[u'full'])
         if match:
             local_version[u'major'] = int(match.group(1))
@@ -77,6 +79,8 @@ class VersionThread(QtCore.QThread):
             local_version[u'release'] = int(match.group(3))
             if len(match.groups()) > 3 and match.group(4):
                 local_version[u'revision'] = int(match.group(4))
+        else:
+            return
         if remote_version[u'major'] > local_version[u'major'] or \
             remote_version[u'minor'] > local_version[u'minor'] or \
             remote_version[u'release'] > local_version[u'release']:
@@ -147,10 +151,10 @@ class AppLocation(object):
             return plugin_path
         elif dir_type == AppLocation.VersionDir:
             if hasattr(sys, u'frozen') and sys.frozen == 1:
-                plugin_path = os.path.abspath(os.path.split(sys.argv[0])[0])
+                version_path = os.path.abspath(os.path.split(sys.argv[0])[0])
             else:
-                plugin_path = os.path.split(openlp.__file__)[0]
-            return plugin_path
+                version_path = os.path.split(openlp.__file__)[0]
+            return version_path
         elif dir_type == AppLocation.CacheDir:
             if sys.platform == u'win32':
                 path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
@@ -206,11 +210,14 @@ def check_latest_version(current_version):
         else:
             req = urllib2.Request(u'http://www.openlp.org/files/version.txt')
         req.add_header(u'User-Agent', u'OpenLP/%s' % current_version[u'full'])
+        remote_version = None
         try:
-            version_string = unicode(urllib2.urlopen(req, None).read()).strip()
+            remote_version = unicode(urllib2.urlopen(req, None).read()).strip()
         except IOError, e:
             if hasattr(e, u'reason'):
                 log.exception(u'Reason for failure: %s', e.reason)
+        if remote_version:
+            version_string = remote_version
     return version_string
 
 def add_actions(target, actions):

openlp/plugins/bibles/lib/mediaitem.py

@@ -645,7 +645,7 @@ class BibleMediaItem(MediaManagerItem):
         '''
         version = self.parent.manager.get_meta_data(bible, u'Version')
         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:
             dual_version = self.parent.manager.get_meta_data(dual_bible,
                 u'Version')

openlp/plugins/custom/forms/editcustomdialog.py

@@ -143,7 +143,7 @@ class Ui_CustomEditDialog(object):
         customEditDialog.setWindowTitle(
             translate('CustomPlugin.EditCustomForm', 'Edit Custom Slides'))
         self.upButton.setToolTip(
-            translate('CustomPlugin.EditCustomForm', 'Move slide up once '
+            translate('CustomPlugin.EditCustomForm', 'Move slide up one '
                 'position.'))
         self.downButton.setToolTip(
             translate('CustomPlugin.EditCustomForm', 'Move slide down one '

openlp/plugins/songs/forms/songmaintenanceform.py

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