forked from openlp/openlp
Fix screen issues - not sure how though
This commit is contained in:
parent
c5b12ffaf3
commit
ac845a93ba
@ -183,6 +183,7 @@ class Ui_AmendThemeDialog(object):
|
|||||||
self.MainFontLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.FontMainWrapLineAdjustmentLabel)
|
self.MainFontLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.FontMainWrapLineAdjustmentLabel)
|
||||||
self.FontMainLineAdjustmentSpinBox = QtGui.QSpinBox(self.FontMainGroupBox)
|
self.FontMainLineAdjustmentSpinBox = QtGui.QSpinBox(self.FontMainGroupBox)
|
||||||
self.FontMainLineAdjustmentSpinBox.setObjectName("FontMainLineAdjustmentSpinBox")
|
self.FontMainLineAdjustmentSpinBox.setObjectName("FontMainLineAdjustmentSpinBox")
|
||||||
|
self.FontMainLineAdjustmentSpinBox.setMinimum(-99)
|
||||||
self.MainFontLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.FontMainLineAdjustmentSpinBox)
|
self.MainFontLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.FontMainLineAdjustmentSpinBox)
|
||||||
self.FontMainWrapIndentationLabel = QtGui.QLabel(self.FontMainGroupBox)
|
self.FontMainWrapIndentationLabel = QtGui.QLabel(self.FontMainGroupBox)
|
||||||
self.FontMainWrapIndentationLabel.setObjectName("FontMainWrapIndentationLabel")
|
self.FontMainWrapIndentationLabel.setObjectName("FontMainWrapIndentationLabel")
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
|
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
@ -730,7 +731,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
|
|
||||||
def loadSettings(self):
|
def loadSettings(self):
|
||||||
log.debug(u'Loading QSettings')
|
log.debug(u'Loading QSettings')
|
||||||
print self.geometry()
|
|
||||||
settings = QtCore.QSettings()
|
settings = QtCore.QSettings()
|
||||||
settings.beginGroup(self.generalSettingsSection)
|
settings.beginGroup(self.generalSettingsSection)
|
||||||
self.recentFiles = settings.value(u'recent files').toStringList()
|
self.recentFiles = settings.value(u'recent files').toStringList()
|
||||||
@ -742,7 +742,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
settings.value(u'main window geometry').toByteArray())
|
settings.value(u'main window geometry').toByteArray())
|
||||||
self.restoreState(settings.value(u'main window state').toByteArray())
|
self.restoreState(settings.value(u'main window state').toByteArray())
|
||||||
settings.endGroup()
|
settings.endGroup()
|
||||||
print self.geometry()
|
|
||||||
|
|
||||||
def saveSettings(self):
|
def saveSettings(self):
|
||||||
log.debug(u'Saving QSettings')
|
log.debug(u'Saving QSettings')
|
||||||
|
@ -114,7 +114,6 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.songEditList = [
|
self.songEditList = [
|
||||||
u'Edit Song',
|
u'Edit Song',
|
||||||
]
|
]
|
||||||
self.labelWidth = 20
|
|
||||||
self.timer_id = 0
|
self.timer_id = 0
|
||||||
self.songEdit = False
|
self.songEdit = False
|
||||||
self.selectedRow = 0
|
self.selectedRow = 0
|
||||||
@ -154,12 +153,11 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.ControllerLayout.setMargin(0)
|
self.ControllerLayout.setMargin(0)
|
||||||
# Controller list view
|
# Controller list view
|
||||||
self.PreviewListWidget = SlideList(self)
|
self.PreviewListWidget = SlideList(self)
|
||||||
self.PreviewListWidget.setColumnCount(2)
|
self.PreviewListWidget.setColumnCount(1)
|
||||||
self.PreviewListWidget.horizontalHeader().setVisible(False)
|
self.PreviewListWidget.horizontalHeader().setVisible(False)
|
||||||
self.PreviewListWidget.verticalHeader().setVisible(False)
|
#self.PreviewListWidget.verticalHeader().setVisible(False)
|
||||||
self.PreviewListWidget.setColumnWidth(0, self.labelWidth)
|
|
||||||
self.PreviewListWidget.setColumnWidth(
|
self.PreviewListWidget.setColumnWidth(
|
||||||
1, self.Controller.width() - self.labelWidth)
|
0, self.Controller.width())
|
||||||
self.PreviewListWidget.isLive = self.isLive
|
self.PreviewListWidget.isLive = self.isLive
|
||||||
self.PreviewListWidget.setObjectName(u'PreviewListWidget')
|
self.PreviewListWidget.setObjectName(u'PreviewListWidget')
|
||||||
self.PreviewListWidget.setSelectionBehavior(1)
|
self.PreviewListWidget.setSelectionBehavior(1)
|
||||||
@ -379,8 +377,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
"""
|
"""
|
||||||
width = self.parent.ControlSplitter.sizes()[self.split]
|
width = self.parent.ControlSplitter.sizes()[self.split]
|
||||||
height = width * self.parent.RenderManager.screen_ratio
|
height = width * self.parent.RenderManager.screen_ratio
|
||||||
self.PreviewListWidget.setColumnWidth(0, self.labelWidth)
|
self.PreviewListWidget.setColumnWidth(0, width)
|
||||||
self.PreviewListWidget.setColumnWidth(1, width - self.labelWidth)
|
|
||||||
#Sort out image hights (Songs , bibles excluded)
|
#Sort out image hights (Songs , bibles excluded)
|
||||||
if self.serviceItem and not self.serviceItem.is_text():
|
if self.serviceItem and not self.serviceItem.is_text():
|
||||||
for framenumber, frame in enumerate(self.serviceItem.get_frames()):
|
for framenumber, frame in enumerate(self.serviceItem.get_frames()):
|
||||||
@ -523,20 +520,19 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.serviceItem = serviceItem
|
self.serviceItem = serviceItem
|
||||||
self.PreviewListWidget.clear()
|
self.PreviewListWidget.clear()
|
||||||
self.PreviewListWidget.setRowCount(0)
|
self.PreviewListWidget.setRowCount(0)
|
||||||
self.PreviewListWidget.setColumnWidth(0, self.labelWidth)
|
self.PreviewListWidget.setColumnWidth(0, width)
|
||||||
self.PreviewListWidget.setColumnWidth(1, width - self.labelWidth)
|
|
||||||
if self.isLive:
|
if self.isLive:
|
||||||
self.SongMenu.menu().clear()
|
self.SongMenu.menu().clear()
|
||||||
row = 0
|
row = 0
|
||||||
|
text = []
|
||||||
for framenumber, frame in enumerate(self.serviceItem.get_frames()):
|
for framenumber, frame in enumerate(self.serviceItem.get_frames()):
|
||||||
self.PreviewListWidget.setRowCount(
|
self.PreviewListWidget.setRowCount(
|
||||||
self.PreviewListWidget.rowCount() + 1)
|
self.PreviewListWidget.rowCount() + 1)
|
||||||
rowitem = QtGui.QTableWidgetItem()
|
|
||||||
item = QtGui.QTableWidgetItem()
|
item = QtGui.QTableWidgetItem()
|
||||||
slideHeight = 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 frame[u'verseTag'] is not None:
|
||||||
#only load the slot once
|
#only load the slot once
|
||||||
bits = frame[u'verseTag'].split(u':')
|
bits = frame[u'verseTag'].split(u':')
|
||||||
tag = None
|
tag = None
|
||||||
@ -550,6 +546,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
tag = bits[0]
|
tag = bits[0]
|
||||||
tag1 = tag
|
tag1 = tag
|
||||||
row = bits[0][0:1]
|
row = bits[0][0:1]
|
||||||
|
if self.isLive:
|
||||||
if tag1 not in self.slideList:
|
if tag1 not in self.slideList:
|
||||||
self.slideList[tag1] = framenumber
|
self.slideList[tag1] = framenumber
|
||||||
self.SongMenu.menu().addAction(self.trUtf8(u'%s'%tag1),
|
self.SongMenu.menu().addAction(self.trUtf8(u'%s'%tag1),
|
||||||
@ -565,20 +562,18 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.parent.RenderManager.height)
|
self.parent.RenderManager.height)
|
||||||
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, 0, label)
|
||||||
slideHeight = width * self.parent.RenderManager.screen_ratio
|
slideHeight = width * self.parent.RenderManager.screen_ratio
|
||||||
row += 1
|
row += 1
|
||||||
rowitem.setText(unicode(row))
|
text.append(unicode(row))
|
||||||
rowitem.setTextAlignment(QtCore.Qt.AlignVCenter)
|
self.PreviewListWidget.setItem(framenumber, 0, item)
|
||||||
self.PreviewListWidget.setItem(framenumber, 0, rowitem)
|
|
||||||
self.PreviewListWidget.setItem(framenumber, 1, item)
|
|
||||||
if slideHeight != 0:
|
if slideHeight != 0:
|
||||||
self.PreviewListWidget.setRowHeight(framenumber, slideHeight)
|
self.PreviewListWidget.setRowHeight(framenumber, slideHeight)
|
||||||
|
self.PreviewListWidget.setVerticalHeaderLabels(text)
|
||||||
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.PreviewListWidget.setColumnWidth(1,
|
self.PreviewListWidget.viewport().size().width())
|
||||||
self.PreviewListWidget.viewport().size().width() - self.labelWidth)
|
|
||||||
if slideno > self.PreviewListWidget.rowCount():
|
if slideno > self.PreviewListWidget.rowCount():
|
||||||
self.PreviewListWidget.selectRow(self.PreviewListWidget.rowCount())
|
self.PreviewListWidget.selectRow(self.PreviewListWidget.rowCount())
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user