comparison frontends/src/primitivus/primitivus @ 2086:4633cfcbcccb

bridge (D-Bus): bad design fixes: - renamed outputed module to dbus_bridge (to avoid uppercase and conflict with dbus module) - class name is now Bridge for both frontend and core (make discovery/import more easy) - register renamed to register_method in core, and register_signal in frontend
author Goffi <goffi@goffi.org>
date Mon, 03 Oct 2016 21:15:39 +0200
parents 7834743705f0
children e0066920a661
comparison
equal deleted inserted replaced
2085:da4097de5a95 2086:4633cfcbcccb
26 log = logging.getLogger(__name__) 26 log = logging.getLogger(__name__)
27 from sat.tools import config as sat_config 27 from sat.tools import config as sat_config
28 import urwid 28 import urwid
29 from urwid.util import is_wide_char 29 from urwid.util import is_wide_char
30 from urwid_satext import sat_widgets 30 from urwid_satext import sat_widgets
31 from sat_frontends.bridge.DBus import DBusBridgeFrontend 31 from sat_frontends.bridge.dbus_bridge import Bridge
32 from sat_frontends.quick_frontend.quick_app import QuickApp 32 from sat_frontends.quick_frontend.quick_app import QuickApp
33 from sat_frontends.quick_frontend import quick_utils 33 from sat_frontends.quick_frontend import quick_utils
34 from sat_frontends.quick_frontend import quick_chat 34 from sat_frontends.quick_frontend import quick_chat
35 from sat_frontends.primitivus.profile_manager import ProfileManager 35 from sat_frontends.primitivus.profile_manager import ProfileManager
36 from sat_frontends.primitivus.contact_list import ContactList 36 from sat_frontends.primitivus.contact_list import ContactList
274 class PrimitivusApp(QuickApp, InputHistory): 274 class PrimitivusApp(QuickApp, InputHistory):
275 MB_HANDLER = False 275 MB_HANDLER = False
276 AVATAR_HANDLER = False 276 AVATAR_HANDLER = False
277 277
278 def __init__(self): 278 def __init__(self):
279 QuickApp.__init__(self, create_bridge=DBusBridgeFrontend, xmlui=xmlui, check_options=quick_utils.check_options) 279 QuickApp.__init__(self, create_bridge=Bridge, xmlui=xmlui, check_options=quick_utils.check_options)
280 280
281 ## main loop setup ## 281 ## main loop setup ##
282 self.main_widget = ProfileManager(self) 282 self.main_widget = ProfileManager(self)
283 self.loop = urwid.MainLoop(self.main_widget, C.PALETTE, event_loop=urwid.GLibEventLoop(), input_filter=self.inputFilter, unhandled_input=self.keyHandler) 283 self.loop = urwid.MainLoop(self.main_widget, C.PALETTE, event_loop=urwid.GLibEventLoop(), input_filter=self.inputFilter, unhandled_input=self.keyHandler)
284 284