Andreas Preikschat has proposed merging lp:~googol-hush/openlp/bibles into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol-hush/openlp/bibles/+merge/51137
- moved redundant code to parent class
--
https://code.launchpad.net/~googol-hush/openlp/bibles/+merge/51137
Your team OpenLP Core is requested to review the proposed merge of
lp:~googol-hush/openlp/bibles into lp:openlp.
=== modified file 'openlp/plugins/bibles/lib/csvbible.py'
--- openlp/plugins/bibles/lib/csvbible.py 2011-01-31 02:43:37 +0000
+++ openlp/plugins/bibles/lib/csvbible.py 2011-02-24 14:49:35 +0000
@@ -94,8 +94,6 @@
self.testamentsfile = None
self.booksfile = kwargs[u'booksfile']
self.versesfile = kwargs[u'versefile']
- QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'openlp_stop_wizard'), self.stop_import)
def setup_testaments(self):
"""
=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py 2011-02-02 23:12:31 +0000
+++ openlp/plugins/bibles/lib/db.py 2011-02-24 14:49:35 +0000
@@ -33,7 +33,7 @@
from sqlalchemy.orm import class_mapper, mapper, relation
from sqlalchemy.orm.exc import UnmappedClassError
-from openlp.core.lib import translate
+from openlp.core.lib import Receiver, translate
from openlp.core.lib.db import BaseModel, init_db, Manager
from openlp.core.lib.ui import critical_error_message_box
@@ -162,6 +162,8 @@
if u'file' in kwargs:
self.get_name()
self.wizard = None
+ QtCore.QObject.connect(Receiver.get_receiver(),
+ QtCore.SIGNAL(u'openlp_stop_wizard'), self.stop_import)
def stop_import(self):
"""
=== modified file 'openlp/plugins/bibles/lib/openlp1.py'
--- openlp/plugins/bibles/lib/openlp1.py 2011-02-13 01:24:47 +0000
+++ openlp/plugins/bibles/lib/openlp1.py 2011-02-24 14:49:35 +0000
@@ -46,8 +46,6 @@
log.debug(self.__class__.__name__)
BibleDB.__init__(self, parent, **kwargs)
self.filename = kwargs[u'filename']
- QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'openlp_stop_wizard'), self.stop_import)
def do_import(self):
"""
=== modified file 'openlp/plugins/bibles/lib/opensong.py'
--- openlp/plugins/bibles/lib/opensong.py 2011-02-04 19:58:44 +0000
+++ openlp/plugins/bibles/lib/opensong.py 2011-02-24 14:49:35 +0000
@@ -46,8 +46,6 @@
log.debug(self.__class__.__name__)
BibleDB.__init__(self, parent, **kwargs)
self.filename = kwargs['filename']
- QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'openlp_stop_wizard'), self.stop_import)
def do_import(self):
"""
=== modified file 'openlp/plugins/bibles/lib/osis.py'
--- openlp/plugins/bibles/lib/osis.py 2011-02-21 19:43:04 +0000
+++ openlp/plugins/bibles/lib/osis.py 2011-02-24 14:49:35 +0000
@@ -41,15 +41,11 @@
class OSISBible(BibleDB):
"""
- OSIS Bible format importer class.
+ `OSIS <http://www.bibletechnologies.net/>`_ Bible format importer class.
"""
log.info(u'BibleOSISImpl loaded')
def __init__(self, parent, **kwargs):
- """
- Constructor to create and set up an instance of the OpenSongBible
- class. This class is used to import Bibles from OpenSong's XML format.
- """
log.debug(self.__class__.__name__)
BibleDB.__init__(self, parent, **kwargs)
self.filename = kwargs[u'filename']
@@ -86,8 +82,6 @@
finally:
if fbibles:
fbibles.close()
- QtCore.QObject.connect(Receiver.get_receiver(),
- QtCore.SIGNAL(u'openlp_stop_wizard'), self.stop_import)
def do_import(self):
"""
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
