diff cagou/plugins/plugin_wid_file_sharing.py @ 404:f7476818f9fb

core (common): JidSelector + behaviors various improvments: - renamed *Behaviour => *Behavior to be consistent with Kivy + moved to new "core.behaviors" modules - use a dedicated property in ContactItem for notification counter (which is now named "badge") - in JidSelector, well-known strings now create use a dedicated layout, add separator (except if new `add_separators` property is set to False), and are added to attribute of the same name - a new `item_class` property is now used to indicate the class to instanciate for items (by default it's a ContactItem) - FilterBahavior.do_filter now expect the parent layout instead of directly the children, this is to allow a FilterBahavior to manage several children layout at once (used with JidSelector) - core.utils has been removed, as the behavior there has been moved to core.behaviors
author Goffi <goffi@goffi.org>
date Wed, 12 Feb 2020 20:02:58 +0100
parents d61bbbac4160
children 3c9ba4a694ef
line wrap: on
line diff
--- a/cagou/plugins/plugin_wid_file_sharing.py	Wed Feb 12 20:02:58 2020 +0100
+++ b/cagou/plugins/plugin_wid_file_sharing.py	Wed Feb 12 20:02:58 2020 +0100
@@ -26,11 +26,11 @@
 from sat.tools.common import files_utils
 from sat_frontends.quick_frontend import quick_widgets
 from sat_frontends.tools import jid
-from cagou.core.constants import Const as C
-from cagou.core import cagou_widget
-from cagou.core.menu import EntitiesSelectorMenu, TouchMenuBehaviour
-from cagou.core.utils import FilterBehavior
-from cagou.core.common_widgets import (Identities, ItemWidget, DeviceWidget,
+from ..core.constants import Const as C
+from ..core import cagou_widget
+from ..core.menu import EntitiesSelectorMenu
+from ..core.behaviors import TouchMenuBehavior, FilterBehavior
+from ..core.common_widgets import (Identities, ItemWidget, DeviceWidget,
                                        CategorySeparator)
 from cagou import G
 from kivy import properties
@@ -148,7 +148,7 @@
 
 
 class FileSharing(quick_widgets.QuickWidget, cagou_widget.CagouWidget, FilterBehavior,
-                  TouchMenuBehaviour):
+                  TouchMenuBehavior):
     SINGLE=False
     layout = properties.ObjectProperty()
     mode = properties.OptionProperty(MODE_VIEW, options=[MODE_VIEW, MODE_LOCAL])
@@ -163,7 +163,7 @@
         quick_widgets.QuickWidget.__init__(self, host, target, profiles)
         cagou_widget.CagouWidget.__init__(self)
         FilterBehavior.__init__(self)
-        TouchMenuBehaviour.__init__(self)
+        TouchMenuBehavior.__init__(self)
         self.mode_btn = ModeBtn(self)
         self.mode_btn.bind(on_release=self.change_mode)
         self.headerInputAddExtra(self.mode_btn)
@@ -216,7 +216,7 @@
         """we filter items when text is entered in input box"""
         if '/' in text:
             return
-        self.do_filter(self.layout.children,
+        self.do_filter(self.layout,
                        text,
                        lambda c: c.name,
                        width_cb=lambda c: c.base_width,