diff --git a/openlp.pyw b/openlp.pyw index 5c18486b6..cdf762c1c 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -32,6 +32,7 @@ from logging import FileHandler from optparse import OptionParser from PyQt4 import QtCore, QtGui +import openlp from openlp.core.lib import Receiver, str_to_bool from openlp.core.resources import qInitResources from openlp.core.ui import MainWindow, SplashScreen, ScreenList @@ -77,8 +78,8 @@ class OpenLP(QtGui.QApplication): Run the OpenLP application. """ #Load and store current Application Version - filepath = os.path.split(os.path.abspath(__file__))[0] - filepath = os.path.abspath(os.path.join(filepath, u'version.txt')) + filepath = os.path.split(os.path.abspath(openlp.__file__))[0] + filepath = os.path.abspath(os.path.join(filepath, u'.version')) fversion = None try: fversion = open(filepath, u'r') diff --git a/openlp/.version b/openlp/.version index cdea40fcb..5f831df2d 100644 --- a/openlp/.version +++ b/openlp/.version @@ -1 +1 @@ -1.9.0-bzr720 +1.9.0-bzr721 diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py index cfa68b213..41f11e8a0 100644 --- a/openlp/plugins/bibles/lib/osis.py +++ b/openlp/plugins/bibles/lib/osis.py @@ -30,6 +30,8 @@ import chardet import codecs import re +from PyQt4 import QtCore + from openlp.core.lib import Receiver from db import BibleDB @@ -94,10 +96,11 @@ class OSISBible(BibleDB): Loads a Bible from file. """ log.debug(u'Starting OSIS import from "%s"' % self.filename) + self.wizard.incrementProgressBar(u'Detecting encoding (this may take a few minutes)...') detect_file = None try: detect_file = open(self.filename, u'r') - details = chardet.detect(detect_file.read(3000)) + details = chardet.detect(detect_file.read()) except: log.exception(u'Failed to detect OSIS file encoding') return diff --git a/version.txt b/version.txt index 8edd89f43..fccf41cd0 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.9.0-720 +1.9.0-721