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

Fix alerts and screen resizing 

bzr-revno: 982
This commit is contained in:
Jon Tibble 2010-08-01 09:35:17 +01:00
parent f6e91b4198 4b0093e97b
commit 65c95057b7
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/ui/generaltab.py
View File

@ -38,6 +38,7 @@ class GeneralTab(SettingsTab):
""" """
self.screens = screens self.screens = screens
self.monitorNumber = 0 self.monitorNumber = 0
self.overrideChanged = False
SettingsTab.__init__(self, u'General') SettingsTab.__init__(self, u'General')
def preLoad(self): def preLoad(self):
@ -473,6 +474,7 @@ class GeneralTab(SettingsTab):
Receiver.send_message(u'slidecontroller_live_spin_delay', Receiver.send_message(u'slidecontroller_live_spin_delay',
self.timeoutSpinBox.value()) self.timeoutSpinBox.value())
# Reset screens after initial definition # Reset screens after initial definition
if self.overrideChanged:
self.screens.override[u'size'] = QtCore.QRect( self.screens.override[u'size'] = QtCore.QRect(
int(self.customXValueEdit.text()), int(self.customXValueEdit.text()),
int(self.customYValueEdit.text()), int(self.customYValueEdit.text()),
@ -483,6 +485,7 @@ class GeneralTab(SettingsTab):
Receiver.send_message(u'config_screen_changed') Receiver.send_message(u'config_screen_changed')
else: else:
self.screens.reset_current_display() self.screens.reset_current_display()
Receiver.send_message(u'config_screen_changed')
def onOverrideCheckBoxToggled(self, checked): def onOverrideCheckBoxToggled(self, checked):
""" """

2
openlp/core/ui/maindisplay.py
View File

@ -252,6 +252,7 @@ class MainDisplay(DisplayWidget):
self.size().height()) self.size().height())
self.webView.setGeometry(0, 0, self.size().width(), self.webView.setGeometry(0, 0, self.size().width(),
self.size().height()) self.size().height())
self.alertText.setTextWidth(self.size().width())
#Build a custom splash screen #Build a custom splash screen
self.initialFrame = QtGui.QImage( self.initialFrame = QtGui.QImage(
self.screen[u'size'].width(), self.screen[u'size'].width(),
@ -322,7 +323,6 @@ class MainDisplay(DisplayWidget):
def setupAlert(self): def setupAlert(self):
self.alertText = QtGui.QGraphicsTextItem() self.alertText = QtGui.QGraphicsTextItem()
self.alertText.setTextWidth(self.size().width())
self.alertText.setZValue(8) self.alertText.setZValue(8)
self.scene.addItem(self.alertText) self.scene.addItem(self.alertText)

3
openlp/plugins/alerts/alertsplugin.py
View File

@ -88,8 +88,7 @@ class AlertsPlugin(Plugin):
def toggleAlertsState(self): def toggleAlertsState(self):
self.alertsActive = not self.alertsActive self.alertsActive = not self.alertsActive
QtCore.QSettings().setValue( QtCore.QSettings().setValue(self.settingsSection + u'/active',
self.settingsSection + u'/active',
QtCore.QVariant(self.alertsActive)) QtCore.QVariant(self.alertsActive))
def onAlertsTrigger(self): def onAlertsTrigger(self):