# HG changeset patch # User Goffi # Date 1468001829 -7200 # Node ID 8b2836b5b6c761f0969b4ab0b261e44f04c0f5ce # Parent 7b0a53d2afd3e1657d0aac805e45cf28c8124057 added CagouWidget: CagouWidget is the base for all selectable widgets, it currently displays basic drop/down menu which will be used to switch widget (in a similar way as in Blender), and a text input which will be the generic search field (behaviour may vary between widgets). diff -r 7b0a53d2afd3 -r 8b2836b5b6c7 src/cagou.kv --- a/src/cagou.kv Fri Jul 08 18:30:30 2016 +0200 +++ b/src/cagou.kv Fri Jul 08 20:17:09 2016 +0200 @@ -16,3 +16,4 @@ #:include profile_manager.kv #:include contact_list.kv +#:include cagou_widget.kv diff -r 7b0a53d2afd3 -r 8b2836b5b6c7 src/cagou_widget.kv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cagou_widget.kv Fri Jul 08 20:17:09 2016 +0200 @@ -0,0 +1,38 @@ +# 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 . + + +: + size_hint: 0.3, 1 + Button: + text: "widget 1" + size_hint_y: None + height: 44 + on_release: root.select('item1') + Button: + text: "widget 2" + +: + BoxLayout: + size_hint: 1, None + height: 30 + Button: + text: "wid_XXX" + on_release: root.selector.open(self) + size_hint: None, 1 + width: 60 + TextInput: + multiline: False diff -r 7b0a53d2afd3 -r 8b2836b5b6c7 src/cagou_widget.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cagou_widget.py Fri Jul 08 20:17:09 2016 +0200 @@ -0,0 +1,35 @@ +#!/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 . + + +from sat.core import log as logging +log = logging.getLogger(__name__) +from kivy.uix.boxlayout import BoxLayout +from kivy.uix.dropdown import DropDown + + +class HeaderWidgetSelector(DropDown): + pass + + +class CagouWidget(BoxLayout): + + def __init__(self): + BoxLayout.__init__(self, orientation="vertical") + self.selector = HeaderWidgetSelector() diff -r 7b0a53d2afd3 -r 8b2836b5b6c7 src/contact_list.py --- a/src/contact_list.py Fri Jul 08 18:30:30 2016 +0200 +++ b/src/contact_list.py Fri Jul 08 20:17:09 2016 +0200 @@ -25,6 +25,7 @@ from kivy.uix.listview import ListView from kivy.adapters.listadapter import ListAdapter from kivy import properties +from cagou_widget import CagouWidget import image @@ -40,11 +41,11 @@ BoxLayout.__init__(self, **kwargs) -class ContactList(QuickContactList, BoxLayout): +class ContactList(QuickContactList, CagouWidget): def __init__(self, host, target, profiles): QuickContactList.__init__(self, host, profiles) - BoxLayout.__init__(self, orientation="vertical") + CagouWidget.__init__(self) self.adapter = ListAdapter(data={}, cls=ContactItem, args_converter=self.contactDataConverter,