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

some fixes

This commit is contained in:
Armin Köhler 2012-04-04 21:34:14 +02:00
parent 0b246275b2
commit 5f88f49754
6 changed files with 50 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
openlp/plugins/bibles/forms/editbibledialog.py
View File

@ -53,40 +53,29 @@ class Ui_EditBibleDialog(object):
self.metaTabLayout.setObjectName(u'metaTabLayout')
self.versionNameLabel = QtGui.QLabel(self.metaTab)
self.versionNameLabel.setObjectName(u'versionNameLabel')
self.metaTabLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
self.versionNameLabel)
self.versionNameEdit = QtGui.QLineEdit(self.metaTab)
self.versionNameEdit.setObjectName(u'versionNameEdit')
self.versionNameLabel.setBuddy(self.versionNameEdit)
self.metaTabLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
self.versionNameEdit)
self.metaTabLayout.addRow(self.versionNameLabel, self.versionNameEdit)
self.copyrightLabel = QtGui.QLabel(self.metaTab)
self.copyrightLabel.setObjectName(u'copyrightLabel')
self.metaTabLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
self.copyrightLabel)
self.copyrightEdit = QtGui.QLineEdit(self.metaTab)
self.copyrightEdit.setObjectName(u'copyrightEdit')
self.copyrightLabel.setBuddy(self.copyrightEdit)
self.metaTabLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
self.copyrightEdit)
self.metaTabLayout.addRow(self.copyrightLabel, self.copyrightEdit)
self.permissionsLabel = QtGui.QLabel(self.metaTab)
self.permissionsLabel.setObjectName(u'permissionsLabel')
self.metaTabLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
self.permissionsLabel)
self.permissionsEdit = QtGui.QLineEdit(self.metaTab)
self.permissionsEdit.setObjectName(u'permissionsEdit')
self.permissionsLabel.setBuddy(self.permissionsEdit)
self.metaTabLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
self.permissionsEdit)
self.metaTabLayout.addRow(self.permissionsLabel, self.permissionsEdit)
self.languageSelectionLabel = QtGui.QLabel(self.metaTab)
self.languageSelectionLabel.setObjectName(u'languageSelectionLabel')
self.metaTabLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
self.languageSelectionLabel)
self.languageSelectionComboBox = QtGui.QComboBox(self.metaTab)
self.languageSelectionComboBox.setObjectName(
u'languageSelectionComboBox')
self.languageSelectionComboBox.addItems([u'', u'', u'', u''])
self.metaTabLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
self.metaTabLayout.addRow(self.languageSelectionLabel,
self.languageSelectionComboBox)
self.bibleTabWidget.addTab(self.metaTab, u'')
# Book name tab
@ -102,34 +91,29 @@ class Ui_EditBibleDialog(object):
self.scrollArea.setObjectName(u'scrollArea')
self.scrollArea.setHorizontalScrollBarPolicy(
QtCore.Qt.ScrollBarAlwaysOff)
self.bookNameGroupBox = QtGui.QWidget(self.scrollArea)
self.bookNameGroupBox.setObjectName(u'bookNameGroupBox')
self.bookNameGroupBoxLayout = QtGui.QFormLayout(self.bookNameGroupBox)
self.bookNameGroupBoxLayout.setObjectName(u'bookNameGroupBoxLayout')
self.bookNameWidget = QtGui.QWidget(self.scrollArea)
self.bookNameWidget.setObjectName(u'bookNameWidget')
self.bookNameWidgetLayout = QtGui.QFormLayout(self.bookNameWidget)
self.bookNameWidgetLayout.setObjectName(u'bookNameWidgetLayout')
self.bookNameLabel = {}
self.bookNameEdit= {}
x = 0
for book in BiblesResourcesDB.get_books():
self.bookNameLabel[book[u'abbreviation']] = QtGui.QLabel(
self.bookNameGroupBox)
self.bookNameWidget)
self.bookNameLabel[book[u'abbreviation']].setObjectName(
u'bookNameLabel[%s]' % book[u'abbreviation'])
self.bookNameGroupBoxLayout.setWidget(x,
QtGui.QFormLayout.LabelRole,
self.bookNameLabel[book[u'abbreviation']])
self.bookNameEdit[book[u'abbreviation']] = QtGui.QLineEdit(
self.bookNameGroupBox)
self.bookNameWidget)
self.bookNameEdit[book[u'abbreviation']].setObjectName(
u'bookNameEdit[%s]' % book[u'abbreviation'])
self.bookNameGroupBoxLayout.setWidget(x,
QtGui.QFormLayout.FieldRole,
self.bookNameWidgetLayout.addRow(
self.bookNameLabel[book[u'abbreviation']],
self.bookNameEdit[book[u'abbreviation']])
x = x+1
self.scrollArea.setWidget(self.bookNameGroupBox)
x = x + 1
self.scrollArea.setWidget(self.bookNameWidget)
self.bookNameTabLayout.addWidget(self.scrollArea)
self.spacer = QtGui.QSpacerItem(20, 5, QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Expanding)
self.bookNameTabLayout.addItem(self.spacer)
self.bookNameTabLayout.addStretch()
self.bibleTabWidget.addTab(self.bookNameTab, u'')
# Last few bits
self.dialogLayout.addWidget(self.bibleTabWidget)
@ -156,15 +140,16 @@ class Ui_EditBibleDialog(object):
self.bibleTabWidget.indexOf(self.bookNameTab),
translate('SongsPlugin.EditBibleForm', 'Custom Book Names'))
self.languageSelectionLabel.setText(
translate('BiblesPlugin.EditBibleForm', 'Bookname language:'))
translate('BiblesPlugin.EditBibleForm', 'Book name language:'))
self.languageSelectionComboBox.setItemText(0,
translate('BiblesPlugin.EditBibleForm', 'General Settings'))
self.languageSelectionComboBox.setItemText(LanguageSelection.Bible+1,
translate('BiblesPlugin.EditBibleForm', 'Bible language'))
self.languageSelectionComboBox.setItemText(LanguageSelection.Bible + 1,
translate('BiblesPlugin.EditBibleForm', 'Bible Language'))
self.languageSelectionComboBox.setItemText(
LanguageSelection.Application+1,
translate('BiblesPlugin.EditBibleForm', 'Application language'))
self.languageSelectionComboBox.setItemText(LanguageSelection.English+1,
LanguageSelection.Application + 1,
translate('BiblesPlugin.EditBibleForm', 'Application Language'))
self.languageSelectionComboBox.setItemText(
LanguageSelection.English + 1,
translate('BiblesPlugin.EditBibleForm', 'English'))
self.languageSelectionComboBox.setToolTip(
translate('BiblesPlugin.EditBibleForm', 'Multiple options:\n'

33
openlp/plugins/bibles/forms/editbibleform.py
View File

@ -52,8 +52,6 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
self.mediaitem = mediaitem
self.validate_error = []
self.booknames = BibleStrings().Booknames
# can this be automated?
self.width = 400
self.setupUi(self)
self.manager = manager
@ -76,7 +74,7 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
self.bible, u'Bookname language')
if self.bookname_language:
self.languageSelectionComboBox.setCurrentIndex(
int(self.bookname_language.value)+1)
int(self.bookname_language.value) + 1)
self.books = {}
self.webbible = self.manager.get_meta_data(self.bible,
u'download source')
@ -97,10 +95,10 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
self.bookNameEdit[book[u'abbreviation']].setText(
self.books[book[u'abbreviation']].name)
else:
self.bookNameGroupBoxLayout.removeWidget(
self.bookNameWidgetLayout.removeWidget(
self.bookNameLabel[book[u'abbreviation']])
self.bookNameLabel[book[u'abbreviation']].setParent(None)
self.bookNameGroupBoxLayout.removeWidget(
self.bookNameWidgetLayout.removeWidget(
self.bookNameEdit[book[u'abbreviation']])
self.bookNameEdit[book[u'abbreviation']].setParent(None)
@ -122,9 +120,9 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
self.copyright = unicode(self.copyrightEdit.text())
self.permissions = unicode(self.permissionsEdit.text())
self.bookname_language = \
self.languageSelectionComboBox.currentIndex()-1
self.languageSelectionComboBox.currentIndex() - 1
for error in self.validate_error:
self.changeBackgroundColor(error, 'white')
self.changeBackgroundColor(error)
if not self.validateMeta():
save = False
if not self.webbible and save:
@ -156,7 +154,7 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
Validate the Meta before saving.
"""
if not self.version:
self.changeBackgroundColor(self.versionNameEdit, 'red')
self.changeBackgroundColor(self.versionNameEdit, u'red')
self.validate_error = [self.versionNameEdit]
self.versionNameEdit.setFocus()
critical_error_message_box(UiStrings().EmptyField,
@ -164,7 +162,7 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
'You need to specify a version name for your Bible.'))
return False
elif not self.copyright:
self.changeBackgroundColor(self.copyrightEdit, 'red')
self.changeBackgroundColor(self.copyrightEdit, u'red')
self.validate_error = [self.copyrightEdit]
self.copyrightEdit.setFocus()
critical_error_message_box(UiStrings().EmptyField,
@ -175,7 +173,7 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
elif self.manager.exists(self.version) and \
self.manager.get_meta_data(self.bible, u'Version').value != \
self.version:
self.changeBackgroundColor(self.versionNameEdit, 'red')
self.changeBackgroundColor(self.versionNameEdit, u'red')
self.validate_error = [self.versionNameEdit]
self.versionNameEdit.setFocus()
critical_error_message_box(
@ -192,7 +190,7 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
"""
book_regex = re.compile(u'[\d]*[^\d]+$')
if not new_bookname:
self.changeBackgroundColor(self.bookNameEdit[abbreviation], 'red')
self.changeBackgroundColor(self.bookNameEdit[abbreviation], u'red')
self.validate_error = [self.bookNameEdit[abbreviation]]
self.bookNameEdit[abbreviation].setFocus()
critical_error_message_box(UiStrings().EmptyField,
@ -201,7 +199,7 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
self.booknames[abbreviation])
return False
elif not book_regex.match(new_bookname):
self.changeBackgroundColor(self.bookNameEdit[abbreviation], 'red')
self.changeBackgroundColor(self.bookNameEdit[abbreviation], u'red')
self.validate_error = [self.bookNameEdit[abbreviation]]
self.bookNameEdit[abbreviation].setFocus()
critical_error_message_box(UiStrings().EmptyField,
@ -216,9 +214,9 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
continue
if unicode(self.bookNameEdit[abbr].text()) == new_bookname:
self.changeBackgroundColor(self.bookNameEdit[abbreviation],
'red')
u'red')
self.bookNameEdit[abbreviation].setFocus()
self.changeBackgroundColor(self.bookNameEdit[abbr], 'red')
self.changeBackgroundColor(self.bookNameEdit[abbr], u'red')
self.validate_error = [self.bookNameEdit[abbr],
self.bookNameEdit[abbreviation]]
critical_error_message_box(
@ -230,10 +228,11 @@ class EditBibleForm(QtGui.QDialog, Ui_EditBibleDialog):
return False
return True
def changeBackgroundColor(self, lineedit, color):
def changeBackgroundColor(self, lineedit, color=None):
"""
Change the Background Color of the given LineEdit
"""
pal = QtGui.QPalette(lineedit.palette())
pal.setColor(QtGui.QPalette.Base,QtGui.QColor(color))
pal = QtGui.QPalette(self.palette())
if color:
pal.setColor(QtGui.QPalette.Base, QtGui.QColor(color))
lineedit.setPalette(pal)

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

@ -386,7 +386,7 @@ def parse_reference(reference, bible, language_selection, book_ref_id=False):
if bible.get_book_by_book_ref_id(value[u'id']):
book_ref_id = value[u'id']
break
elif bible.get_book_by_book_ref_id(book_ref_id):
elif not bible.get_book_by_book_ref_id(book_ref_id):
book_ref_id = False
ranges = match.group(u'ranges')
range_list = get_reference_match(u'range_separator').split(ranges)

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

@ -213,9 +213,7 @@ class BibleDB(QtCore.QObject, Manager):
The book object
"""
log.debug(u'BibleDB.update_book("%s")', book.name)
if self.save_object(book):
return True
return False
return self.save_object(book)
def delete_book(self, db_book):
"""

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

@ -328,7 +328,7 @@ class BibleManager(object):
language_selection = self.get_meta_data(bible, u'Bookname language')
if language_selection:
language_selection = int(language_selection.value)
if language_selection == None or language_selection == -1:
if language_selection is None or language_selection == -1:
language_selection = QtCore.QSettings().value(
self.settingsSection + u'/bookname language',
QtCore.QVariant(0)).toInt()[0]

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

@ -435,7 +435,7 @@ class BibleMediaItem(MediaManagerItem):
bible, u'Bookname language')
if language_selection:
language_selection = int(language_selection.value)
if language_selection == None or language_selection == -1:
if language_selection is None or language_selection == -1:
language_selection = QtCore.QSettings().value(
self.settingsSection + u'/bookname language',
QtCore.QVariant(0)).toInt()[0]
@ -514,7 +514,7 @@ class BibleMediaItem(MediaManagerItem):
bible, u'Bookname language')
if language_selection:
language_selection = int(language_selection.value)
if language_selection == None or language_selection == -1:
if language_selection is None or language_selection == -1:
language_selection = QtCore.QSettings().value(
self.settingsSection + u'/bookname language',
QtCore.QVariant(0)).toInt()[0]
@ -554,7 +554,7 @@ class BibleMediaItem(MediaManagerItem):
bible = unicode(self.quickVersionComboBox.currentText())
elif self.advancedTab.isVisible():
bible = unicode(self.advancedVersionComboBox.currentText())
if bible != u'':
if bible:
self.editBibleForm = EditBibleForm(self, self.plugin.formparent,
self.plugin.manager)
self.editBibleForm.loadBible(bible)
@ -566,7 +566,7 @@ class BibleMediaItem(MediaManagerItem):
bible = unicode(self.quickVersionComboBox.currentText())
elif self.advancedTab.isVisible():
bible = unicode(self.advancedVersionComboBox.currentText())
if bible != u'':
if bible:
if QtGui.QMessageBox.question(self, UiStrings().ConfirmDelete,
unicode(translate('BiblesPlugin.MediaItem',
'Are you sure you want to delete "%s"?')) % bible,
@ -843,7 +843,7 @@ class BibleMediaItem(MediaManagerItem):
bible, u'Bookname language')
if language_selection:
language_selection = int(language_selection.value)
if language_selection == None or language_selection == -1:
if language_selection is None or language_selection == -1:
language_selection = QtCore.QSettings().value(
self.settingsSection + u'/bookname language',
QtCore.QVariant(0)).toInt()[0]
@ -882,12 +882,11 @@ class BibleMediaItem(MediaManagerItem):
log.exception(u'The second_search_results does not have as '
'many verses as the search_results.')
break
bible_text = u'%s %d%s%d (%s, %s)' % (book,
verse.chapter, verse_separator, verse.verse, version,
second_version)
bible_text = u'%s %d%s%d (%s, %s)' % (book, verse.chapter,
verse_separator, verse.verse, version, second_version)
else:
bible_text = u'%s %d%s%d (%s)' % (book,
verse.chapter, verse_separator, verse.verse, version)
bible_text = u'%s %d%s%d (%s)' % (book, verse.chapter,
verse_separator, verse.verse, version)
bible_verse = QtGui.QListWidgetItem(bible_text)
bible_verse.setData(QtCore.Qt.UserRole, QtCore.QVariant(data))
items.append(bible_verse)