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

removed commented lines, name change

Browse Source
This commit is contained in:
Andreas Preikschat 2010-08-29 18:20:56 +02:00
parent 1911972177
commit 31aba2eadb
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,13 +406,13 @@ class BibleMediaItem(MediaManagerItem):
self.reloadBibles() self.reloadBibles()
def onAdvancedFromVerse(self): def onAdvancedFromVerse(self):
from_ = self.AdvancedFromVerse.currentText() frm = self.AdvancedFromVerse.currentText()
self.adjustComboBox(from_, self.verses, self.AdvancedToVerse) self.adjustComboBox(frm, self.verses, self.AdvancedToVerse)
def onAdvancedToChapter(self): def onAdvancedToChapter(self):
from_ = unicode(self.AdvancedFromChapter.currentText()) frm = unicode(self.AdvancedFromChapter.currentText())
to = unicode(self.AdvancedToChapter.currentText()) to = unicode(self.AdvancedToChapter.currentText())
if from_ != to: if frm != to:
bible = unicode(self.AdvancedVersionComboBox.currentText()) bible = unicode(self.AdvancedVersionComboBox.currentText())
book = unicode(self.AdvancedBookComboBox.currentText()) book = unicode(self.AdvancedBookComboBox.currentText())
# get the verse count for new chapter # get the verse count for new chapter
@ -495,7 +495,6 @@ class BibleMediaItem(MediaManagerItem):
bible = self._decodeQtObject(reference, 'bible') bible = self._decodeQtObject(reference, 'bible')
version = self._decodeQtObject(reference, 'version') version = self._decodeQtObject(reference, 'version')
copyright = self._decodeQtObject(reference, 'copyright') copyright = self._decodeQtObject(reference, 'copyright')
#permission = self._decodeQtObject(reference, 'permission')
text = self._decodeQtObject(reference, 'text') text = self._decodeQtObject(reference, 'text')
dual_bible = self._decodeQtObject(reference, 'dual_bible') dual_bible = self._decodeQtObject(reference, 'dual_bible')
if dual_bible: if dual_bible:
@ -503,8 +502,6 @@ class BibleMediaItem(MediaManagerItem):
'dual_version') 'dual_version')
dual_copyright = self._decodeQtObject(reference, dual_copyright = self._decodeQtObject(reference,
'dual_copyright') 'dual_copyright')
#dual_permission = self._decodeQtObject(reference,
# 'dual_permission')
dual_text = self._decodeQtObject(reference, 'dual_text') dual_text = self._decodeQtObject(reference, 'dual_text')
verse_text = self.formatVerse(old_chapter, chapter, verse) verse_text = self.formatVerse(old_chapter, chapter, verse)
footer = u'%s (%s %s)' % (book, version, copyright) footer = u'%s (%s %s)' % (book, version, copyright)
@ -642,18 +639,11 @@ class BibleMediaItem(MediaManagerItem):
""" """
version = self.parent.manager.get_meta_data(bible, u'Version') version = self.parent.manager.get_meta_data(bible, u'Version')
copyright = self.parent.manager.get_meta_data(bible, u'Copyright') copyright = self.parent.manager.get_meta_data(bible, u'Copyright')
#permission = self.parent.manager.get_meta_data(bible, u'Permissions')
if dual_bible: if dual_bible:
dual_version = self.parent.manager.get_meta_data(dual_bible, dual_version = self.parent.manager.get_meta_data(dual_bible,
u'Version') u'Version')
dual_copyright = self.parent.manager.get_meta_data(dual_bible, dual_copyright = self.parent.manager.get_meta_data(dual_bible,
u'Copyright') u'Copyright')
#dual_permission = self.parent.manager.get_meta_data(dual_bible,
# u'Permissions')
#if dual_permission:
# dual_permission = dual_permission.value
#else:
# dual_permission = u''
# We count the number of rows which are maybe already present. # We count the number of rows which are maybe already present.
start_count = self.listView.count() start_count = self.listView.count()
for count, verse in enumerate(self.search_results): for count, verse in enumerate(self.search_results):
@ -665,12 +655,10 @@ class BibleMediaItem(MediaManagerItem):
'bible': QtCore.QVariant(bible), 'bible': QtCore.QVariant(bible),
'version': QtCore.QVariant(version.value), 'version': QtCore.QVariant(version.value),
'copyright': QtCore.QVariant(copyright.value), 'copyright': QtCore.QVariant(copyright.value),
#'permission': QtCore.QVariant(permission.value),
'text': QtCore.QVariant(verse.text), 'text': QtCore.QVariant(verse.text),
'dual_bible': QtCore.QVariant(dual_bible), 'dual_bible': QtCore.QVariant(dual_bible),
'dual_version': QtCore.QVariant(dual_version.value), 'dual_version': QtCore.QVariant(dual_version.value),
'dual_copyright': QtCore.QVariant(dual_copyright.value), 'dual_copyright': QtCore.QVariant(dual_copyright.value),
#'dual_permission': QtCore.QVariant(dual_permission),
'dual_text': QtCore.QVariant( 'dual_text': QtCore.QVariant(
self.dual_search_results[count].text) self.dual_search_results[count].text)
} }
@ -684,7 +672,6 @@ class BibleMediaItem(MediaManagerItem):
'bible': QtCore.QVariant(bible), 'bible': QtCore.QVariant(bible),
'version': QtCore.QVariant(version.value), 'version': QtCore.QVariant(version.value),
'copyright': QtCore.QVariant(copyright.value), 'copyright': QtCore.QVariant(copyright.value),
#'permission': QtCore.QVariant(permission.value),
'text': QtCore.QVariant(verse.text), 'text': QtCore.QVariant(verse.text),
'dual_bible': QtCore.QVariant(dual_bible) 'dual_bible': QtCore.QVariant(dual_bible)
} }