libervia-desktop-kivy: src/cagou/core/cagou

comparison src/cagou/core/cagou_main.py @ 38:9f45098289cc

widgets handler, core: hidden widgets can now be shown with swipes: - a couple of methods have been added to handle visible and hidden widgets - a new getOrClone method allow to recreate a widget if it already has a parent (can happen even if the widget is not shown, e.g. in a carousel) - handler now display hidden widgets of the same class as the displayed one when swiping. For instance, if a chat widget is displayed, and header input is used to show an other one, it's now possible to go back to the former by swiping. QuickWidget.onDelete method can be used to handle if a widget must be really deleted (return True) or just hidden (any other value). - handler use a subclass of Carousel for this new feature, with some adjustement so event can be passed to children without too much delay (and frustration). This may need to be adjusted again in the future. - handler.cagou_widget now give the main displayed widget in the handler - handler.changeWidget must be used when widget need to be changed (it's better to use host.switchWidget which will call it itself)

author	Goffi <goffi@goffi.org>
date	Sun, 28 Aug 2016 15:27:48 +0200
parents	02acbb297a61
children	a1ec6cb57a1b

comparison

equal deleted inserted replaced

-:6cf08d0ee460
+:9f45098289cc
 import logging_setter
 logging_setter.set_logging()
 from constants import Const as C
 from sat.core import log as logging
 log = logging.getLogger(__name__)
+from sat.core import exceptions
 from sat_frontends.quick_frontend.quick_app import QuickApp
 from sat_frontends.quick_frontend import quick_widgets
 from sat_frontends.bridge.DBus import DBusBridgeFrontend
 import kivy
 kivy.require('1.9.1')
 from kivy.uix.label import Label
 from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.screenmanager import ScreenManager, Screen, FallOutTransition, RiseInTransition
 from kivy.uix.dropdown import DropDown
 from cagou_widget import CagouWidget
+from . import widgets_handler
 from .common import IconButton
 from importlib import import_module
 import os.path
 import glob
 import cagou.plugins
 self.app.host = self
 self.media_dir = self.app.media_dir = self.bridge.getConfig("", "media_dir")
 self.app.default_avatar = os.path.join(self.media_dir, "misc/default_avatar.png")
 self._plg_wids = []  # widget plugins
 self._import_plugins()
+self._visible_widgets = {}  # visible widgets by classes
+@property
+def visible_widgets(self):
+for w_list in self._visible_widgets.itervalues():
+for w in w_list:
+yield w
 def run(self):
 self.app.run()
 def _defaultFactory(self, plugin_info, target, profiles):
 continue
 yield plugin_data
 ## widgets handling
+def getParentHandler(self, widget):
+"""Return handler holding this widget
+@return (WidgetsHandler): handler
+"""
+w_handler = widget.parent
+while w_handler and not(isinstance(w_handler, widgets_handler.WidgetsHandler)):
+w_handler = w_handler.parent
+return w_handler
 def switchWidget(self, old, new):
 """Replace old widget by new one
 old(CagouWidget): CagouWidget instance or a child
 new(CagouWidget): new widget instance
 if isinstance(w, CagouWidget):
 to_change = w
 break
 if to_change is None:
-log.error(u"no CagouWidget found when trying to switch widget")
+raise exceptions.InternalError(u"no CagouWidget found when trying to switch widget")
-else:
+handler = self.getParentHandler(to_change)
-parent = to_change.parent
+handler.changeWidget(new)
-idx = parent.children.index(to_change)
-parent.remove_widget(to_change)
+def addVisibleWidget(self, widget):
-if isinstance(to_change, quick_widgets.QuickWidget):
+"""declare a widget visible
-self.widgets.deleteWidget(to_change)
-parent.add_widget(new, index=idx)
+for internal use only!
+"""
+assert isinstance(widget, quick_widgets.QuickWidget)
+log.info(u"addVisibleWidget: {}".format(', '.join([unicode(t) for t in widget.targets])))
+self._visible_widgets.setdefault(widget.__class__, []).append(widget)
+def removeVisibleWidget(self, widget):
+"""declare a widget not visible anymore
+for internal use only!
+"""
+log.info(u"removeVisibleWidget: {}".format(', '.join([unicode(t) for t in widget.targets])))
+self._visible_widgets[widget.__class__].remove(widget)
+log.info("remove: " + unicode(widget.targets))
+self.widgets.deleteWidget(widget)
+def getVisibleList(self, cls):
+"""get list of visible widgets for a given class
+@param cls(QuickWidget class): type of widgets to get
+@return (list[QuickWidget class]): visible widgets of this class
+"""
+try:
+return self._visible_widgets[cls]
+except KeyError:
+return []
+def getOrClone(self, widget):
+"""Get a QuickWidget if it has not parent set else clone it"""
+if widget.parent is None:
+return widget
+targets = list(widget.targets)
+w = self.widgets.getOrCreateWidget(widget.__class__, targets[0], on_new_widget=None, on_existing_widget=C.WIDGET_RECREATE, profiles=widget.profiles)
+for t in targets[1:]:
+w.addTarget(t)
+return w
 ## misc ##
 def plugging_profiles(self):
 self.app.root.changeWidget(WidgetsHandler())

Mercurial > libervia-desktop-kivy

comparison src/cagou/core/cagou_main.py @ 38:9f45098289cc