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

Replace remote Registry().execute(event) next/previous with Qt signal

Browse Source
This commit is contained in:
Ken Roberts 2015-01-06 14:37:18 -08:00
parent 9461f334ce
commit a4efccb00b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,6 +338,8 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
self.setup_ui(self) self.setup_ui(self)
# Need to use event as called across threads and UI is updated # Need to use event as called across threads and UI is updated
QtCore.QObject.connect(self, QtCore.SIGNAL('servicemanager_set_item'), self.on_set_item) QtCore.QObject.connect(self, QtCore.SIGNAL('servicemanager_set_item'), self.on_set_item)
QtCore.QObject.connect(self, QtCore.SIGNAL('servicemanager_next_item'), self.next_item)
QtCore.QObject.connect(self, QtCore.SIGNAL('servicemanager_previous_item'), self.previous_item)
def bootstrap_post_set_up(self): def bootstrap_post_set_up(self):
""" """

3
openlp/plugins/remotes/lib/httprouter.py
View File

@ -582,7 +582,8 @@ class HttpRouter(RegistryProperties):
return self.do_http_error() return self.do_http_error()
self.service_manager.emit(QtCore.SIGNAL(event), data) self.service_manager.emit(QtCore.SIGNAL(event), data)
else: else:
Registry().execute(event) # Registry().execute(event)
self.service_manager.emit(QtCore.SIGNAL(event))
self.do_json_header() self.do_json_header()
return json.dumps({'results': {'success': True}}).encode() return json.dumps({'results': {'success': True}}).encode()