forked from openlp/openlp
r1621
This commit is contained in:
commit
2b1cf6cb54
@ -86,6 +86,8 @@ class Renderer(object):
|
|||||||
"""
|
"""
|
||||||
log.debug(u'Update Display')
|
log.debug(u'Update Display')
|
||||||
self._calculate_default(self.screens.current[u'size'])
|
self._calculate_default(self.screens.current[u'size'])
|
||||||
|
if self.display:
|
||||||
|
self.display.close()
|
||||||
self.display = MainDisplay(None, self.image_manager, False)
|
self.display = MainDisplay(None, self.image_manager, False)
|
||||||
self.display.setup()
|
self.display.setup()
|
||||||
self.bg_frame = None
|
self.bg_frame = None
|
||||||
@ -241,7 +243,7 @@ class Renderer(object):
|
|||||||
``screen``
|
``screen``
|
||||||
The QSize of the screen.
|
The QSize of the screen.
|
||||||
"""
|
"""
|
||||||
log.debug(u'calculate default %s', screen)
|
log.debug(u'_calculate default %s', screen)
|
||||||
self.width = screen.width()
|
self.width = screen.width()
|
||||||
self.height = screen.height()
|
self.height = screen.height()
|
||||||
self.screen_ratio = float(self.height) / float(self.width)
|
self.screen_ratio = float(self.height) / float(self.width)
|
||||||
@ -286,7 +288,7 @@ class Renderer(object):
|
|||||||
``rect_footer``
|
``rect_footer``
|
||||||
The footer text block.
|
The footer text block.
|
||||||
"""
|
"""
|
||||||
log.debug(u'set_text_rectangle %s , %s' % (rect_main, rect_footer))
|
log.debug(u'_set_text_rectangle %s , %s' % (rect_main, rect_footer))
|
||||||
self._rect = rect_main
|
self._rect = rect_main
|
||||||
self._rect_footer = rect_footer
|
self._rect_footer = rect_footer
|
||||||
self.page_width = self._rect.width()
|
self.page_width = self._rect.width()
|
||||||
@ -339,7 +341,7 @@ class Renderer(object):
|
|||||||
# Text too long so go to next page.
|
# Text too long so go to next page.
|
||||||
if self.web_frame.contentsSize().height() > self.page_height:
|
if self.web_frame.contentsSize().height() > self.page_height:
|
||||||
if force_page and line_count > 0:
|
if force_page and line_count > 0:
|
||||||
Receiver.send_message(u'theme_line_count', line_count)
|
Receiver.send_message(u'theme_line_count', line_count - 1)
|
||||||
line_count = -1
|
line_count = -1
|
||||||
while html_text.endswith(u'<br>'):
|
while html_text.endswith(u'<br>'):
|
||||||
html_text = html_text[:-4]
|
html_text = html_text[:-4]
|
||||||
|
@ -63,6 +63,7 @@ class MainDisplay(QtGui.QGraphicsView):
|
|||||||
self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
|
self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
|
||||||
self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |
|
self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |
|
||||||
QtCore.Qt.WindowStaysOnTopHint)
|
QtCore.Qt.WindowStaysOnTopHint)
|
||||||
|
self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
|
||||||
if self.isLive:
|
if self.isLive:
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
|
QtCore.SIGNAL(u'maindisplay_hide'), self.hideDisplay)
|
||||||
|
@ -1035,6 +1035,7 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
item[u'selected'] = False
|
item[u'selected'] = False
|
||||||
serviceIterator = QtGui.QTreeWidgetItemIterator(
|
serviceIterator = QtGui.QTreeWidgetItemIterator(
|
||||||
self.serviceManagerList)
|
self.serviceManagerList)
|
||||||
|
selectedItem = None
|
||||||
while serviceIterator.value():
|
while serviceIterator.value():
|
||||||
if serviceIterator.value().isSelected():
|
if serviceIterator.value().isSelected():
|
||||||
selectedItem = serviceIterator.value()
|
selectedItem = serviceIterator.value()
|
||||||
|
@ -59,6 +59,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
"""
|
"""
|
||||||
QtGui.QWidget.__init__(self, parent)
|
QtGui.QWidget.__init__(self, parent)
|
||||||
self.isLive = isLive
|
self.isLive = isLive
|
||||||
|
self.display = None
|
||||||
self.screens = ScreenList.get_instance()
|
self.screens = ScreenList.get_instance()
|
||||||
self.ratio = float(self.screens.current[u'size'].width()) / \
|
self.ratio = float(self.screens.current[u'size'].width()) / \
|
||||||
float(self.screens.current[u'size'].height())
|
float(self.screens.current[u'size'].height())
|
||||||
@ -422,6 +423,8 @@ class SlideController(QtGui.QWidget):
|
|||||||
screen previews.
|
screen previews.
|
||||||
"""
|
"""
|
||||||
# rebuild display as screen size changed
|
# rebuild display as screen size changed
|
||||||
|
if self.display:
|
||||||
|
self.display.close()
|
||||||
self.display = MainDisplay(self, self.image_manager, self.isLive)
|
self.display = MainDisplay(self, self.image_manager, self.isLive)
|
||||||
self.display.alertTab = self.alertTab
|
self.display.alertTab = self.alertTab
|
||||||
self.display.setup()
|
self.display.setup()
|
||||||
|
@ -202,7 +202,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
|
|||||||
Updates the lines on a page on the wizard
|
Updates the lines on a page on the wizard
|
||||||
"""
|
"""
|
||||||
self.mainLineCountLabel.setText(unicode(translate('OpenLP.ThemeForm',
|
self.mainLineCountLabel.setText(unicode(translate('OpenLP.ThemeForm',
|
||||||
'(%d lines per slide)')) % int(lines))
|
'(approximately %d lines per slide)')) % int(lines))
|
||||||
|
|
||||||
def resizeEvent(self, event=None):
|
def resizeEvent(self, event=None):
|
||||||
"""
|
"""
|
||||||
|
@ -983,7 +983,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
Search for some Bible verses (by reference).
|
Search for some Bible verses (by reference).
|
||||||
"""
|
"""
|
||||||
bible = unicode(self.quickVersionComboBox.currentText())
|
bible = unicode(self.quickVersionComboBox.currentText())
|
||||||
search_results = self.plugin.manager.get_verses(bible, string, False)
|
search_results = self.plugin.manager.get_verses(bible, string, False, False)
|
||||||
results = []
|
results = []
|
||||||
if search_results:
|
if search_results:
|
||||||
versetext = u' '.join([verse.text for verse in search_results])
|
versetext = u' '.join([verse.text for verse in search_results])
|
||||||
|
Loading…
Reference in New Issue
Block a user