forked from openlp/openlp
Update window and start dialog functionality
bzr-revno: 142
This commit is contained in:
Tim Bentley
parent
08b5acb83f
commit
466a9b98bd
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Form implementation generated from reading ui file 'bibleimport.ui'
|
||||
#
|
||||
# Created: Thu Nov 27 21:12:03 2008
|
||||
# Created: Sat Nov 29 13:19:21 2008
|
||||
# by: PyQt4 UI code generator 4.4.3
|
||||
#
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
|
|
@ -12,64 +12,75 @@ from PyQt4 import QtCore, QtGui
|
|||
class Ui_BibleImportDialog(object):
|
||||
def setupUi(self, BibleImportDialog):
|
||||
BibleImportDialog.setObjectName("BibleImportDialog")
|
||||
BibleImportDialog.resize(494, 746)
|
||||
BibleImportDialog.resize(494, 734)
|
||||
self.BibleImportButtonBox = QtGui.QDialogButtonBox(BibleImportDialog)
|
||||
self.BibleImportButtonBox.setGeometry(QtCore.QRect(7, 710, 481, 33))
|
||||
self.BibleImportButtonBox.setGeometry(QtCore.QRect(10, 690, 481, 33))
|
||||
self.BibleImportButtonBox.setOrientation(QtCore.Qt.Horizontal)
|
||||
self.BibleImportButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel)
|
||||
self.BibleImportButtonBox.setObjectName("BibleImportButtonBox")
|
||||
self.ImportToolBox = QtGui.QToolBox(BibleImportDialog)
|
||||
self.ImportToolBox.setGeometry(QtCore.QRect(8, 8, 481, 401))
|
||||
self.ImportToolBox.setGeometry(QtCore.QRect(0, 0, 481, 431))
|
||||
self.ImportToolBox.setObjectName("ImportToolBox")
|
||||
self.CSVImportPage = QtGui.QWidget()
|
||||
self.CSVImportPage.setGeometry(QtCore.QRect(0, 0, 481, 308))
|
||||
self.CSVImportPage.setGeometry(QtCore.QRect(0, 0, 481, 338))
|
||||
self.CSVImportPage.setObjectName("CSVImportPage")
|
||||
self.BibleNameLabel = QtGui.QLabel(self.CSVImportPage)
|
||||
self.BibleNameLabel.setGeometry(QtCore.QRect(20, 40, 71, 17))
|
||||
self.groupBox_2 = QtGui.QGroupBox(self.CSVImportPage)
|
||||
self.groupBox_2.setGeometry(QtCore.QRect(10, 10, 451, 161))
|
||||
self.groupBox_2.setObjectName("groupBox_2")
|
||||
self.BibleNameLabel = QtGui.QLabel(self.groupBox_2)
|
||||
self.BibleNameLabel.setGeometry(QtCore.QRect(20, 30, 71, 17))
|
||||
self.BibleNameLabel.setObjectName("BibleNameLabel")
|
||||
self.BooksLocationLabel = QtGui.QLabel(self.CSVImportPage)
|
||||
self.BooksLocationLabel.setGeometry(QtCore.QRect(20, 80, 101, 17))
|
||||
self.BooksLocationLabel.setObjectName("BooksLocationLabel")
|
||||
self.VerseLocationLabel = QtGui.QLabel(self.CSVImportPage)
|
||||
self.VerseLocationLabel.setGeometry(QtCore.QRect(20, 120, 91, 17))
|
||||
self.VerseLocationLabel.setObjectName("VerseLocationLabel")
|
||||
self.BibleNameEdit = QtGui.QLineEdit(self.CSVImportPage)
|
||||
self.BibleNameEdit.setGeometry(QtCore.QRect(120, 40, 271, 23))
|
||||
self.BibleNameEdit = QtGui.QLineEdit(self.groupBox_2)
|
||||
self.BibleNameEdit.setGeometry(QtCore.QRect(110, 30, 271, 28))
|
||||
self.BibleNameEdit.setObjectName("BibleNameEdit")
|
||||
self.BooksLocationEdit = QtGui.QLineEdit(self.CSVImportPage)
|
||||
self.BooksLocationEdit.setGeometry(QtCore.QRect(120, 80, 271, 23))
|
||||
self.BooksLocationLabel = QtGui.QLabel(self.groupBox_2)
|
||||
self.BooksLocationLabel.setGeometry(QtCore.QRect(10, 70, 101, 17))
|
||||
self.BooksLocationLabel.setObjectName("BooksLocationLabel")
|
||||
self.BooksLocationEdit = QtGui.QLineEdit(self.groupBox_2)
|
||||
self.BooksLocationEdit.setGeometry(QtCore.QRect(110, 70, 271, 28))
|
||||
self.BooksLocationEdit.setObjectName("BooksLocationEdit")
|
||||
self.VerseLocationEdit = QtGui.QLineEdit(self.CSVImportPage)
|
||||
self.VerseLocationEdit.setGeometry(QtCore.QRect(120, 120, 271, 23))
|
||||
self.VerseLocationEdit.setObjectName("VerseLocationEdit")
|
||||
self.BooksFileButton = QtGui.QPushButton(self.CSVImportPage)
|
||||
self.BooksFileButton.setGeometry(QtCore.QRect(400, 80, 41, 27))
|
||||
self.BooksFileButton = QtGui.QPushButton(self.groupBox_2)
|
||||
self.BooksFileButton.setGeometry(QtCore.QRect(390, 70, 41, 31))
|
||||
icon = QtGui.QIcon()
|
||||
icon.addPixmap(QtGui.QPixmap("../images/import_load.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||
self.BooksFileButton.setIcon(icon)
|
||||
self.BooksFileButton.setObjectName("BooksFileButton")
|
||||
self.VersesFileButton = QtGui.QPushButton(self.CSVImportPage)
|
||||
self.VersesFileButton.setGeometry(QtCore.QRect(400, 120, 41, 27))
|
||||
self.VerseLocationLabel = QtGui.QLabel(self.groupBox_2)
|
||||
self.VerseLocationLabel.setGeometry(QtCore.QRect(10, 110, 91, 17))
|
||||
self.VerseLocationLabel.setObjectName("VerseLocationLabel")
|
||||
self.VerseLocationEdit = QtGui.QLineEdit(self.groupBox_2)
|
||||
self.VerseLocationEdit.setGeometry(QtCore.QRect(110, 110, 271, 28))
|
||||
self.VerseLocationEdit.setObjectName("VerseLocationEdit")
|
||||
self.VersesFileButton = QtGui.QPushButton(self.groupBox_2)
|
||||
self.VersesFileButton.setGeometry(QtCore.QRect(390, 110, 41, 31))
|
||||
self.VersesFileButton.setIcon(icon)
|
||||
self.VersesFileButton.setObjectName("VersesFileButton")
|
||||
self.ImportToolBox.addItem(self.CSVImportPage, "")
|
||||
self.OSISImportPage = QtGui.QWidget()
|
||||
self.OSISImportPage.setGeometry(QtCore.QRect(0, 0, 481, 308))
|
||||
self.OSISImportPage.setGeometry(QtCore.QRect(0, 0, 481, 338))
|
||||
self.OSISImportPage.setObjectName("OSISImportPage")
|
||||
self.OSISBibleNameEdit = QtGui.QLineEdit(self.OSISImportPage)
|
||||
self.OSISBibleNameEdit.setGeometry(QtCore.QRect(120, 50, 291, 23))
|
||||
self.groupBox = QtGui.QGroupBox(self.OSISImportPage)
|
||||
self.groupBox.setGeometry(QtCore.QRect(10, 10, 451, 135))
|
||||
self.groupBox.setObjectName("groupBox")
|
||||
self.OSISBibleNameEdit = QtGui.QLineEdit(self.groupBox)
|
||||
self.OSISBibleNameEdit.setGeometry(QtCore.QRect(119, 39, 271, 28))
|
||||
self.OSISBibleNameEdit.setObjectName("OSISBibleNameEdit")
|
||||
self.OSISNameLabel = QtGui.QLabel(self.OSISImportPage)
|
||||
self.OSISNameLabel.setGeometry(QtCore.QRect(10, 50, 101, 17))
|
||||
self.OSISNameLabel.setObjectName("OSISNameLabel")
|
||||
self.OSISLocationEdit = QtGui.QLineEdit(self.OSISImportPage)
|
||||
self.OSISLocationEdit.setGeometry(QtCore.QRect(120, 90, 291, 23))
|
||||
self.OSISLocationEdit = QtGui.QLineEdit(self.groupBox)
|
||||
self.OSISLocationEdit.setGeometry(QtCore.QRect(119, 69, 271, 28))
|
||||
self.OSISLocationEdit.setObjectName("OSISLocationEdit")
|
||||
self.LocatioLabel = QtGui.QLabel(self.OSISImportPage)
|
||||
self.LocatioLabel.setGeometry(QtCore.QRect(10, 90, 91, 17))
|
||||
self.LocatioLabel.setObjectName("LocationLabel")
|
||||
self.OsisFileButton = QtGui.QPushButton(self.OSISImportPage)
|
||||
self.OsisFileButton.setGeometry(QtCore.QRect(420, 90, 41, 27))
|
||||
self.OsisFileButton = QtGui.QPushButton(self.groupBox)
|
||||
self.OsisFileButton.setGeometry(QtCore.QRect(400, 70, 41, 31))
|
||||
self.OsisFileButton.setIcon(icon)
|
||||
self.OsisFileButton.setObjectName("OsisFileButton")
|
||||
self.LocatioLabel = QtGui.QLabel(self.groupBox)
|
||||
self.LocatioLabel.setGeometry(QtCore.QRect(13, 69, 73, 22))
|
||||
self.LocatioLabel.setObjectName("LocatioLabel")
|
||||
self.OSISNameLabel = QtGui.QLabel(self.groupBox)
|
||||
self.OSISNameLabel.setGeometry(QtCore.QRect(13, 39, 98, 22))
|
||||
self.OSISNameLabel.setObjectName("OSISNameLabel")
|
||||
self.ImportToolBox.addItem(self.OSISImportPage, "")
|
||||
self.WebBiblePage = QtGui.QWidget()
|
||||
self.WebBiblePage.setGeometry(QtCore.QRect(0, 0, 481, 308))
|
||||
self.WebBiblePage.setGeometry(QtCore.QRect(0, 0, 481, 338))
|
||||
self.WebBiblePage.setObjectName("WebBiblePage")
|
||||
self.WebBibleLayout = QtGui.QVBoxLayout(self.WebBiblePage)
|
||||
self.WebBibleLayout.setSpacing(8)
|
||||
|
|
@ -136,52 +147,65 @@ class Ui_BibleImportDialog(object):
|
|||
self.ProxySettingsLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PasswordEdit)
|
||||
self.WebBibleLayout.addWidget(self.ProxyGroupBox)
|
||||
self.ImportToolBox.addItem(self.WebBiblePage, "")
|
||||
self.groupBox = QtGui.QGroupBox(BibleImportDialog)
|
||||
self.groupBox.setGeometry(QtCore.QRect(20, 430, 461, 111))
|
||||
self.groupBox.setObjectName("groupBox")
|
||||
self.label = QtGui.QLabel(self.groupBox)
|
||||
self.label.setGeometry(QtCore.QRect(10, 20, 54, 17))
|
||||
self.label.setObjectName("label")
|
||||
self.label_2 = QtGui.QLabel(self.groupBox)
|
||||
self.label_2.setGeometry(QtCore.QRect(10, 50, 54, 17))
|
||||
self.label_2.setObjectName("label_2")
|
||||
self.label_3 = QtGui.QLabel(self.groupBox)
|
||||
self.label_3.setGeometry(QtCore.QRect(10, 80, 54, 17))
|
||||
self.label_3.setObjectName("label_3")
|
||||
self.lineEdit_4 = QtGui.QLineEdit(self.groupBox)
|
||||
self.lineEdit_4.setGeometry(QtCore.QRect(80, 20, 361, 23))
|
||||
self.lineEdit_4.setObjectName("lineEdit_4")
|
||||
self.lineEdit_5 = QtGui.QLineEdit(self.groupBox)
|
||||
self.lineEdit_5.setGeometry(QtCore.QRect(80, 50, 361, 23))
|
||||
self.lineEdit_5.setObjectName("lineEdit_5")
|
||||
self.lineEdit_6 = QtGui.QLineEdit(self.groupBox)
|
||||
self.lineEdit_6.setGeometry(QtCore.QRect(80, 80, 361, 23))
|
||||
self.lineEdit_6.setObjectName("lineEdit_6")
|
||||
self.groupBox_2 = QtGui.QGroupBox(BibleImportDialog)
|
||||
self.groupBox_2.setGeometry(QtCore.QRect(20, 560, 461, 71))
|
||||
self.groupBox_2.setObjectName("groupBox_2")
|
||||
self.progressBar = QtGui.QProgressBar(self.groupBox_2)
|
||||
self.progressBar.setGeometry(QtCore.QRect(10, 30, 441, 23))
|
||||
self.LicenceDetailsGroupBox = QtGui.QGroupBox(BibleImportDialog)
|
||||
self.LicenceDetailsGroupBox.setGeometry(QtCore.QRect(10, 450, 481, 136))
|
||||
self.LicenceDetailsGroupBox.setMinimumSize(QtCore.QSize(0, 123))
|
||||
self.LicenceDetailsGroupBox.setObjectName("LicenceDetailsGroupBox")
|
||||
self.formLayout = QtGui.QFormLayout(self.LicenceDetailsGroupBox)
|
||||
self.formLayout.setMargin(8)
|
||||
self.formLayout.setHorizontalSpacing(8)
|
||||
self.formLayout.setObjectName("formLayout")
|
||||
self.VersionNameLabel = QtGui.QLabel(self.LicenceDetailsGroupBox)
|
||||
self.VersionNameLabel.setObjectName("VersionNameLabel")
|
||||
self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.VersionNameLabel)
|
||||
self.VersionNameEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox)
|
||||
self.VersionNameEdit.setObjectName("VersionNameEdit")
|
||||
self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.VersionNameEdit)
|
||||
self.CopyrightLabel = QtGui.QLabel(self.LicenceDetailsGroupBox)
|
||||
self.CopyrightLabel.setObjectName("CopyrightLabel")
|
||||
self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.CopyrightLabel)
|
||||
self.CopyrightEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox)
|
||||
self.CopyrightEdit.setObjectName("CopyrightEdit")
|
||||
self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.CopyrightEdit)
|
||||
self.PermisionLabel = QtGui.QLabel(self.LicenceDetailsGroupBox)
|
||||
self.PermisionLabel.setObjectName("PermisionLabel")
|
||||
self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.PermisionLabel)
|
||||
self.PermisionEdit = QtGui.QLineEdit(self.LicenceDetailsGroupBox)
|
||||
self.PermisionEdit.setObjectName("PermisionEdit")
|
||||
self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.PermisionEdit)
|
||||
self.ProgressGroupBox = QtGui.QGroupBox(BibleImportDialog)
|
||||
self.ProgressGroupBox.setGeometry(QtCore.QRect(10, 590, 481, 92))
|
||||
self.ProgressGroupBox.setObjectName("ProgressGroupBox")
|
||||
self.ProgressLayout = QtGui.QFormLayout(self.ProgressGroupBox)
|
||||
self.ProgressLayout.setMargin(8)
|
||||
self.ProgressLayout.setSpacing(8)
|
||||
self.ProgressLayout.setObjectName("ProgressLayout")
|
||||
self.ProgressStatusLabel = QtGui.QLabel(self.ProgressGroupBox)
|
||||
self.ProgressStatusLabel.setObjectName("ProgressStatusLabel")
|
||||
self.ProgressLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.ProgressStatusLabel)
|
||||
self.progressBar = QtGui.QProgressBar(self.ProgressGroupBox)
|
||||
self.progressBar.setProperty("value", QtCore.QVariant(24))
|
||||
self.progressBar.setObjectName("progressBar")
|
||||
self.ProgressLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.progressBar)
|
||||
|
||||
self.retranslateUi(BibleImportDialog)
|
||||
self.ImportToolBox.setCurrentIndex(1)
|
||||
self.ImportToolBox.setCurrentIndex(0)
|
||||
QtCore.QObject.connect(self.BibleImportButtonBox, QtCore.SIGNAL("accepted()"), BibleImportDialog.accept)
|
||||
QtCore.QObject.connect(self.BibleImportButtonBox, QtCore.SIGNAL("rejected()"), BibleImportDialog.reject)
|
||||
QtCore.QMetaObject.connectSlotsByName(BibleImportDialog)
|
||||
|
||||
def retranslateUi(self, BibleImportDialog):
|
||||
BibleImportDialog.setWindowTitle(QtGui.QApplication.translate("BibleImportDialog", "Bible Registration", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.groupBox_2.setTitle(QtGui.QApplication.translate("BibleImportDialog", "CVS Bible", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.BibleNameLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Bible Name:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.BooksLocationLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Books Location:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.VerseLocationLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Verse Location:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.BooksFileButton.setText(QtGui.QApplication.translate("BibleImportDialog", "PushButton", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.VerseLocationLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Verse Location:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.VersesFileButton.setText(QtGui.QApplication.translate("BibleImportDialog", "PushButton", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.ImportToolBox.setItemText(self.ImportToolBox.indexOf(self.CSVImportPage), QtGui.QApplication.translate("BibleImportDialog", "CVS File Import", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.OSISNameLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "OSIS Bible Name:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.groupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "OSIS Bible", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.LocatioLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "File Location:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.OsisFileButton.setText(QtGui.QApplication.translate("BibleImportDialog", "PushButton", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.OSISNameLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "OSIS Bible Name:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.ImportToolBox.setItemText(self.ImportToolBox.indexOf(self.OSISImportPage), QtGui.QApplication.translate("BibleImportDialog", "OSIS XML Bible Import", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.OptionsGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Download Options", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.LocationLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Location:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
|
|
@ -198,9 +222,10 @@ class Ui_BibleImportDialog(object):
|
|||
self.UsernameLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Username:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.PasswordLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Password:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.ImportToolBox.setItemText(self.ImportToolBox.indexOf(self.WebBiblePage), QtGui.QApplication.translate("BibleImportDialog", "Web Bible Download", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.groupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Licence Details", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.label.setText(QtGui.QApplication.translate("BibleImportDialog", "TextLabel", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.label_2.setText(QtGui.QApplication.translate("BibleImportDialog", "TextLabel", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.label_3.setText(QtGui.QApplication.translate("BibleImportDialog", "TextLabel", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.groupBox_2.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Progress", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.LicenceDetailsGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Licence Details", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.VersionNameLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Version Name:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.CopyrightLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Copyright:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.PermisionLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "Permission:", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.ProgressGroupBox.setTitle(QtGui.QApplication.translate("BibleImportDialog", "Progress", None, QtGui.QApplication.UnicodeUTF8))
|
||||
self.ProgressStatusLabel.setText(QtGui.QApplication.translate("BibleImportDialog", "TextLabel", None, QtGui.QApplication.UnicodeUTF8))
|
||||
|
||||
|
|
|
|||
|
|
@ -4,12 +4,17 @@
|
|||
Module implementing BibleImportDialog.
|
||||
"""
|
||||
import sys
|
||||
import os, os.path
|
||||
import sys
|
||||
mypath=os.path.split(os.path.abspath(__file__))[0]
|
||||
sys.path.insert(0,(os.path.join(mypath, '..', '..', '..', '..')))
|
||||
|
||||
from PyQt4 import QtCore, QtGui
|
||||
from PyQt4.QtGui import QDialog
|
||||
from PyQt4.QtCore import pyqtSignature
|
||||
|
||||
from bibleimportdialog import Ui_BibleImportDialog
|
||||
from openlp.plugins.biblemanager.bibleManager import BibleManager
|
||||
|
||||
class BibleImportForm(QDialog, Ui_BibleImportDialog):
|
||||
"""
|
||||
|
|
@ -22,6 +27,8 @@ class BibleImportForm(QDialog, Ui_BibleImportDialog):
|
|||
QDialog.__init__(self, parent)
|
||||
self.setupUi(self)
|
||||
self.biblemanager = biblemanager
|
||||
self.ProgressGroupBox.hide() # not wanted until we do some processing
|
||||
#self.CSVImportPage.SetEt
|
||||
|
||||
@pyqtSignature("")
|
||||
def on_VersesFileButton_clicked(self):
|
||||
|
|
@ -43,7 +50,8 @@ class runner(QtGui.QApplication):
|
|||
|
||||
def run(self):
|
||||
values = ["Genesis","Matthew","Revelation"]
|
||||
self.bim = BibleImportForm()
|
||||
self.bm = BibleManager()
|
||||
self.bim = BibleImportForm(self.bm)
|
||||
self.bim.show()
|
||||
self.processEvents()
|
||||
sys.exit(app.exec_())
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ import sys
|
|||
mypath=os.path.split(os.path.abspath(__file__))[0]
|
||||
sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
|
||||
|
||||
from openlp.plugins.biblemanager.BibleManager import BibleManager
|
||||
from openlp.utils import ConfigHelper
|
||||
from openlp.plugins.biblemanager.bibleManager import BibleManager
|
||||
from openlp.core.utils import ConfigHelper
|
||||
|
||||
import logging
|
||||
logging.basicConfig(level=logging.DEBUG,
|
||||
|
|
@ -67,14 +67,14 @@ class TestBibleManager:
|
|||
|
||||
def testGetBookChapterCount(self):
|
||||
log.debug( "\n.......testGetBookChapterCount")
|
||||
assert(self.bm.getBookChapterCount("Matthew") == '28')
|
||||
assert(self.bm.getBookChapterCount("asv","Matthew")[0] == 28)
|
||||
|
||||
def testGetBookVerseCount(self):
|
||||
log.debug( "\n.......testGetBookVerseCount")
|
||||
assert(self.bm.getBookVerseCount("Genesis", 1) == '31')
|
||||
assert(self.bm.getBookVerseCount("Genesis", 2) == '25')
|
||||
assert(self.bm.getBookVerseCount("Matthew", 1) == '25')
|
||||
assert(self.bm.getBookVerseCount("Revelation", 1) == '20')
|
||||
assert(self.bm.getBookVerseCount("asv","Genesis", 1)[0] == 31)
|
||||
assert(self.bm.getBookVerseCount("TheMessage","Genesis", 2)[0] == 25)
|
||||
assert(self.bm.getBookVerseCount("asv","Matthew", 1)[0] == 25)
|
||||
assert(self.bm.getBookVerseCount("TheMessage","Revelation", 1)[0] == 20)
|
||||
|
||||
def testGetVerseText(self):
|
||||
log.debug( "\n.......testGetVerseText")
|
||||
|
|
@ -84,8 +84,12 @@ class TestBibleManager:
|
|||
#log.debug( c )
|
||||
c = self.bm.getVerseText('asv','Genesis',10,1,20)
|
||||
log.debug( c )
|
||||
c = self.bm.getVerseText('asv','Genesis',10,1,20)
|
||||
c = self.bm.getVerseText('TheMessage','Genesis',10,1,20)
|
||||
log.debug( c )
|
||||
c = self.bm.getVerseText('asv','Revelation',10,1,20)
|
||||
log.debug( c )
|
||||
|
||||
c = self.bm.getVersesFromText("asv", "Jesus wept")
|
||||
log.debug( c )
|
||||
c = self.bm.getVersesFromText("TheMessage", "Jesus wept")
|
||||
log.debug( c )
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>494</width>
|
||||
<height>746</height>
|
||||
<height>734</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
<widget class="QDialogButtonBox" name="BibleImportButtonBox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>7</x>
|
||||
<y>710</y>
|
||||
<x>10</x>
|
||||
<y>690</y>
|
||||
<width>481</width>
|
||||
<height>33</height>
|
||||
</rect>
|
||||
|
|
@ -32,10 +32,10 @@
|
|||
<widget class="QToolBox" name="ImportToolBox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>8</x>
|
||||
<y>8</y>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>481</width>
|
||||
<height>401</height>
|
||||
<height>431</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>481</width>
|
||||
<height>308</height>
|
||||
<height>338</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="accessibleName">
|
||||
|
|
@ -56,100 +56,121 @@
|
|||
<attribute name="label">
|
||||
<string>CVS File Import</string>
|
||||
</attribute>
|
||||
<widget class="QLabel" name="BibleNameLabel">
|
||||
<widget class="QGroupBox" name="groupBox_2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>40</y>
|
||||
<width>71</width>
|
||||
<height>17</height>
|
||||
<x>10</x>
|
||||
<y>10</y>
|
||||
<width>451</width>
|
||||
<height>161</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Bible Name:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="BooksLocationLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>80</y>
|
||||
<width>101</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Books Location:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="VerseLocationLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>120</y>
|
||||
<width>91</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Verse Location:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="BibleNameEdit">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>120</x>
|
||||
<y>40</y>
|
||||
<width>271</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="BooksLocationEdit">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>120</x>
|
||||
<y>80</y>
|
||||
<width>271</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="VerseLocationEdit">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>120</x>
|
||||
<y>120</y>
|
||||
<width>271</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="BooksFileButton">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>400</x>
|
||||
<y>80</y>
|
||||
<width>41</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>PushButton</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="VersesFileButton">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>400</x>
|
||||
<y>120</y>
|
||||
<width>41</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>PushButton</string>
|
||||
<property name="title">
|
||||
<string>CVS Bible</string>
|
||||
</property>
|
||||
<widget class="QLabel" name="BibleNameLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>30</y>
|
||||
<width>71</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Bible Name:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="BibleNameEdit">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>110</x>
|
||||
<y>30</y>
|
||||
<width>271</width>
|
||||
<height>28</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="BooksLocationLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>70</y>
|
||||
<width>101</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Books Location:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="BooksLocationEdit">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>110</x>
|
||||
<y>70</y>
|
||||
<width>271</width>
|
||||
<height>28</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="BooksFileButton">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>390</x>
|
||||
<y>70</y>
|
||||
<width>41</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>PushButton</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>../images/import_load.png</normaloff>../images/import_load.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="VerseLocationLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>110</y>
|
||||
<width>91</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Verse Location:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="VerseLocationEdit">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>110</x>
|
||||
<y>110</y>
|
||||
<width>271</width>
|
||||
<height>28</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="VersesFileButton">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>390</x>
|
||||
<y>110</y>
|
||||
<width>41</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>PushButton</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>../images/import_load.png</normaloff>../images/import_load.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget" name="OSISImportPage">
|
||||
|
|
@ -158,74 +179,87 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>481</width>
|
||||
<height>308</height>
|
||||
<height>338</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="label">
|
||||
<string>OSIS XML Bible Import</string>
|
||||
</attribute>
|
||||
<widget class="QLineEdit" name="OSISBibleNameEdit">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>120</x>
|
||||
<y>50</y>
|
||||
<width>291</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="OSISNameLabel">
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>50</y>
|
||||
<width>101</width>
|
||||
<height>17</height>
|
||||
<y>10</y>
|
||||
<width>451</width>
|
||||
<height>135</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>OSIS Bible Name:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="OSISLocationEdit">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>120</x>
|
||||
<y>90</y>
|
||||
<width>291</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="LocatioLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>90</y>
|
||||
<width>91</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>File Location:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="OsisFileButton">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>420</x>
|
||||
<y>90</y>
|
||||
<width>41</width>
|
||||
<height>27</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>PushButton</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>../images/import_load.png</normaloff>../images/import_load.png</iconset>
|
||||
<property name="title">
|
||||
<string>OSIS Bible</string>
|
||||
</property>
|
||||
<widget class="QLineEdit" name="OSISBibleNameEdit">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>119</x>
|
||||
<y>39</y>
|
||||
<width>271</width>
|
||||
<height>28</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="OSISLocationEdit">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>119</x>
|
||||
<y>69</y>
|
||||
<width>271</width>
|
||||
<height>28</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="OsisFileButton">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>400</x>
|
||||
<y>70</y>
|
||||
<width>41</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
<normaloff>../images/import_load.png</normaloff>../images/import_load.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="LocatioLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>13</x>
|
||||
<y>69</y>
|
||||
<width>73</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>File Location:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="OSISNameLabel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>13</x>
|
||||
<y>39</y>
|
||||
<width>98</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>OSIS Bible Name:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget" name="WebBiblePage">
|
||||
|
|
@ -234,7 +268,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>481</width>
|
||||
<height>308</height>
|
||||
<height>338</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="label">
|
||||
|
|
@ -400,10 +434,10 @@
|
|||
<widget class="QGroupBox" name="LicenceDetailsGroupBox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>430</y>
|
||||
<width>461</width>
|
||||
<height>123</height>
|
||||
<x>10</x>
|
||||
<y>450</y>
|
||||
<width>481</width>
|
||||
<height>136</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
|
|
@ -419,9 +453,6 @@
|
|||
<property name="horizontalSpacing">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="verticalSpacing">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>8</number>
|
||||
</property>
|
||||
|
|
@ -460,16 +491,16 @@
|
|||
<widget class="QGroupBox" name="ProgressGroupBox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>570</y>
|
||||
<width>461</width>
|
||||
<height>87</height>
|
||||
<x>10</x>
|
||||
<y>590</y>
|
||||
<width>481</width>
|
||||
<height>92</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Progress</string>
|
||||
</property>
|
||||
<layout class="QFormLayout" name="formLayout_2">
|
||||
<layout class="QFormLayout" name="ProgressLayout">
|
||||
<property name="horizontalSpacing">
|
||||
<number>8</number>
|
||||
</property>
|
||||
|
|
@ -486,7 +517,7 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" colspan="2">
|
||||
<item row="1" column="0">
|
||||
<widget class="QProgressBar" name="progressBar">
|
||||
<property name="value">
|
||||
<number>24</number>
|
||||
|
|
|
|||
Loading…
Reference in New Issue