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

code cleanup 

small fixes
This commit is contained in:
Armin Köhler 2011-05-03 22:34:39 +02:00
parent 368987bb67
commit 4ee247c8b1
8 changed files with 55 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp.pyw
View File

@ -132,9 +132,9 @@ class OpenLP(QtGui.QApplication):
if update_check: if update_check:
VersionThread(self.mainWindow).start() VersionThread(self.mainWindow).start()
for plugin in self.mainWindow.pluginManager.plugins: for plugin in self.mainWindow.pluginManager.plugins:
if plugin.name == u'Bibles' and plugin.isActive() and len( if plugin.name == u'Bibles' and plugin.isActive() and not \
SettingsManager.get_files(u'bibles/bibles', u'.sqlite')) == 0 \ len(SettingsManager.get_files( u'bibles/bibles', u'.sqlite')) \
and len(SettingsManager.get_files(u'bibles', u'.sqlite')) > 0: and SettingsManager.get_files(u'bibles', u'.sqlite'):
if QtGui.QMessageBox.information(self.mainWindow, if QtGui.QMessageBox.information(self.mainWindow,
translate('OpenLP', 'Information'), translate('OpenLP', translate('OpenLP', 'Information'), translate('OpenLP',
'Bible format has changed.\nYou have to upgrade your ' 'Bible format has changed.\nYou have to upgrade your '

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

@ -637,9 +637,9 @@ class BibleImportForm(OpenLPWizard):
bibles = BiblesResourcesDB.get_webbibles( bibles = BiblesResourcesDB.get_webbibles(
WebDownload.Names[download_type]) WebDownload.Names[download_type])
for bible in bibles: for bible in bibles:
ver = bible[u'name'] version = bible[u'name']
name = bible[u'abbreviation'] name = bible[u'abbreviation']
self.web_bible_list[download_type][ver] = name.strip() self.web_bible_list[download_type][version] = name.strip()
def preWizard(self): def preWizard(self):
""" """
@ -720,4 +720,5 @@ class BibleImportForm(OpenLPWizard):
self.progressLabel.setText(translate( self.progressLabel.setText(translate(
'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(AppLocation.get_section_data_path(u'bibles/bibles'),
importer.file)

37
openlp/plugins/bibles/forms/bibleupgradeform.py
View File

@ -98,11 +98,11 @@ class BibleUpgradeForm(OpenLPWizard):
self.stop_import_flag = True self.stop_import_flag = True
def onCheckBoxIndexChanged(self, index): def onCheckBoxIndexChanged(self, index):
''' """
Show/ Hide warnings if CheckBox state has changed Show/ Hide warnings if CheckBox state has changed
''' """
for number, filename in enumerate(self.files): for number, filename in enumerate(self.files):
if not self.checkBox[number].checkState() == 2: if not self.checkBox[number].checkState() == QtCore.Qt.Checked:
self.verticalWidget[number].hide() self.verticalWidget[number].hide()
self.formWidget[number].hide() self.formWidget[number].hide()
else: else:
@ -134,15 +134,15 @@ class BibleUpgradeForm(OpenLPWizard):
self.next() self.next()
def onFinishButton(self): def onFinishButton(self):
''' """
Some cleanup while finishing Some cleanup while finishing
''' """
if self.deleteCheckBox.checkState() == 2 or \ if self.deleteCheckBox.checkState() == QtCore.Qt.Checked or \
self.deleteAllCheckBox.checkState() == 2: self.deleteAllCheckBox.checkState() == QtCore.Qt.Checked:
for number, filename in enumerate(self.files): for number, filename in enumerate(self.files):
if self.deleteAllCheckBox.checkState() == 2 or \ if self.deleteAllCheckBox.checkState() == QtCore.Qt.Checked or \
(self.checkBox[number].checkState() == 2 and \ (self.checkBox[number].checkState() == QtCore.Qt.Checked \
self.success[number] == True): and self.success[number]):
delete_file(os.path.join(self.oldpath, filename)) delete_file(os.path.join(self.oldpath, filename))
def customInit(self): def customInit(self):
@ -204,7 +204,7 @@ class BibleUpgradeForm(OpenLPWizard):
checkBoxName = u'checkBox['+unicode(number)+u']' checkBoxName = u'checkBox['+unicode(number)+u']'
self.checkBox[number].setObjectName(checkBoxName) self.checkBox[number].setObjectName(checkBoxName)
self.checkBox[number].setText(bible.get_name()) self.checkBox[number].setText(bible.get_name())
self.checkBox[number].setCheckState(2) self.checkBox[number].setCheckState(QtCore.Qt.Checked)
self.formLayout.addWidget(self.checkBox[number]) self.formLayout.addWidget(self.checkBox[number])
self.verticalWidget[number] = QtGui.QWidget(self.scrollAreaContents) self.verticalWidget[number] = QtGui.QWidget(self.scrollAreaContents)
verticalWidgetName = u'verticalWidget['+unicode(number)+u']' verticalWidgetName = u'verticalWidget['+unicode(number)+u']'
@ -356,7 +356,7 @@ class BibleUpgradeForm(OpenLPWizard):
return True return True
elif self.currentPage() == self.selectPage: elif self.currentPage() == self.selectPage:
for number, filename in enumerate(self.files): for number, filename in enumerate(self.files):
if not self.checkBox[number].checkState() == 2: if not self.checkBox[number].checkState() == QtCore.Qt.Checked:
continue continue
version_name = unicode(self.versionNameEdit[number].text()) version_name = unicode(self.versionNameEdit[number].text())
oldbible = OldBibleDB(self.mediaItem, path=self.oldpath, oldbible = OldBibleDB(self.mediaItem, path=self.oldpath,
@ -424,7 +424,7 @@ class BibleUpgradeForm(OpenLPWizard):
self.finishButton.setVisible(False) self.finishButton.setVisible(False)
self.cancelButton.setVisible(True) self.cancelButton.setVisible(True)
for number, filename in enumerate(self.files): for number, filename in enumerate(self.files):
self.checkBox[number].setCheckState(2) self.checkBox[number].setCheckState(QtCore.Qt.Checked)
if os.path.exists(os.path.join(self.newpath, filename)): if os.path.exists(os.path.join(self.newpath, filename)):
self.verticalWidget[number].show() self.verticalWidget[number].show()
self.formWidget[number].show() self.formWidget[number].show()
@ -434,9 +434,9 @@ class BibleUpgradeForm(OpenLPWizard):
self.progressBar.show() self.progressBar.show()
self.progressLabelAfter.hide() self.progressLabelAfter.hide()
self.deleteCheckBox.hide() self.deleteCheckBox.hide()
self.deleteCheckBox.setCheckState(0) self.deleteCheckBox.setCheckState(QtCore.Qt.Unchecked)
self.deleteAllCheckBox.hide() self.deleteAllCheckBox.hide()
self.deleteAllCheckBox.setCheckState(0) self.deleteAllCheckBox.setCheckState(QtCore.Qt.Unchecked)
self.restart() self.restart()
settings.endGroup() settings.endGroup()
@ -464,13 +464,13 @@ class BibleUpgradeForm(OpenLPWizard):
return return
self.maxBibles = 0 self.maxBibles = 0
for number, file in enumerate(self.files): for number, file in enumerate(self.files):
if self.checkBox[number].checkState() == 2: if self.checkBox[number].checkState() == QtCore.Qt.Checked:
self.maxBibles += 1 self.maxBibles += 1
number = 0 number = 0
for biblenumber, filename in enumerate(self.files): for biblenumber, filename in enumerate(self.files):
bible_failed = False bible_failed = False
self.success[biblenumber] = False self.success[biblenumber] = False
if not self.checkBox[biblenumber].checkState() == 2: if not self.checkBox[biblenumber].checkState() == QtCore.Qt.Checked:
continue continue
self.progressBar.reset() self.progressBar.reset()
oldbible = OldBibleDB(self.mediaItem, path=self.oldpath, oldbible = OldBibleDB(self.mediaItem, path=self.oldpath,
@ -655,7 +655,8 @@ class BibleUpgradeForm(OpenLPWizard):
for number, success in self.success.iteritems(): for number, success in self.success.iteritems():
if success == True: if success == True:
successful_import += 1 successful_import += 1
elif success == False and self.checkBox[number].checkState() == 2: elif success == False and self.checkBox[number].checkState() == \
QtCore.Qt.Checked:
failed_import += 1 failed_import += 1
if failed_import > 0: if failed_import > 0:
failed_import_text = unicode(translate( failed_import_text = unicode(translate(

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

@ -80,15 +80,15 @@ class Ui_BookNameDialog(object):
self.verticalLayout.addWidget(self.infoLabelTestaments) self.verticalLayout.addWidget(self.infoLabelTestaments)
self.checkBoxOldTestament = QtGui.QCheckBox(self.widget) self.checkBoxOldTestament = QtGui.QCheckBox(self.widget)
self.checkBoxOldTestament.setObjectName(u'OldTestament') self.checkBoxOldTestament.setObjectName(u'OldTestament')
self.checkBoxOldTestament.setCheckState(2) self.checkBoxOldTestament.setCheckState(QtCore.Qt.Checked)
self.verticalLayout.addWidget(self.checkBoxOldTestament) self.verticalLayout.addWidget(self.checkBoxOldTestament)
self.checkBoxNewTestament = QtGui.QCheckBox(self.widget) self.checkBoxNewTestament = QtGui.QCheckBox(self.widget)
self.checkBoxNewTestament.setObjectName(u'OldTestament') self.checkBoxNewTestament.setObjectName(u'OldTestament')
self.checkBoxNewTestament.setCheckState(2) self.checkBoxNewTestament.setCheckState(QtCore.Qt.Checked)
self.verticalLayout.addWidget(self.checkBoxNewTestament) self.verticalLayout.addWidget(self.checkBoxNewTestament)
self.checkBoxApocrypha = QtGui.QCheckBox(self.widget) self.checkBoxApocrypha = QtGui.QCheckBox(self.widget)
self.checkBoxApocrypha.setObjectName(u'OldTestament') self.checkBoxApocrypha.setObjectName(u'OldTestament')
self.checkBoxApocrypha.setCheckState(2) self.checkBoxApocrypha.setCheckState(QtCore.Qt.Checked)
self.verticalLayout.addWidget(self.checkBoxApocrypha) self.verticalLayout.addWidget(self.checkBoxApocrypha)
self.verticalLayout.addWidget( self.verticalLayout.addWidget(
create_accept_reject_button_box(bookNameDialog)) create_accept_reject_button_box(bookNameDialog))

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

@ -79,7 +79,6 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
''' '''
Reload the Combobox items Reload the Combobox items
''' '''
items = []
self.requestComboBox.clear() self.requestComboBox.clear()
self.requestComboBox.addItem(u'') self.requestComboBox.addItem(u'')
items = BiblesResourcesDB.get_books() items = BiblesResourcesDB.get_books()
@ -89,26 +88,26 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
if book.book_reference_id == item[u'id']: if book.book_reference_id == item[u'id']:
addBook = False addBook = False
break break
if self.checkBoxOldTestament.checkState() == 0 and \ if self.checkBoxOldTestament.checkState() == QtCore.Qt.Unchecked \
item[u'testament_id'] == 1: and item[u'testament_id'] == 1:
addBook = False addBook = False
elif self.checkBoxNewTestament.checkState() == 0 and \ elif self.checkBoxNewTestament.checkState() == QtCore.Qt.Unchecked \
item[u'testament_id'] == 2: and item[u'testament_id'] == 2:
addBook = False addBook = False
elif self.checkBoxApocrypha.checkState() == 0 and \ elif self.checkBoxApocrypha.checkState() == QtCore.Qt.Unchecked \
item[u'testament_id'] == 3: and item[u'testament_id'] == 3:
addBook = False addBook = False
if addBook == True: if addBook:
self.requestComboBox.addItem(item[u'name']) self.requestComboBox.addItem(item[u'name'])
def exec_(self, name, books, maxbooks): def exec_(self, name, books, maxbooks):
self.books = books self.books = books
log.debug(maxbooks) log.debug(maxbooks)
if maxbooks <= 27: if maxbooks <= 27:
self.checkBoxOldTestament.setCheckState(0) self.checkBoxOldTestament.setCheckState(QtCore.Qt.Unchecked)
self.checkBoxApocrypha.setCheckState(0) self.checkBoxApocrypha.setCheckState(QtCore.Qt.Unchecked)
elif maxbooks <= 66: elif maxbooks <= 66:
self.checkBoxApocrypha.setCheckState(0) self.checkBoxApocrypha.setCheckState(QtCore.Qt.Unchecked)
self.reloadComboBox() self.reloadComboBox()
self.requestLabel.setText(name) self.requestLabel.setText(name)
return QDialog.exec_(self) return QDialog.exec_(self)

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

@ -53,7 +53,6 @@ class LanguageForm(QDialog, Ui_LanguageDialog):
self.setupUi(self) self.setupUi(self)
def exec_(self): def exec_(self):
items = []
self.requestComboBox.addItem(u'') self.requestComboBox.addItem(u'')
items = BiblesResourcesDB.get_languages() items = BiblesResourcesDB.get_languages()
for item in items: for item in items:

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

@ -476,9 +476,9 @@ class BibleDB(QtCore.QObject, Manager):
log.debug(u'BibleDB.get_language()') log.debug(u'BibleDB.get_language()')
from openlp.plugins.bibles.forms import LanguageForm from openlp.plugins.bibles.forms import LanguageForm
language = None language = None
lang = LanguageForm(self.wizard) language_form = LanguageForm(self.wizard)
if lang.exec_(): if language_form.exec_():
language = unicode(lang.requestComboBox.currentText()) language = unicode(language_form.requestComboBox.currentText())
if not language: if not language:
return False return False
language = BiblesResourcesDB.get_language(language) language = BiblesResourcesDB.get_language(language)
@ -550,11 +550,11 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
u'abbreviation, chapters FROM book_reference ORDER BY id') u'abbreviation, chapters FROM book_reference ORDER BY id')
return [ return [
{ {
u'id': book[0], u'id': book[0],
u'testament_id': book[1], u'testament_id': book[1],
u'name': unicode(book[2]), u'name': unicode(book[2]),
u'abbreviation': unicode(book[3]), u'abbreviation': unicode(book[3]),
u'chapters': book[4] u'chapters': book[4]
} }
for book in books for book in books
] ]

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

@ -419,9 +419,11 @@ class HTTPBible(BibleDB):
'failed' % self.filename) 'failed' % self.filename)
return False return False
for book in books: for book in books:
if self.stop_import_flag:
break
self.wizard.incrementProgressBar(unicode(translate( self.wizard.incrementProgressBar(unicode(translate(
'BiblesPlugin.HTTPBible', 'Importing %s...', 'BiblesPlugin.HTTPBible', 'Importing %s...',
'Importing <book name>...')) % book) 'Importing <book name>...')) % book)
book_ref_id = self.get_book_ref_id_by_name(book, len(books), book_ref_id = self.get_book_ref_id_by_name(book, len(books),
language_id) language_id)
if not book_ref_id: if not book_ref_id:
@ -432,7 +434,10 @@ class HTTPBible(BibleDB):
log.debug(u'Book details: Name:%s; id:%s; testament_id:%s', log.debug(u'Book details: Name:%s; id:%s; testament_id:%s',
book, book_ref_id, book_details[u'testament_id']) book, book_ref_id, book_details[u'testament_id'])
self.create_book(book, book_ref_id, book_details[u'testament_id']) self.create_book(book, book_ref_id, book_details[u'testament_id'])
return True if self.stop_import_flag:
return False
else:
return True
def get_verses(self, reference_list): def get_verses(self, reference_list):
""" """