miracle091/SafeEyes
miracle091
/
SafeEyes
mirror of https://github.com/slgobinath/SafeEyes.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-10-10 19:46:41 +02:00
parent a10dc8a80b 800db63de5
commit 849fee8cff
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
safeeyes/SafeEyes.py
View File

@ -62,11 +62,11 @@ class SafeEyes(object):
self.context['desktop'] = Utility.desktop_environment()
self.context['locale'] = system_locale
self.context['api'] = {}
self.context['api']['show_settings'] = self.show_settings
self.context['api']['show_about'] = self.show_about
self.context['api']['enable_safeeyes'] = self.enable_safeeyes
self.context['api']['disable_safeeyes'] = self.disable_safeeyes
self.context['api']['quit'] = self.quit
self.context['api']['show_settings'] = lambda: Utility.execute_main_thread(self.show_settings)
self.context['api']['show_about'] = lambda: Utility.execute_main_thread(self.show_about)
self.context['api']['enable_safeeyes'] = lambda next_break_time=-1: Utility.execute_main_thread(self.enable_safeeyes, next_break_time)
self.context['api']['disable_safeeyes'] = lambda: Utility.execute_main_thread(self.disable_safeeyes)
self.context['api']['quit'] = lambda: Utility.execute_main_thread(self.quit)
if self.config.get('persist_state'):
self.context['session'] = Utility.open_session()
else:
@ -82,7 +82,7 @@ class SafeEyes(object):
self.safe_eyes_core.on_stop_break += self.stop_break
self.safe_eyes_core.on_update_next_break += self.update_next_break
self.safe_eyes_core.initialize(self.config)
self.context['api']['take_break'] = self.safe_eyes_core.take_break
self.context['api']['take_break'] = lambda: Utility.execute_main_thread(self.safe_eyes_core.take_break)
self.context['api']['has_breaks'] = self.safe_eyes_core.has_breaks
self.plugins_manager.init(self.context, self.config)
atexit.register(self.persist_session)

12
safeeyes/rpc.py
View File

@ -34,12 +34,12 @@ class RPCServer(object):
self.__running = False
logging.info('Setting up an RPC server on port %d', port)
self.__server = SimpleXMLRPCServer(("localhost", port), logRequests=False, allow_none=True)
self.__server.register_function(lambda: Utility.execute_main_thread(context['api']['show_settings']), 'show_settings')
self.__server.register_function(lambda: Utility.execute_main_thread(context['api']['show_about']), 'show_about')
self.__server.register_function(lambda: Utility.execute_main_thread(context['api']['enable_safeeyes']), 'enable_safeeyes')
self.__server.register_function(lambda: Utility.execute_main_thread(context['api']['disable_safeeyes']), 'disable_safeeyes')
self.__server.register_function(lambda: Utility.execute_main_thread(context['api']['take_break']), 'take_break')
self.__server.register_function(lambda: Utility.execute_main_thread(context['api']['quit']), 'quit')
self.__server.register_function(context['api']['show_settings'], 'show_settings')
self.__server.register_function(context['api']['show_about'], 'show_about')
self.__server.register_function(context['api']['enable_safeeyes'], 'enable_safeeyes')
self.__server.register_function(context['api']['disable_safeeyes'], 'disable_safeeyes')
self.__server.register_function(context['api']['take_break'], 'take_break')
self.__server.register_function(context['api']['quit'], 'quit')
def start(self):
"""