forked from openlp/openlp
Display fixes
This commit is contained in:
parent
be85eb8999
commit
23c3974afd
@ -533,6 +533,9 @@ class Renderer(object):
|
|||||||
font = self.mainFont
|
font = self.mainFont
|
||||||
metrics = QtGui.QFontMetrics(font)
|
metrics = QtGui.QFontMetrics(font)
|
||||||
w = metrics.width(line)
|
w = metrics.width(line)
|
||||||
|
if footer:
|
||||||
|
h = metrics.height()
|
||||||
|
else:
|
||||||
h = metrics.height() + int(self._theme.font_main_line_adjustment)
|
h = metrics.height() + int(self._theme.font_main_line_adjustment)
|
||||||
if draw:
|
if draw:
|
||||||
self.painter.setFont(font)
|
self.painter.setFont(font)
|
||||||
|
@ -114,10 +114,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.songEditList = [
|
self.songEditList = [
|
||||||
u'Edit Song',
|
u'Edit Song',
|
||||||
]
|
]
|
||||||
if isLive:
|
|
||||||
self.labelWidth = 20
|
self.labelWidth = 20
|
||||||
else:
|
|
||||||
self.labelWidth = 0
|
|
||||||
self.timer_id = 0
|
self.timer_id = 0
|
||||||
self.songEdit = False
|
self.songEdit = False
|
||||||
self.selectedRow = 0
|
self.selectedRow = 0
|
||||||
@ -160,7 +157,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.PreviewListWidget.setColumnCount(2)
|
self.PreviewListWidget.setColumnCount(2)
|
||||||
self.PreviewListWidget.horizontalHeader().setVisible(False)
|
self.PreviewListWidget.horizontalHeader().setVisible(False)
|
||||||
self.PreviewListWidget.verticalHeader().setVisible(False)
|
self.PreviewListWidget.verticalHeader().setVisible(False)
|
||||||
self.PreviewListWidget.setColumnWidth(1, self.labelWidth)
|
self.PreviewListWidget.setColumnWidth(0, self.labelWidth)
|
||||||
self.PreviewListWidget.setColumnWidth(
|
self.PreviewListWidget.setColumnWidth(
|
||||||
1, self.Controller.width() - self.labelWidth)
|
1, self.Controller.width() - self.labelWidth)
|
||||||
self.PreviewListWidget.isLive = self.isLive
|
self.PreviewListWidget.isLive = self.isLive
|
||||||
@ -536,7 +533,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.PreviewListWidget.rowCount() + 1)
|
self.PreviewListWidget.rowCount() + 1)
|
||||||
rowitem = QtGui.QTableWidgetItem()
|
rowitem = QtGui.QTableWidgetItem()
|
||||||
item = QtGui.QTableWidgetItem()
|
item = QtGui.QTableWidgetItem()
|
||||||
slide_height = 0
|
slideHeight = 0
|
||||||
#It is a based Text Render
|
#It is a based Text Render
|
||||||
if self.serviceItem.is_text():
|
if self.serviceItem.is_text():
|
||||||
if self.isLive and frame[u'verseTag'] is not None:
|
if self.isLive and frame[u'verseTag'] is not None:
|
||||||
@ -569,14 +566,14 @@ class SlideController(QtGui.QWidget):
|
|||||||
label.setScaledContents(True)
|
label.setScaledContents(True)
|
||||||
label.setPixmap(QtGui.QPixmap.fromImage(pixmap))
|
label.setPixmap(QtGui.QPixmap.fromImage(pixmap))
|
||||||
self.PreviewListWidget.setCellWidget(framenumber, 1, label)
|
self.PreviewListWidget.setCellWidget(framenumber, 1, label)
|
||||||
slide_height = width * self.parent.RenderManager.screen_ratio
|
slideHeight = width * self.parent.RenderManager.screen_ratio
|
||||||
row += 1
|
row += 1
|
||||||
rowitem.setText(unicode(row))
|
rowitem.setText(unicode(row))
|
||||||
rowitem.setTextAlignment(QtCore.Qt.AlignVCenter)
|
rowitem.setTextAlignment(QtCore.Qt.AlignVCenter)
|
||||||
self.PreviewListWidget.setItem(framenumber, 0, rowitem)
|
self.PreviewListWidget.setItem(framenumber, 0, rowitem)
|
||||||
self.PreviewListWidget.setItem(framenumber, 1, item)
|
self.PreviewListWidget.setItem(framenumber, 1, item)
|
||||||
if slide_height != 0:
|
if slideHeight != 0:
|
||||||
self.PreviewListWidget.setRowHeight(framenumber, slide_height)
|
self.PreviewListWidget.setRowHeight(framenumber, slideHeight)
|
||||||
if self.serviceItem.is_text():
|
if self.serviceItem.is_text():
|
||||||
self.PreviewListWidget.resizeRowsToContents()
|
self.PreviewListWidget.resizeRowsToContents()
|
||||||
self.PreviewListWidget.setColumnWidth(0, self.labelWidth)
|
self.PreviewListWidget.setColumnWidth(0, self.labelWidth)
|
||||||
@ -604,16 +601,16 @@ class SlideController(QtGui.QWidget):
|
|||||||
data = []
|
data = []
|
||||||
if self.serviceItem:
|
if self.serviceItem:
|
||||||
for framenumber, frame in enumerate(self.serviceItem.get_frames()):
|
for framenumber, frame in enumerate(self.serviceItem.get_frames()):
|
||||||
data_item = {}
|
dataItem = {}
|
||||||
if self.serviceItem.is_text():
|
if self.serviceItem.is_text():
|
||||||
data_item[u'tag'] = unicode(frame[u'verseTag'])
|
dataItem[u'tag'] = unicode(frame[u'verseTag'])
|
||||||
data_item[u'text'] = unicode(frame[u'text'])
|
dataItem[u'text'] = unicode(frame[u'text'])
|
||||||
else:
|
else:
|
||||||
data_item[u'tag'] = unicode(framenumber)
|
dataItem[u'tag'] = unicode(framenumber)
|
||||||
data_item[u'text'] = u''
|
dataItem[u'text'] = u''
|
||||||
data_item[u'selected'] = \
|
dataItem[u'selected'] = \
|
||||||
(self.PreviewListWidget.currentRow() == framenumber)
|
(self.PreviewListWidget.currentRow() == framenumber)
|
||||||
data.append(data_item)
|
data.append(dataItem)
|
||||||
Receiver.send_message(u'slidecontroller_%s_text_response'
|
Receiver.send_message(u'slidecontroller_%s_text_response'
|
||||||
% self.typePrefix, data)
|
% self.typePrefix, data)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user