raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

instead of using the dockwidgets, the slidecontrollers update themselves

Browse Source
This commit is contained in:
Andreas Preikschat 2010-12-28 11:06:05 +01:00
parent 3e55468a3d
commit 2354ae6530
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openlp/core/lib/dockwidget.py
View File

@ -47,17 +47,3 @@ class OpenLPDockWidget(QtGui.QDockWidget):
if name: if name:
self.setObjectName(name) self.setObjectName(name)
self.setFloating(False) self.setFloating(False)
def moveEvent(self, event):
"""
Called, when the DockWidget is moved.
"""
self.parent.liveController.previewSizeChanged()
self.parent.previewController.previewSizeChanged()
def resizeEvent(self, event):
"""
Called, when the DockWidget is resized.
"""
self.parent.liveController.previewSizeChanged()
self.parent.previewController.previewSizeChanged()

18
openlp/core/ui/slidecontroller.py
View File

@ -386,10 +386,20 @@ class SlideController(QtGui.QWidget):
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'config_screen_changed'), self.screenSizeChanged) QtCore.SIGNAL(u'config_screen_changed'), self.screenSizeChanged)
def paintEvent(self, event):
"""
When the Slidecontroller is painted, we need to make sure, that the
SlidePreview's size is updated.
"""
# We need to make this circuit, because we have to consider the other
# slidecontroller as well.
self.parent.previewController.previewSizeChanged()
self.parent.liveController.previewSizeChanged()
def screenSizeChanged(self): def screenSizeChanged(self):
""" """
Settings dialog has changed the screen size of adjust output and Settings dialog has changed the screen size of adjust output and
screen previews screen previews.
""" """
log.debug(u'screenSizeChanged live = %s' % self.isLive) log.debug(u'screenSizeChanged live = %s' % self.isLive)
# rebuild display as screen size changed # rebuild display as screen size changed
@ -397,6 +407,9 @@ class SlideController(QtGui.QWidget):
self.display.imageManager = self.parent.renderManager.image_manager self.display.imageManager = self.parent.renderManager.image_manager
self.display.alertTab = self.alertTab self.display.alertTab = self.alertTab
self.display.setup() self.display.setup()
# The SlidePreview's ratio.
self.ratio = float(self.screens.current[u'size'].width()) / \
float(self.screens.current[u'size'].height())
self.previewSizeChanged() self.previewSizeChanged()
def previewSizeChanged(self): def previewSizeChanged(self):
@ -405,9 +418,6 @@ class SlideController(QtGui.QWidget):
splitters is moved or when the screen size is changed. splitters is moved or when the screen size is changed.
""" """
log.debug(u'previewSizeChanged live = %s' % self.isLive) log.debug(u'previewSizeChanged live = %s' % self.isLive)
# The SlidePreview's ratio.
self.ratio = float(self.screens.current[u'size'].width()) / \
float(self.screens.current[u'size'].height())
if self.ratio < float(self.PreviewFrame.width()) / float( if self.ratio < float(self.PreviewFrame.width()) / float(
self.PreviewFrame.height()): self.PreviewFrame.height()):
# We have to take the height as limit. # We have to take the height as limit.