Mercurial > libervia-desktop

changeset 13:12a189fbb9ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
widget handler first draft: This widget handle other widgets location and size. It is currently loosely inspired from Blender's UI, and the implementation is currenlty naïve. It should be updated in the future to have a behaviour more close to Blender one.
author Goffi <goffi@goffi.org>
date Fri, 08 Jul 2016 20:18:43 +0200
parents 30f6586f904b
children 21a432afd06d
files src/cagou.kv src/cagou.py src/widgets_handler.kv src/widgets_handler.py
diffstat 4 files changed, 132 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/cagou.kv	Fri Jul 08 20:18:36 2016 +0200
+++ b/src/cagou.kv	Fri Jul 08 20:18:43 2016 +0200
@@ -16,5 +16,6 @@
 
 #:include profile_manager.kv
 #:include contact_list.kv
+#:include widgets_handler.kv
 #:include cagou_widget.kv
 #:include widget_selector.kv
--- a/src/cagou.py	Fri Jul 08 20:18:36 2016 +0200
+++ b/src/cagou.py	Fri Jul 08 20:18:43 2016 +0200
@@ -33,6 +33,7 @@
 from kivy.app import App
 import xmlui
 from profile_manager import ProfileManager
+from widgets_handler import WidgetsHandler
 from kivy.uix.boxlayout import BoxLayout
 from widget_selector import WidgetSelector
 from cagou_widget import CagouWidget
@@ -74,7 +75,7 @@
 
     def plugging_profiles(self):
         widget_selector = WidgetSelector(self)
-        self.app.root.change_widgets([widget_selector])
+        self.app.root.change_widgets([WidgetsHandler(self, widget_selector)])
 
     def setPresenceStatus(self, show='', status=None, profile=C.PROF_KEY_NONE):
         log.info(u"Profile presence status set to {show}/{status}".format(show=show, status=status))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/widgets_handler.kv	Fri Jul 08 20:18:43 2016 +0200
@@ -0,0 +1,28 @@
+# Cagou: desktop/mobile frontend for Salut à Toi XMPP client
+# Copyright (C) 2016 Jérôme Poisson (goffi@goffi.org)
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+<WHSplitter>:
+    border: (3, 3, 3, 3)
+    horizontal_suff: '_h' if self.horizontal else ''
+    background_normal: 'atlas://data/images/defaulttheme/splitter{}{}'.format('_disabled' if self.disabled else '', self.horizontal_suff)
+    background_down: 'atlas://data/images/defaulttheme/splitter_down{}{}'.format('_disabled' if self.disabled else '', self.horizontal_suff)
+    size_hint: (1, None) if self.horizontal else (None, 1)
+    size: (100, self.thickness) if self.horizontal else (self.thickness, 100)
+    Image:
+        pos: root.pos
+        size: root.size
+        allow_stretch: True
+        source: 'atlas://data/images/defaulttheme/splitter_grip' + root.horizontal_suff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/widgets_handler.py	Fri Jul 08 20:18:43 2016 +0200
@@ -0,0 +1,101 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Cagou: desktop/mobile frontend for Salut à Toi XMPP client
+# Copyright (C) 2016 Jérôme Poisson (goffi@goffi.org)
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+from sat.core import log as logging
+log = logging.getLogger(__name__)
+from kivy.uix.boxlayout import BoxLayout
+from kivy.uix.button import Button
+from kivy import properties
+from widget_selector import WidgetSelector
+
+
+NEW_WIDGET_DIST = 10
+REMOVE_WIDGET_DIST = NEW_WIDGET_DIST
+
+
+class WHSplitter(Button):
+    horizontal=properties.BooleanProperty(True)
+    thickness=properties.NumericProperty(15)
+    split_move = None # we handle one split at a time, so we use a class attribute
+
+    def __init__(self, handler, **kwargs):
+        super(WHSplitter, self).__init__(**kwargs)
+        self.handler = handler
+
+    def getPos(self, touch):
+        if self.horizontal:
+            relative_y = self.handler.to_local(*touch.pos, relative=True)[1]
+            return self.handler.height - relative_y
+        else:
+            return touch.x
+
+    def on_touch_move(self, touch):
+        if self.split_move is None and self.collide_point(*touch.opos):
+            WHSplitter.split_move = self
+
+        if self.split_move is self:
+            pos = self.getPos(touch)
+            if pos > NEW_WIDGET_DIST:
+                # we are above minimal distance, we resize the widget
+                self.handler.setWidgetSize(self.horizontal, pos)
+
+    def on_touch_up(self, touch):
+        if self.split_move is self:
+            pos = self.getPos(touch)
+            if pos <= REMOVE_WIDGET_DIST:
+                # if we go under minimal distance, the widget is not wanted anymore
+                self.handler.removeWidget(self.horizontal)
+            WHSplitter.split_move=None
+        return super(WHSplitter, self).on_touch_up(touch)
+
+
+class WidgetsHandler(BoxLayout):
+
+    def __init__(self, host, wid, **kw):
+        self.host = host
+        self.vert_wid = self.hor_wid = None
+        BoxLayout.__init__(self, orientation="vertical", **kw)
+        self.blh = BoxLayout(orientation="horizontal")
+        self.blv = BoxLayout(orientation="vertical")
+        self.blv.add_widget(WHSplitter(self))
+        self.blv.add_widget(wid)
+        self.blh.add_widget(WHSplitter(self, horizontal=False))
+        self.blh.add_widget(self.blv)
+        self.add_widget(self.blh)
+
+    def removeWidget(self, vertical):
+        if vertical and self.vert_wid is not None:
+            self.remove_widget(self.vert_wid)
+            self.vert_wid = None
+        elif self.hor_wid is not None:
+            self.blh.remove_widget(self.hor_wid)
+            self.hor_wid = None
+
+    def setWidgetSize(self, vertical, size):
+        if vertical:
+            if self.vert_wid is None:
+                self.vert_wid = WidgetsHandler(self.host, WidgetSelector(self.host), size_hint=(1, None))
+                self.add_widget(self.vert_wid, len(self.children))
+            self.vert_wid.height=size
+        else:
+            if self.hor_wid is None:
+                self.hor_wid = WidgetsHandler(self.host, WidgetSelector(self.host), size_hint=(None, 1))
+                self.blh.add_widget(self.hor_wid, len(self.blh.children))
+            self.hor_wid.width=size