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

moved function code into buildHtml, made setting name more descriptive

This commit is contained in:
Garrett 2011-01-17 08:24:23 -08:00
parent 3428f68582
commit 0cab45bcf8
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,7 @@ class AdvancedTab(SettingsTab):
self.hideMouseGroupBox.setTitle(translate('OpenLP.GeneralTab', self.hideMouseGroupBox.setTitle(translate('OpenLP.GeneralTab',
'Mouse Cursor')) 'Mouse Cursor'))
self.hideMouseCheckBox.setText(translate('OpenLP.GeneralTab', self.hideMouseCheckBox.setText(translate('OpenLP.GeneralTab',
'Hide the Mouse Cursor')) 'Hide the ouse cursor when over the display window'))
# self.sharedDirGroupBox.setTitle( # self.sharedDirGroupBox.setTitle(
# translate('AdvancedTab', 'Central Data Store')) # translate('AdvancedTab', 'Central Data Store'))
# self.sharedCheckBox.setText( # self.sharedCheckBox.setText(

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

@ -206,7 +206,6 @@ class MainDisplay(DisplayWidget):
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')
self.frame.evaluateJavaScript(u'show_text("%s")' % \ self.frame.evaluateJavaScript(u'show_text("%s")' % \
slide.replace(u'\\', u'\\\\').replace(u'\"', u'\\\"')) slide.replace(u'\\', u'\\\\').replace(u'\"', u'\\\"'))
self.hideMouseCursor()
return self.preview() return self.preview()
def alert(self, text): def alert(self, text):
@ -272,7 +271,6 @@ class MainDisplay(DisplayWidget):
else: else:
js = u'show_image("");' js = u'show_image("");'
self.frame.evaluateJavaScript(js) self.frame.evaluateJavaScript(js)
self.hideMouseCursor()
def resetImage(self): def resetImage(self):
""" """
@ -362,7 +360,6 @@ class MainDisplay(DisplayWidget):
self.webView.setVisible(False) self.webView.setVisible(False)
self.videoWidget.setVisible(True) self.videoWidget.setVisible(True)
self.audio.setVolume(vol) self.audio.setVolume(vol)
self.hideMouseCursor()
return self.preview() return self.preview()
def isLoaded(self): def isLoaded(self):
@ -430,6 +427,15 @@ class MainDisplay(DisplayWidget):
# if was hidden keep it hidden # if was hidden keep it hidden
if self.hideMode and self.isLive: if self.hideMode and self.isLive:
self.hideDisplay(self.hideMode) self.hideDisplay(self.hideMode)
# Hide the mouse cursor over display if enabled in settings
settings = QtCore.QSettings()
if settings.value(u'%s/hide mouse' % self.advancedSettingsSection,
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"')
def footer(self, text): def footer(self, text):
""" """
@ -479,19 +485,6 @@ class MainDisplay(DisplayWidget):
# Trigger actions when display is active again # Trigger actions when display is active again
Receiver.send_message(u'maindisplay_active') Receiver.send_message(u'maindisplay_active')
def hideMouseCursor(self):
"""
Hide the mouse cursor if enabled in settings
"""
settings = QtCore.QSettings()
if settings.value(u'%s/hide mouse' % self.advancedSettingsSection,
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): class AudioPlayer(QtCore.QObject):
""" """
This Class will play audio only allowing components to work with a This Class will play audio only allowing components to work with a