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

Fix Line split code. Stop SlideController being editied

This commit is contained in:
Tim Bentley 2009-10-26 16:19:26 +00:00
parent 6dd0db436e
commit 3ee930f6ae
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openlp/core/ui/slidecontroller.py
View File

@ -120,6 +120,7 @@ class SlideController(QtGui.QWidget):
self.PreviewListWidget.setColumnWidth(1, self.Controller.width())
self.PreviewListWidget.isLive = self.isLive
self.PreviewListWidget.setObjectName(u'PreviewListWidget')
self.PreviewListWidget.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
self.ControllerLayout.addWidget(self.PreviewListWidget)
# Build the full toolbar
self.Toolbar = OpenLPToolbar(self)

26
openlp/plugins/bibles/lib/bibleHTTPimpl.py
View File

@ -35,27 +35,24 @@ class BGExtract(BibleCommon):
log.debug(u'init %s', proxyurl)
self.proxyurl = proxyurl
def get_bible_chapter(self, version, bookid, bookname, chapter) :
def get_bible_chapter(self, version, bookname, chapter) :
"""
Access and decode bibles via the BibleGateway website
``Version``
The version of the bible like 31 for New International version
``bookid``
Book id for the book of the bible - eg 1 for Genesis
``bookname``
Not used
Name of the Book
``chapter``
Chapter number
"""
log.debug(u'get_bible_chapter %s,%s,%s,%s',
version, bookid, bookname, chapter)
urlstring = u'http://www.biblegateway.com/passage/?book_id=' + \
unicode(bookid) + u'&chapter' + unicode(chapter) + u'&version=' + \
unicode(version)
log.debug(u'get_bible_chapter %s,%s,%s',
version, bookname, chapter)
urlstring = \
u'http://www.biblegateway.com/passage/?search=%s %s&version=%s' % \
(bookname, unicode(chapter) , version)
xml_string = self._get_web_text(urlstring, self.proxyurl)
VerseSearch = u'class=' + u'"' + u'sup' + u'"' + u'>'
verse = 1
@ -95,18 +92,15 @@ class CWExtract(BibleCommon):
log.debug(u'init %s', proxyurl)
self.proxyurl = proxyurl
def get_bible_chapter(self, version, bookid, bookname, chapter) :
log.debug(u'getBibleChapter %s,%s,%s,%s',
version, bookid, bookname, chapter)
def get_bible_chapter(self, version, bookname, chapter) :
log.debug(u'getBibleChapter %s,%s,%s',
version,bookname, chapter)
"""
Access and decode bibles via the Crosswalk website
``version``
The version of the bible like niv for New International Version
``bookid``
Not used
``bookname``
Text name of in english e.g. 'gen' for Genesis

2
openlp/plugins/songs/forms/editsongform.py
View File

@ -339,7 +339,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
verse_list = self.verse_form.getVerse()
verse_list = verse_list.replace(u'\r\n', u'\n')
self.VerseListWidget.clear()
for row in verse_list.split(u'\n---'):
for row in verse_list.split(u'\n---\n'):
self.VerseListWidget.addItem(row)
self.VerseListWidget.repaint()