forked from openlp/openlp
Head r852
This commit is contained in:
commit
226277e55d
@ -173,7 +173,7 @@ class ServiceItem(object):
|
|||||||
self.render_manager.set_override_theme(self.theme)
|
self.render_manager.set_override_theme(self.theme)
|
||||||
format = self._display_frames[row][u'text'].split(u'\n')
|
format = self._display_frames[row][u'text'].split(u'\n')
|
||||||
#if screen blank then do not display footer
|
#if screen blank then do not display footer
|
||||||
if self.cache[row] is not None:
|
if len(self.cache) > 0 and self.cache[row] is not None:
|
||||||
frame = self.cache[row]
|
frame = self.cache[row]
|
||||||
else:
|
else:
|
||||||
if format[0]:
|
if format[0]:
|
||||||
|
@ -96,6 +96,7 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
|
|||||||
self.itemList.remove(self.itemList[row])
|
self.itemList.remove(self.itemList[row])
|
||||||
self.itemList.insert(row - 1, temp)
|
self.itemList.insert(row - 1, temp)
|
||||||
self.loadData()
|
self.loadData()
|
||||||
|
self.listWidget.setCurrentRow(row - 1)
|
||||||
|
|
||||||
def onItemDown(self):
|
def onItemDown(self):
|
||||||
"""
|
"""
|
||||||
@ -109,3 +110,4 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
|
|||||||
self.itemList.remove(self.itemList[row])
|
self.itemList.remove(self.itemList[row])
|
||||||
self.itemList.insert(row + 1, temp)
|
self.itemList.insert(row + 1, temp)
|
||||||
self.loadData()
|
self.loadData()
|
||||||
|
self.listWidget.setCurrentRow(row + 1)
|
||||||
|
@ -536,7 +536,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.PreviewListWidget.setCursor(QtCore.Qt.PointingHandCursor)
|
self.PreviewListWidget.setCursor(QtCore.Qt.PointingHandCursor)
|
||||||
before = time.time()
|
before = time.time()
|
||||||
#Clear the old serviceItem cache to release memory
|
#Clear the old serviceItem cache to release memory
|
||||||
if self.serviceItem:
|
if self.serviceItem and self.serviceItem is not serviceItem:
|
||||||
self.serviceItem.cache = []
|
self.serviceItem.cache = []
|
||||||
self.serviceItem = serviceItem
|
self.serviceItem = serviceItem
|
||||||
self.PreviewListWidget.clear()
|
self.PreviewListWidget.clear()
|
||||||
|
@ -146,7 +146,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
self.QuickMessage = QtGui.QLabel(self.QuickTab)
|
self.QuickMessage = QtGui.QLabel(self.QuickTab)
|
||||||
self.QuickMessage.setObjectName(u'QuickMessage')
|
self.QuickMessage.setObjectName(u'QuickMessage')
|
||||||
self.QuickLayout.addWidget(self.QuickMessage, 6, 0, 1, 3)
|
self.QuickLayout.addWidget(self.QuickMessage, 6, 0, 1, 3)
|
||||||
self.SearchTabWidget.addTab(self.QuickTab,
|
self.SearchTabWidget.addTab(self.QuickTab,
|
||||||
translate(u'BiblesPlugin.MediaItem', u'Quick'))
|
translate(u'BiblesPlugin.MediaItem', u'Quick'))
|
||||||
QuickSpacerItem = QtGui.QSpacerItem(20, 35, QtGui.QSizePolicy.Minimum,
|
QuickSpacerItem = QtGui.QSpacerItem(20, 35, QtGui.QSizePolicy.Minimum,
|
||||||
QtGui.QSizePolicy.Expanding)
|
QtGui.QSizePolicy.Expanding)
|
||||||
@ -231,7 +231,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
self.AdvancedMessage = QtGui.QLabel(self.AdvancedTab)
|
self.AdvancedMessage = QtGui.QLabel(self.AdvancedTab)
|
||||||
self.AdvancedMessage.setObjectName(u'AdvancedMessage')
|
self.AdvancedMessage.setObjectName(u'AdvancedMessage')
|
||||||
self.AdvancedLayout.addWidget(self.AdvancedMessage, 8, 0, 1, 3)
|
self.AdvancedLayout.addWidget(self.AdvancedMessage, 8, 0, 1, 3)
|
||||||
self.SearchTabWidget.addTab(self.AdvancedTab,
|
self.SearchTabWidget.addTab(self.AdvancedTab,
|
||||||
translate(u'BiblesPlugin.MediaItem', u'Advanced'))
|
translate(u'BiblesPlugin.MediaItem', u'Advanced'))
|
||||||
# Add the search tab widget to the page layout
|
# Add the search tab widget to the page layout
|
||||||
self.PageLayout.addWidget(self.SearchTabWidget)
|
self.PageLayout.addWidget(self.SearchTabWidget)
|
||||||
@ -386,7 +386,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
def onNoBookFound(self):
|
def onNoBookFound(self):
|
||||||
QtGui.QMessageBox.critical(self,
|
QtGui.QMessageBox.critical(self,
|
||||||
translate(u'BiblesPlugin.MediaItem', u'No Book Found'),
|
translate(u'BiblesPlugin.MediaItem', u'No Book Found'),
|
||||||
translate(u'BiblesPlugin.MediaItem',
|
translate(u'BiblesPlugin.MediaItem',
|
||||||
u'No matching book could be found in this Bible.'),
|
u'No matching book could be found in this Bible.'),
|
||||||
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
|
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
|
||||||
QtGui.QMessageBox.Ok
|
QtGui.QMessageBox.Ok
|
||||||
@ -494,7 +494,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
if bible2_version:
|
if bible2_version:
|
||||||
bible2_version = bible2_version.value
|
bible2_version = bible2_version.value
|
||||||
else:
|
else:
|
||||||
bible2_version = u''
|
bible2_version = u''
|
||||||
if bible2_copyright:
|
if bible2_copyright:
|
||||||
bible2_copyright = bible2_copyright.value
|
bible2_copyright = bible2_copyright.value
|
||||||
else:
|
else:
|
||||||
@ -557,7 +557,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
service_item.title = u'%s %s' % (book, verse_text)
|
service_item.title = u'%s %s' % (book, verse_text)
|
||||||
elif service_item.title.find(
|
elif service_item.title.find(
|
||||||
translate(u'BiblesPlugin.MediaItem', u'etc')) == -1:
|
translate(u'BiblesPlugin.MediaItem', u'etc')) == -1:
|
||||||
service_item.title = u'%s, %s' % (service_item.title,
|
service_item.title = u'%s, %s' % (service_item.title,
|
||||||
translate(u'BiblesPlugin.MediaItem', u'etc'))
|
translate(u'BiblesPlugin.MediaItem', u'etc'))
|
||||||
if len(self.parent.settings_tab.bible_theme) == 0:
|
if len(self.parent.settings_tab.bible_theme) == 0:
|
||||||
service_item.theme = None
|
service_item.theme = None
|
||||||
@ -568,7 +568,11 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
raw_slides.append(bible_text)
|
raw_slides.append(bible_text)
|
||||||
for slide in raw_slides:
|
for slide in raw_slides:
|
||||||
service_item.add_from_text(slide[:30], slide)
|
service_item.add_from_text(slide[:30], slide)
|
||||||
service_item.raw_footer = raw_footer
|
if service_item.raw_footer:
|
||||||
|
for foot in raw_footer:
|
||||||
|
service_item.raw_footer.append(foot)
|
||||||
|
else:
|
||||||
|
service_item.raw_footer = raw_footer
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def formatVerse(self, old_chapter, chapter, verse, opening, closing):
|
def formatVerse(self, old_chapter, chapter, verse, opening, closing):
|
||||||
|
Loading…
Reference in New Issue
Block a user