Mercurial > libervia-backend
changeset 1322:1f13a837e4b2 frontends_multi_profiles
quick_frontend (quick_widgets): revert commit 1319
author | souliane <souliane@mailoo.org> |
---|---|
date | Tue, 10 Feb 2015 10:33:54 +0100 (2015-02-10) |
parents | e9888db0eb0c |
children | a599b6a70dc0 |
files | frontends/src/quick_frontend/quick_widgets.py |
diffstat | 1 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/frontends/src/quick_frontend/quick_widgets.py Tue Feb 10 19:08:01 2015 +0100 +++ b/frontends/src/quick_frontend/quick_widgets.py Tue Feb 10 10:33:54 2015 +0100 @@ -105,15 +105,13 @@ if there is neither 'profile' nor 'profiles', None will be used for 'profiles' if 'on_new_widget' is present it can have the following values: C.WIDGET_NEW [default]: self.host.newWidget will be called on widget creation - [callable]: this method will be called instead of self.host.newWidget, - and can return another widget to modify the result of the present method + [callable]: this method will be called instead of self.host.newWidget None: do nothing if 'on_existing_widget' is present it can have the following values: C.WIDGET_KEEP [default]: return the existing widget C.WIDGET_RAISE: raise WidgetAlreadyExistsError C.WIDGET_RECREATE: create a new widget *WITH A NEW HASH* - [callable]: this method will be called with existing widget as argument, - and can return another widget to modify the result of the present method + [callable]: this method will be called with existing widget as argument if 'force_hash' is present, the hash given in value will be used instead of the one returned by class_.getWidgetHash other keys will be used to instanciate class_ if the case happen (e.g. if type_ is present and class_ is a QuickChat subclass, it will be used to create a new QuickChat instance). @@ -171,9 +169,7 @@ if on_new_widget == C.WIDGET_NEW: self.host.newWidget(widget) elif callable(on_new_widget): - result = on_new_widget(widget) - if isinstance(result, QuickWidget): - widget = result + on_new_widget(widget) else: assert on_new_widget is None else: @@ -207,9 +203,7 @@ log.debug(u"Widget already exists, a new one has been recreated with hash {}".format(new_kwargs['force_hash'])) break elif callable(on_existing_widget): - result = on_existing_widget(widget) - if isinstance(result, QuickWidget): - widget = result + on_existing_widget(widget) else: raise exceptions.InternalError("Unexpected on_existing_widget value ({})".format(on_existing_widget))