Tim Bentley has proposed merging lp:~trb143/openlp/bugs into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
Related bugs:
#693150 Custom Slide Display footer option
https://bugs.launchpad.net/bugs/693150
#693202 delete theme
https://bugs.launchpad.net/bugs/693202
#728551 Mouse Cursor is not hidden on the default display
https://bugs.launchpad.net/bugs/728551
For more details, see:
https://code.launchpad.net/~trb143/openlp/bugs/+merge/52100
Fix hide cursor bug
--
https://code.launchpad.net/~trb143/openlp/bugs/+merge/52100
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2011-02-24 05:47:38 +0000
+++ openlp/core/ui/maindisplay.py 2011-03-03 17:22:53 +0000
@@ -158,6 +158,7 @@
self.webView.setHtml(build_html(serviceItem, self.screen,
self.alertTab, self.isLive, None))
self.initialFrame = True
+ self.__hideMouse()
# To display or not to display?
if not self.screen[u'primary']:
self.show()
@@ -434,15 +435,7 @@
# if was hidden keep it hidden
if self.hideMode and self.isLive:
self.hideDisplay(self.hideMode)
- # Hide mouse cursor when moved over display if enabled in settings
- settings = QtCore.QSettings()
- if settings.value(u'advanced/hide mouse',
- QtCore.QVariant(False)).toBool():
- self.setCursor(QtCore.Qt.BlankCursor)
- self.frame.evaluateJavaScript('document.body.style.cursor = "none"')
- else:
- self.setCursor(QtCore.Qt.ArrowCursor)
- self.frame.evaluateJavaScript('document.body.style.cursor = "auto"')
+ self.__hideMouse()
def footer(self, text):
"""
@@ -492,6 +485,16 @@
# Trigger actions when display is active again
Receiver.send_message(u'maindisplay_active')
+ def __hideMouse(self):
+ # Hide mouse cursor when moved over display if enabled in settings
+ if QtCore.QSettings().value(u'advanced/hide mouse',
+ QtCore.QVariant(False)).toBool():
+ self.setCursor(QtCore.Qt.BlankCursor)
+ self.frame.evaluateJavaScript('document.body.style.cursor = "none"')
+ else:
+ self.setCursor(QtCore.Qt.ArrowCursor)
+ self.frame.evaluateJavaScript('document.body.style.cursor = "auto"')
+
class AudioPlayer(QtCore.QObject):
"""
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
