openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/biblefixes into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)

-- 
https://code.launchpad.net/~raoul-snyman/openlp/biblefixes/+merge/20526
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp.pyw'
--- openlp.pyw	2010-02-21 06:32:43 +0000
+++ openlp.pyw	2010-03-03 10:23:14 +0000
@@ -32,6 +32,7 @@
 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 @@
         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')

=== modified file 'openlp/plugins/bibles/lib/osis.py'
--- openlp/plugins/bibles/lib/osis.py	2010-02-09 12:20:16 +0000
+++ openlp/plugins/bibles/lib/osis.py	2010-03-03 10:23:14 +0000
@@ -30,6 +30,8 @@
 import codecs
 import re
 
+from PyQt4 import QtCore
+
 from openlp.core.lib import Receiver
 from db import BibleDB
 
@@ -94,10 +96,11 @@
         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