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

more changes

Browse Source
This commit is contained in:
Tim Bentley 2011-12-15 17:19:54 +00:00
parent e141419cdc
commit acebb85055
2 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -583,6 +583,10 @@ class SlideController(Controller):
self.onThemeDisplay(not self.themeScreen.isChecked()) self.onThemeDisplay(not self.themeScreen.isChecked())
elif action == u'desktop': elif action == u'desktop':
self.onHideDisplay(not self.desktopScreen.isChecked()) self.onHideDisplay(not self.desktopScreen.isChecked())
elif action == u'show':
self.onBlankDisplay(False)
elif action == u'hide':
self.onBlankDisplay(True)
def servicePrevious(self): def servicePrevious(self):

31
openlp/plugins/remotes/lib/httpserver.py
View File

@ -249,12 +249,9 @@ class HttpConnection(object):
(r'^/api/poll$', self.poll), (r'^/api/poll$', self.poll),
(r'^/api/controller/(live|preview)/(.*)$', self.controller), (r'^/api/controller/(live|preview)/(.*)$', self.controller),
(r'^/api/service/(.*)$', self.service), (r'^/api/service/(.*)$', self.service),
(r'^/api/display/(hide|show)$', self.display), (r'^/api/display/(hide|show|blank|theme|desktop)$', self.display),
(r'^/api/alert$', self.alert), (r'^/api/alert$', self.alert),
(r'^/api/plugin/(search)$', self.pluginInfo), (r'^/api/plugin/(search)$', self.pluginInfo),
(r'^/api/display-status$', self.displayStatus),
(r'^/api/display-status/(blank|theme|desktop)$',
self.changeDisplayStatus),
(r'^/api/(.*)/search$', self.search), (r'^/api/(.*)/search$', self.search),
(r'^/api/(.*)/live$', self.go_live), (r'^/api/(.*)/live$', self.go_live),
(r'^/api/(.*)/add$', self.add_to_service) (r'^/api/(.*)/add$', self.add_to_service)
@ -419,32 +416,6 @@ class HttpConnection(object):
``action`` ``action``
This is the action, either ``hide`` or ``show``. This is the action, either ``hide`` or ``show``.
"""
event = u'live_display_%s' % action
Receiver.send_message(event, HideMode.Blank)
return HttpResponse(json.dumps({u'results': {u'success': True}}),
{u'Content-Type': u'application/json'})
def displayStatus(self):
"""
Obtain the display status of system.
"""
result = {
u'blank': self.parent.plugin.liveController.blankScreen.\
isChecked(),
u'theme': self.parent.plugin.liveController.themeScreen.\
isChecked(),
u'display': self.parent.plugin.liveController.desktopScreen.\
isChecked()
}
return HttpResponse(json.dumps({u'results': result}),
{u'Content-Type': u'application/json'})
def changeDisplayStatus(self, action):
"""
Toggle the display of the system including the status button.
""" """
Receiver.send_message(u'slidecontroller_toggle_display', action) Receiver.send_message(u'slidecontroller_toggle_display', action)
return HttpResponse(json.dumps({u'results': {u'success': True}}), return HttpResponse(json.dumps({u'results': {u'success': True}}),