raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

moved Dialog from mediaitem.py to bibleimportform.py 

some fixes
This commit is contained in:
Armin Köhler 2011-04-02 21:17:48 +02:00
parent c04a76e12d
commit 9de33cf194
14 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/plugins/bibles/forms/__init__.py
View File

@ -50,9 +50,8 @@ This allows OpenLP to use ``self.object`` for all the GUI elements while keeping
them separate from the functionality, so that it is easier to recreate the GUI them separate from the functionality, so that it is easier to recreate the GUI
from the .ui files later if necessary. from the .ui files later if necessary.
""" """
from bibleimportform import BibleImportForm
from booknameform import BookNameForm from booknameform import BookNameForm
from languageform import LanguageForm from languageform import LanguageForm
from bibleimportform import BibleImportForm
__all__ = ['BibleImportForm'] __all__ = ['BibleImportForm']

11
openlp/plugins/bibles/forms/bibleimportform.py
View File

@ -40,6 +40,7 @@ from openlp.core.ui.wizard import OpenLPWizard, WizardStrings
from openlp.core.utils import AppLocation, string_is_unicode from openlp.core.utils import AppLocation, string_is_unicode
from openlp.plugins.bibles.lib.manager import BibleFormat from openlp.plugins.bibles.lib.manager import BibleFormat
from openlp.plugins.bibles.lib.db import BiblesResourcesDB from openlp.plugins.bibles.lib.db import BiblesResourcesDB
from openlp.plugins.bibles.forms import BookNameForm, LanguageForm
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -758,3 +759,13 @@ class BibleImportForm(OpenLPWizard):
'BiblesPlugin.ImportWizardForm', 'Your Bible import failed.')) 'BiblesPlugin.ImportWizardForm', 'Your Bible import failed.'))
del self.manager.db_cache[importer.name] del self.manager.db_cache[importer.name]
delete_database(self.plugin.settingsSection, importer.file) delete_database(self.plugin.settingsSection, importer.file)
def bookNameDialog(self, name):
self.book_name = BookNameForm(self)
if self.book_name.exec_(name):
return unicode(self.book_name.requestComboBox.currentText())
def languageDialog(self):
self.language = LanguageForm(self)
if self.language.exec_():
return unicode(self.language.requestComboBox.currentText())

32
openlp/plugins/bibles/forms/booknamedialog.py
View File

@ -31,7 +31,7 @@ from openlp.core.lib.ui import create_accept_reject_button_box
class Ui_BookNameDialog(object): class Ui_BookNameDialog(object):
def setupUi(self, bookNameDialog): def setupUi(self, bookNameDialog):
bookNameDialog.setObjectName("BookNameDialog") bookNameDialog.setObjectName(u'BookNameDialog')
bookNameDialog.resize(400, 175) bookNameDialog.resize(400, 175)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred,
QtGui.QSizePolicy.MinimumExpanding) QtGui.QSizePolicy.MinimumExpanding)
@ -42,25 +42,25 @@ class Ui_BookNameDialog(object):
bookNameDialog.setSizePolicy(sizePolicy) bookNameDialog.setSizePolicy(sizePolicy)
self.widget = QtGui.QWidget(bookNameDialog) self.widget = QtGui.QWidget(bookNameDialog)
self.widget.setGeometry(QtCore.QRect(10, 15, 381, 151)) self.widget.setGeometry(QtCore.QRect(10, 15, 381, 151))
self.widget.setObjectName("widget") self.widget.setObjectName(u'widget')
self.verticalLayout = QtGui.QVBoxLayout(self.widget) self.verticalLayout = QtGui.QVBoxLayout(self.widget)
self.verticalLayout.setObjectName("verticalLayout") self.verticalLayout.setObjectName(u'verticalLayout')
self.headlineLabel = QtGui.QLabel(self.widget) self.headlineLabel = QtGui.QLabel(self.widget)
font = QtGui.QFont() font = QtGui.QFont()
font.setFamily("Arial") font.setFamily(u'Arial')
font.setPointSize(11) font.setPointSize(11)
font.setWeight(75) font.setWeight(75)
font.setBold(True) font.setBold(True)
self.headlineLabel.setFont(font) self.headlineLabel.setFont(font)
self.headlineLabel.setObjectName("HeadlineLabel") self.headlineLabel.setObjectName(u'HeadlineLabel')
self.verticalLayout.addWidget(self.headlineLabel) self.verticalLayout.addWidget(self.headlineLabel)
self.infoLabel = QtGui.QLabel(self.widget) self.infoLabel = QtGui.QLabel(self.widget)
self.infoLabel.setObjectName("InfoLabel") self.infoLabel.setObjectName(u'InfoLabel')
self.verticalLayout.addWidget(self.infoLabel) self.verticalLayout.addWidget(self.infoLabel)
self.formLayout = QtGui.QFormLayout() self.formLayout = QtGui.QFormLayout()
self.formLayout.setObjectName("formLayout") self.formLayout.setObjectName(u'formLayout')
self.requestLabel = QtGui.QLabel(self.widget) self.requestLabel = QtGui.QLabel(self.widget)
self.requestLabel.setObjectName("RequestLabel") self.requestLabel.setObjectName(u'RequestLabel')
self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
self.requestLabel) self.requestLabel)
self.requestComboBox = QtGui.QComboBox(self.widget) self.requestComboBox = QtGui.QComboBox(self.widget)
@ -71,7 +71,7 @@ class Ui_BookNameDialog(object):
sizePolicy.setHeightForWidth(self.requestComboBox.sizePolicy() sizePolicy.setHeightForWidth(self.requestComboBox.sizePolicy()
.hasHeightForWidth()) .hasHeightForWidth())
self.requestComboBox.setSizePolicy(sizePolicy) self.requestComboBox.setSizePolicy(sizePolicy)
self.requestComboBox.setObjectName("RequestComboBox") self.requestComboBox.setObjectName(u'RequestComboBox')
self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
self.requestComboBox) self.requestComboBox)
self.verticalLayout.addLayout(self.formLayout) self.verticalLayout.addLayout(self.formLayout)
@ -85,11 +85,11 @@ class Ui_BookNameDialog(object):
def retranslateUi(self, bookNameDialog): def retranslateUi(self, bookNameDialog):
bookNameDialog.setWindowTitle( bookNameDialog.setWindowTitle(
translate("BiblesPlugin.BookNameDialog", "Choose Book")) translate('BiblesPlugin.BookNameDialog', 'Choose Book'))
self.headlineLabel.setText( self.headlineLabel.setText(
translate("BiblesPlugin.BookNameDialog", "Choose Book:")) translate('BiblesPlugin.BookNameDialog', 'Choose Book:'))
self.infoLabel.setText(translate("BiblesPlugin.BookNameDialog", self.infoLabel.setText(translate('BiblesPlugin.BookNameDialog',
"The following books cannot be clearly attributed. \n" 'The following books cannot be clearly attributed. \n'
"Please choose the book it is.")) 'Please choose the book it is.'))
self.requestLabel.setText(translate("BiblesPlugin.BookNameDialog", self.requestLabel.setText(translate('BiblesPlugin.BookNameDialog',
"Book:")) 'Book:'))

7
openlp/plugins/bibles/forms/booknameform.py
View File

@ -41,7 +41,8 @@ log = logging.getLogger(__name__)
class BookNameForm(QDialog, Ui_BookNameDialog): class BookNameForm(QDialog, Ui_BookNameDialog):
""" """
Class documentation goes here. Class to manage a dialog which help the user to refer a book name a
to a english book name
""" """
log.info(u'BookNameForm loaded') log.info(u'BookNameForm loaded')
@ -56,14 +57,14 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
items = [] items = []
self.requestComboBox.addItem(u'') self.requestComboBox.addItem(u'')
self.requestLabel.setText( self.requestLabel.setText(
translate("BiblesPlugin.BookNameForm", name)) translate('BiblesPlugin.BookNameForm', name))
items = BiblesResourcesDB.get_books() items = BiblesResourcesDB.get_books()
for item in items: for item in items:
self.requestComboBox.addItem(item[u'name']) self.requestComboBox.addItem(item[u'name'])
return QDialog.exec_(self) return QDialog.exec_(self)
def accept(self): def accept(self):
if self.requestComboBox.currentText() == u"": if self.requestComboBox.currentText() == u'':
critical_error_message_box( critical_error_message_box(
message=translate('BiblesPlugin.BookNameForm', message=translate('BiblesPlugin.BookNameForm',
'You need to choose a book.')) 'You need to choose a book.'))

30
openlp/plugins/bibles/forms/languagedialog.py
View File

@ -31,7 +31,7 @@ from openlp.core.lib.ui import create_accept_reject_button_box
class Ui_LanguageDialog(object): class Ui_LanguageDialog(object):
def setupUi(self, languageDialog): def setupUi(self, languageDialog):
languageDialog.setObjectName("LanugageDialog") languageDialog.setObjectName(u'LanugageDialog')
languageDialog.resize(400, 175) languageDialog.resize(400, 175)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred,
QtGui.QSizePolicy.MinimumExpanding) QtGui.QSizePolicy.MinimumExpanding)
@ -42,25 +42,25 @@ class Ui_LanguageDialog(object):
languageDialog.setSizePolicy(sizePolicy) languageDialog.setSizePolicy(sizePolicy)
self.widget = QtGui.QWidget(languageDialog) self.widget = QtGui.QWidget(languageDialog)
self.widget.setGeometry(QtCore.QRect(10, 15, 381, 151)) self.widget.setGeometry(QtCore.QRect(10, 15, 381, 151))
self.widget.setObjectName("widget") self.widget.setObjectName(u'widget')
self.verticalLayout = QtGui.QVBoxLayout(self.widget) self.verticalLayout = QtGui.QVBoxLayout(self.widget)
self.verticalLayout.setObjectName("verticalLayout") self.verticalLayout.setObjectName(u'verticalLayout')
self.headlineLabel = QtGui.QLabel(self.widget) self.headlineLabel = QtGui.QLabel(self.widget)
font = QtGui.QFont() font = QtGui.QFont()
font.setFamily("Arial") font.setFamily(u'Arial')
font.setPointSize(11) font.setPointSize(11)
font.setWeight(75) font.setWeight(75)
font.setBold(True) font.setBold(True)
self.headlineLabel.setFont(font) self.headlineLabel.setFont(font)
self.headlineLabel.setObjectName("HeadlineLabel") self.headlineLabel.setObjectName(u'HeadlineLabel')
self.verticalLayout.addWidget(self.headlineLabel) self.verticalLayout.addWidget(self.headlineLabel)
self.infoLabel = QtGui.QLabel(self.widget) self.infoLabel = QtGui.QLabel(self.widget)
self.infoLabel.setObjectName("InfoLabel") self.infoLabel.setObjectName(u'InfoLabel')
self.verticalLayout.addWidget(self.infoLabel) self.verticalLayout.addWidget(self.infoLabel)
self.formLayout = QtGui.QFormLayout() self.formLayout = QtGui.QFormLayout()
self.formLayout.setObjectName("formLayout") self.formLayout.setObjectName(u'formLayout')
self.requestLabel = QtGui.QLabel(self.widget) self.requestLabel = QtGui.QLabel(self.widget)
self.requestLabel.setObjectName("RequestLabel") self.requestLabel.setObjectName(u'RequestLabel')
self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
self.requestLabel) self.requestLabel)
self.requestComboBox = QtGui.QComboBox(self.widget) self.requestComboBox = QtGui.QComboBox(self.widget)
@ -71,7 +71,7 @@ class Ui_LanguageDialog(object):
sizePolicy.setHeightForWidth(self.requestComboBox.sizePolicy() sizePolicy.setHeightForWidth(self.requestComboBox.sizePolicy()
.hasHeightForWidth()) .hasHeightForWidth())
self.requestComboBox.setSizePolicy(sizePolicy) self.requestComboBox.setSizePolicy(sizePolicy)
self.requestComboBox.setObjectName("RequestComboBox") self.requestComboBox.setObjectName(u'RequestComboBox')
self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
self.requestComboBox) self.requestComboBox)
self.verticalLayout.addLayout(self.formLayout) self.verticalLayout.addLayout(self.formLayout)
@ -85,10 +85,10 @@ class Ui_LanguageDialog(object):
def retranslateUi(self, languageDialog): def retranslateUi(self, languageDialog):
languageDialog.setWindowTitle( languageDialog.setWindowTitle(
translate("BiblesPlugin.LanguageDialog", "Choose Language")) translate('BiblesPlugin.LanguageDialog', 'Choose Language'))
self.headlineLabel.setText( self.headlineLabel.setText(
translate("BiblesPlugin.LanguageDialog", "Choose Language:")) translate('BiblesPlugin.LanguageDialog', 'Choose Language:'))
self.infoLabel.setText(translate("BiblesPlugin.LanguageDialog", self.infoLabel.setText(translate('BiblesPlugin.LanguageDialog',
"Please choose the language the bible is.")) 'Please choose the language the bible is.'))
self.requestLabel.setText(translate("BiblesPlugin.languageDialog", self.requestLabel.setText(translate('BiblesPlugin.languageDialog',
"Language:")) 'Language:'))

4
openlp/plugins/bibles/forms/languageform.py
View File

@ -41,7 +41,7 @@ log = logging.getLogger(__name__)
class LanguageForm(QDialog, Ui_LanguageDialog): class LanguageForm(QDialog, Ui_LanguageDialog):
""" """
Class documentation goes here. Class to manage a dialog which ask the user for a language.
""" """
log.info(u'LanguageForm loaded') log.info(u'LanguageForm loaded')
@ -61,7 +61,7 @@ class LanguageForm(QDialog, Ui_LanguageDialog):
return QDialog.exec_(self) return QDialog.exec_(self)
def accept(self): def accept(self):
if self.requestComboBox.currentText() == u"": if self.requestComboBox.currentText() == u'':
critical_error_message_box( critical_error_message_box(
message=translate('BiblesPlugin.LanguageForm', message=translate('BiblesPlugin.LanguageForm',
'You need to choose a language.')) 'You need to choose a language.'))

2
openlp/plugins/bibles/lib/csvbible.py
View File

@ -139,7 +139,7 @@ class CSVBible(BibleDB):
self.wizard.progressBar.setMinimum(0) self.wizard.progressBar.setMinimum(0)
self.wizard.progressBar.setMaximum(66) self.wizard.progressBar.setMaximum(66)
success = True success = True
language = self.parent.mediaItem.languageDialog() language = self.parent.manager.import_wizard.languageDialog()
if not language: if not language:
log.exception(u'Importing books from %s " '\ log.exception(u'Importing books from %s " '\
'failed' % self.booksfile) 'failed' % self.booksfile)

2
openlp/plugins/bibles/lib/db.py
View File

@ -785,7 +785,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
``name`` ``name``
The name or abbreviation of the language. The name or abbreviation of the language.
""" """
log.debug(u'BiblesResourcesDB.get_language("%s", "%s")', name) log.debug(u'BiblesResourcesDB.get_language("%s")', name)
if not isinstance(name, unicode): if not isinstance(name, unicode):
name = unicode(name) name = unicode(name)
name = name.title() name = name.title()

2
openlp/plugins/bibles/lib/http.py
View File

@ -414,7 +414,7 @@ class HTTPBible(BibleDB):
if bible[u'language_id']: if bible[u'language_id']:
language_id = bible[u'language_id'] language_id = bible[u'language_id']
else: else:
language = self.parent.mediaItem.languageDialog() language = self.parent.manager.import_wizard.languageDialog()
if not language: if not language:
log.exception(u'Importing books from %s - download name: "%s" '\ log.exception(u'Importing books from %s - download name: "%s" '\
'failed' % (self.download_source, self.download_name)) 'failed' % (self.download_source, self.download_name))

2
openlp/plugins/bibles/lib/manager.py
View File

@ -348,7 +348,7 @@ class BibleManager(object):
book_id = self.alternative_book_names_cache.get_book_reference_id( book_id = self.alternative_book_names_cache.get_book_reference_id(
book, language_id) book, language_id)
else: else:
book_ref = self.parent.mediaItem.bookNameDialog(book) book_ref = self.import_wizard.bookNameDialog(book)
log.debug(book_ref) log.debug(book_ref)
book_temp = BiblesResourcesDB.get_book(book_ref) book_temp = BiblesResourcesDB.get_book(book_ref)
log.debug(book_temp) log.debug(book_temp)

13
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -33,8 +33,7 @@ from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, \
from openlp.core.lib.searchedit import SearchEdit from openlp.core.lib.searchedit import SearchEdit
from openlp.core.lib.ui import UiStrings, add_widget_completer, \ from openlp.core.lib.ui import UiStrings, add_widget_completer, \
media_item_combo_box, critical_error_message_box media_item_combo_box, critical_error_message_box
from openlp.plugins.bibles.forms import BibleImportForm, BookNameForm, \ from openlp.plugins.bibles.forms import BibleImportForm
LanguageForm
from openlp.plugins.bibles.lib import LayoutStyle, DisplayStyle, \ from openlp.plugins.bibles.lib import LayoutStyle, DisplayStyle, \
VerseReferenceList, get_reference_match VerseReferenceList, get_reference_match
@ -287,16 +286,6 @@ class BibleMediaItem(MediaManagerItem):
if self.import_wizard.exec_(): if self.import_wizard.exec_():
self.reloadBibles() self.reloadBibles()
def bookNameDialog(self, name):
self.book_name = BookNameForm(self)
if self.book_name.exec_(name):
return unicode(self.book_name.requestComboBox.currentText())
def languageDialog(self):
self.language = LanguageForm(self)
if self.language.exec_():
return unicode(self.language.requestComboBox.currentText())
def loadBibles(self): def loadBibles(self):
log.debug(u'Loading Bibles') log.debug(u'Loading Bibles')
self.quickVersionComboBox.clear() self.quickVersionComboBox.clear()

2
openlp/plugins/bibles/lib/openlp1.py
View File

@ -58,7 +58,7 @@ class OpenLP1Bible(BibleDB):
except: except:
return False return False
#Create the bible language #Create the bible language
language = self.parent.mediaItem.languageDialog() language = self.parent.manager.import_wizard.languageDialog()
if not language: if not language:
log.exception(u'Importing books from %s " '\ log.exception(u'Importing books from %s " '\
'failed' % self.filename) 'failed' % self.filename)

2
openlp/plugins/bibles/lib/opensong.py
View File

@ -62,7 +62,7 @@ class OpenSongBible(BibleDB):
file = open(self.filename, u'r') file = open(self.filename, u'r')
opensong = objectify.parse(file) opensong = objectify.parse(file)
bible = opensong.getroot() bible = opensong.getroot()
language = self.parent.mediaItem.languageDialog() language = self.parent.manager.import_wizard.languageDialog()
if not language: if not language:
log.exception(u'Importing books from %s " '\ log.exception(u'Importing books from %s " '\
'failed' % self.filename) 'failed' % self.filename)

2
openlp/plugins/bibles/lib/osis.py
View File

@ -107,7 +107,7 @@ class OSISBible(BibleDB):
if detect_file: if detect_file:
detect_file.close() detect_file.close()
# Set meta language_id # Set meta language_id
language = self.parent.mediaItem.languageDialog() language = self.parent.manager.import_wizard.languageDialog()
if not language: if not language:
log.exception(u'Importing books from %s " '\ log.exception(u'Importing books from %s " '\
'failed' % self.filename) 'failed' % self.filename)