forked from openlp/openlp
Clean up slidecontroller
bzr-revno: 665
This commit is contained in:
commit
ff8e181d19
@ -45,7 +45,6 @@ class SettingsManager(object):
|
|||||||
else:
|
else:
|
||||||
self.mainwindow_left = mainwindow_docbars
|
self.mainwindow_left = mainwindow_docbars
|
||||||
self.mainwindow_right = mainwindow_docbars
|
self.mainwindow_right = mainwindow_docbars
|
||||||
|
|
||||||
self.slidecontroller = (self.width - (
|
self.slidecontroller = (self.width - (
|
||||||
self.mainwindow_left + self.mainwindow_right) - 100 ) / 2
|
self.mainwindow_left + self.mainwindow_right) - 100 ) / 2
|
||||||
self.slidecontroller_image = self.slidecontroller - 50
|
self.slidecontroller_image = self.slidecontroller - 50
|
||||||
|
@ -84,6 +84,7 @@ class Ui_MainWindow(object):
|
|||||||
MainWindow.setCentralWidget(self.MainContent)
|
MainWindow.setCentralWidget(self.MainContent)
|
||||||
self.ControlSplitter = QtGui.QSplitter(self.MainContent)
|
self.ControlSplitter = QtGui.QSplitter(self.MainContent)
|
||||||
self.ControlSplitter.setOrientation(QtCore.Qt.Horizontal)
|
self.ControlSplitter.setOrientation(QtCore.Qt.Horizontal)
|
||||||
|
self.ControlSplitter.setOpaqueResize(False)
|
||||||
self.ControlSplitter.setObjectName(u'ControlSplitter')
|
self.ControlSplitter.setObjectName(u'ControlSplitter')
|
||||||
self.MainContentLayout.addWidget(self.ControlSplitter)
|
self.MainContentLayout.addWidget(self.ControlSplitter)
|
||||||
# Create slide controllers
|
# Create slide controllers
|
||||||
@ -305,8 +306,11 @@ class Ui_MainWindow(object):
|
|||||||
QtCore.QMetaObject.connectSlotsByName(MainWindow)
|
QtCore.QMetaObject.connectSlotsByName(MainWindow)
|
||||||
|
|
||||||
def trackSplitter(self, tab, pos):
|
def trackSplitter(self, tab, pos):
|
||||||
#print tab, pos
|
"""
|
||||||
pass
|
Splitter between the Preview and Live Controllers.
|
||||||
|
"""
|
||||||
|
self.LiveController.widthChanged()
|
||||||
|
self.PreviewController.widthChanged()
|
||||||
|
|
||||||
def retranslateUi(self, MainWindow):
|
def retranslateUi(self, MainWindow):
|
||||||
"""
|
"""
|
||||||
|
@ -108,14 +108,17 @@ class SlideController(QtGui.QWidget):
|
|||||||
if self.isLive:
|
if self.isLive:
|
||||||
self.TypeLabel.setText(u'<strong>%s</strong>' %
|
self.TypeLabel.setText(u'<strong>%s</strong>' %
|
||||||
self.trUtf8(u'Live'))
|
self.trUtf8(u'Live'))
|
||||||
|
self.split = 1
|
||||||
else:
|
else:
|
||||||
self.TypeLabel.setText(u'<strong>%s</strong>' %
|
self.TypeLabel.setText(u'<strong>%s</strong>' %
|
||||||
self.trUtf8(u'Preview'))
|
self.trUtf8(u'Preview'))
|
||||||
|
self.split = 0
|
||||||
self.TypeLabel.setAlignment(QtCore.Qt.AlignCenter)
|
self.TypeLabel.setAlignment(QtCore.Qt.AlignCenter)
|
||||||
self.PanelLayout.addWidget(self.TypeLabel)
|
self.PanelLayout.addWidget(self.TypeLabel)
|
||||||
# Splitter
|
# Splitter
|
||||||
self.Splitter = QtGui.QSplitter(self.Panel)
|
self.Splitter = QtGui.QSplitter(self.Panel)
|
||||||
self.Splitter.setOrientation(QtCore.Qt.Vertical)
|
self.Splitter.setOrientation(QtCore.Qt.Vertical)
|
||||||
|
self.Splitter.setOpaqueResize(False)
|
||||||
self.PanelLayout.addWidget(self.Splitter)
|
self.PanelLayout.addWidget(self.Splitter)
|
||||||
# Actual controller section
|
# Actual controller section
|
||||||
self.Controller = QtGui.QWidget(self.Splitter)
|
self.Controller = QtGui.QWidget(self.Splitter)
|
||||||
@ -136,6 +139,7 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.PreviewListWidget.setObjectName(u'PreviewListWidget')
|
self.PreviewListWidget.setObjectName(u'PreviewListWidget')
|
||||||
self.PreviewListWidget.setEditTriggers(
|
self.PreviewListWidget.setEditTriggers(
|
||||||
QtGui.QAbstractItemView.NoEditTriggers)
|
QtGui.QAbstractItemView.NoEditTriggers)
|
||||||
|
self.PreviewListWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
|
||||||
self.ControllerLayout.addWidget(self.PreviewListWidget)
|
self.ControllerLayout.addWidget(self.PreviewListWidget)
|
||||||
# Build the full toolbar
|
# Build the full toolbar
|
||||||
self.Toolbar = OpenLPToolbar(self)
|
self.Toolbar = OpenLPToolbar(self)
|
||||||
@ -195,7 +199,6 @@ class SlideController(QtGui.QWidget):
|
|||||||
self.Toolbar.addToolbarButton(
|
self.Toolbar.addToolbarButton(
|
||||||
u'Media Stop', u':/slides/media_playback_stop.png',
|
u'Media Stop', u':/slides/media_playback_stop.png',
|
||||||
self.trUtf8(u'Start playing media'), self.onMediaStop)
|
self.trUtf8(u'Start playing media'), self.onMediaStop)
|
||||||
|
|
||||||
self.ControllerLayout.addWidget(self.Toolbar)
|
self.ControllerLayout.addWidget(self.Toolbar)
|
||||||
# Build the Song Toolbar
|
# Build the Song Toolbar
|
||||||
if isLive:
|
if isLive:
|
||||||
@ -273,6 +276,30 @@ class SlideController(QtGui.QWidget):
|
|||||||
QtCore.SIGNAL(u'%s_last' % prefix), self.onSlideSelectedLast)
|
QtCore.SIGNAL(u'%s_last' % prefix), self.onSlideSelectedLast)
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'%s_change' % prefix), self.onSlideChange)
|
QtCore.SIGNAL(u'%s_change' % prefix), self.onSlideChange)
|
||||||
|
QtCore.QObject.connect(self.Splitter,
|
||||||
|
QtCore.SIGNAL(u'splitterMoved(int, int)'), self.trackSplitter)
|
||||||
|
|
||||||
|
def widthChanged(self):
|
||||||
|
"""
|
||||||
|
Handle changes of width from the splitter between the live and preview
|
||||||
|
controller. Event only issues when changes have finished
|
||||||
|
"""
|
||||||
|
if not self.commandItem:
|
||||||
|
return
|
||||||
|
width = self.parent.ControlSplitter.sizes()[self.split]
|
||||||
|
height = width * self.parent.RenderManager.screen_ratio
|
||||||
|
self.PreviewListWidget.setColumnWidth(0, width)
|
||||||
|
for framenumber, frame in enumerate(self.commandItem.frames):
|
||||||
|
if frame[u'text']:
|
||||||
|
break
|
||||||
|
self.PreviewListWidget.setRowHeight(framenumber, height)
|
||||||
|
|
||||||
|
|
||||||
|
def trackSplitter(self, tab, pos):
|
||||||
|
"""
|
||||||
|
Splitter between the slide list and the preview panel
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
def onSongBarHandler(self):
|
def onSongBarHandler(self):
|
||||||
request = self.sender().text()
|
request = self.sender().text()
|
||||||
@ -403,14 +430,14 @@ class SlideController(QtGui.QWidget):
|
|||||||
Display the slide number passed
|
Display the slide number passed
|
||||||
"""
|
"""
|
||||||
log.debug(u'displayServiceManagerItems Start')
|
log.debug(u'displayServiceManagerItems Start')
|
||||||
|
width = self.parent.ControlSplitter.sizes()[self.split]
|
||||||
#Set pointing cursor when we have somthing to point at
|
#Set pointing cursor when we have somthing to point at
|
||||||
self.PreviewListWidget.setCursor(QtCore.Qt.PointingHandCursor)
|
self.PreviewListWidget.setCursor(QtCore.Qt.PointingHandCursor)
|
||||||
before = time.time()
|
before = time.time()
|
||||||
self.serviceitem = serviceitem
|
self.serviceitem = serviceitem
|
||||||
self.PreviewListWidget.clear()
|
self.PreviewListWidget.clear()
|
||||||
self.PreviewListWidget.setRowCount(0)
|
self.PreviewListWidget.setRowCount(0)
|
||||||
self.PreviewListWidget.setColumnWidth(
|
self.PreviewListWidget.setColumnWidth(0, width)
|
||||||
0, self.settingsmanager.slidecontroller_image)
|
|
||||||
for framenumber, frame in enumerate(self.serviceitem.frames):
|
for framenumber, frame in enumerate(self.serviceitem.frames):
|
||||||
self.PreviewListWidget.setRowCount(
|
self.PreviewListWidget.setRowCount(
|
||||||
self.PreviewListWidget.rowCount() + 1)
|
self.PreviewListWidget.rowCount() + 1)
|
||||||
@ -424,8 +451,7 @@ 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, 0, label)
|
self.PreviewListWidget.setCellWidget(framenumber, 0, label)
|
||||||
slide_height = self.settingsmanager.slidecontroller_image * \
|
slide_height = width * self.parent.RenderManager.screen_ratio
|
||||||
self.parent.RenderManager.screen_ratio
|
|
||||||
else:
|
else:
|
||||||
item.setText(frame[u'text'])
|
item.setText(frame[u'text'])
|
||||||
self.PreviewListWidget.setItem(framenumber, 0, item)
|
self.PreviewListWidget.setItem(framenumber, 0, item)
|
||||||
|
@ -1 +1 @@
|
|||||||
1.9.0-664
|
1.9.0-665
|
||||||
|
Loading…
Reference in New Issue
Block a user