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

bug fixes

Browse Source 
setFocus to the Combobox in booknameform
This commit is contained in:
Armin Köhler 2011-05-27 11:39:58 +02:00
parent e5231aba41
commit 8eb261ee88
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,7 +439,10 @@ class BibleUpgradeForm(OpenLPWizard):
if not self.checkBox[biblenumber].checkState() == QtCore.Qt.Checked: if not self.checkBox[biblenumber].checkState() == QtCore.Qt.Checked:
continue continue
self.progressBar.reset() self.progressBar.reset()
if filename[1] is None: oldbible = OldBibleDB(self.mediaItem, path=self.path,
file=filename[0])
name = filename[1]
if name is None:
delete_file(os.path.join(self.path, filename[0])) delete_file(os.path.join(self.path, filename[0]))
self.incrementProgressBar(unicode(translate( self.incrementProgressBar(unicode(translate(
'BiblesPlugin.UpgradeWizardForm', 'BiblesPlugin.UpgradeWizardForm',
@ -596,6 +599,9 @@ class BibleUpgradeForm(OpenLPWizard):
self.newbibles[number].delete_book(db_book) self.newbibles[number].delete_book(db_book)
continue continue
for verse in verses: for verse in verses:
if self.stop_import_flag:
bible_failed = True
break
self.newbibles[number].create_verse(db_book.id, self.newbibles[number].create_verse(db_book.id,
int(verse[u'chapter']), int(verse[u'chapter']),
int(verse[u'verse']), unicode(verse[u'text'])) int(verse[u'verse']), unicode(verse[u'text']))

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

@ -110,6 +110,7 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
self.apocryphaCheckBox.setCheckState(QtCore.Qt.Unchecked) self.apocryphaCheckBox.setCheckState(QtCore.Qt.Unchecked)
self.reloadComboBox() self.reloadComboBox()
self.currentLineEdit.setText(name) self.currentLineEdit.setText(name)
self.correspondingComboBox.setFocus()
return QDialog.exec_(self) return QDialog.exec_(self)
def accept(self): def accept(self):