Mercurial > libervia-desktop-kivy
annotate cagou/core/menu.py @ 417:5b50b7ef2617
menu (TransferMenu): UI improvments:
- a white background is now used
- ToggleButton have been replaced by SymbolButtonLabel
- transfer info message now displays with emphasis if the file will be encrypted or not,
and explain when the file goes to the server
- various padding/spacing/color adjustments
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Sun, 23 Feb 2020 17:16:27 +0100 |
| parents | 5761b5f03c0c |
| children | cebf657d78ef |
| rev | line source |
|---|---|
| 379 | 1 #!/usr/bin/env python3 |
| 2 | |
| 51 | 3 |
| 4 # Cagou: desktop/mobile frontend for Salut à Toi XMPP client | |
| 378 | 5 # Copyright (C) 2016-2020 Jérôme Poisson (goffi@goffi.org) |
| 51 | 6 |
| 7 # This program is free software: you can redistribute it and/or modify | |
| 8 # it under the terms of the GNU Affero General Public License as published by | |
| 9 # the Free Software Foundation, either version 3 of the License, or | |
| 10 # (at your option) any later version. | |
| 11 | |
| 12 # This program is distributed in the hope that it will be useful, | |
| 13 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 # GNU Affero General Public License for more details. | |
| 16 | |
| 17 # You should have received a copy of the GNU Affero General Public License | |
| 18 # along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 | |
| 20 | |
| 21 from sat.core.i18n import _ | |
| 22 from sat.core import log as logging | |
| 23 from cagou.core.constants import Const as C | |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
24 from cagou.core.common import JidToggle |
|
85
c2a7234d13d2
menu: use of garden's contextmenu for menus
Goffi <goffi@goffi.org>
parents:
53
diff
changeset
|
25 from kivy.uix.boxlayout import BoxLayout |
| 51 | 26 from kivy.uix.label import Label |
| 376 | 27 from kivy.uix.button import Button |
| 51 | 28 from kivy.uix.popup import Popup |
|
404
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
400
diff
changeset
|
29 from .behaviors import FilterBehavior |
| 51 | 30 from kivy import properties |
|
168
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
31 from kivy.core.window import Window |
|
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
32 from kivy.animation import Animation |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
33 from kivy.metrics import dp |
| 51 | 34 from cagou import G |
| 222 | 35 from functools import partial |
| 51 | 36 import webbrowser |
| 37 | |
|
302
f55b60659ec1
core (about): improved "about" popup:
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
38 log = logging.getLogger(__name__) |
|
f55b60659ec1
core (about): improved "about" popup:
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
39 |
| 312 | 40 ABOUT_TITLE = _("About {}".format(C.APP_NAME)) |
| 41 ABOUT_CONTENT = _("""[b]Cagou (Salut à Toi)[/b] | |
|
302
f55b60659ec1
core (about): improved "about" popup:
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
42 |
|
f55b60659ec1
core (about): improved "about" popup:
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
43 [u]cagou version[/u]: |
|
f55b60659ec1
core (about): improved "about" popup:
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
44 {version} |
|
f55b60659ec1
core (about): improved "about" popup:
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
45 |
|
f55b60659ec1
core (about): improved "about" popup:
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
46 [u]backend version[/u]: |
|
f55b60659ec1
core (about): improved "about" popup:
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
47 {backend_version} |
| 51 | 48 |
| 49 Cagou is a libre communication tool based on libre standard XMPP. | |
| 50 | |
|
302
f55b60659ec1
core (about): improved "about" popup:
Goffi <goffi@goffi.org>
parents:
282
diff
changeset
|
51 Cagou is part of the "Salut à Toi" project (desktop/mobile frontend) |
| 51 | 52 more informations at [color=5500ff][ref=website]salut-a-toi.org[/ref][/color] |
| 246 | 53 """) |
| 51 | 54 |
| 55 | |
| 56 class AboutContent(Label): | |
| 57 | |
| 58 def on_ref_press(self, value): | |
| 59 if value == "website": | |
| 60 webbrowser.open("https://salut-a-toi.org") | |
| 61 | |
| 62 | |
| 63 class AboutPopup(Popup): | |
| 64 | |
| 65 def on_touch_down(self, touch): | |
| 66 if self.collide_point(*touch.pos): | |
| 67 self.dismiss() | |
| 68 return super(AboutPopup, self).on_touch_down(touch) | |
| 69 | |
| 70 | |
|
97
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
71 class TransferItem(BoxLayout): |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
72 plug_info = properties.DictProperty() |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
73 |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
74 def on_touch_up(self, touch): |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
75 if not self.collide_point(*touch.pos): |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
76 return super(TransferItem, self).on_touch_up(touch) |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
77 else: |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
78 transfer_menu = self.parent |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
79 while not isinstance(transfer_menu, TransferMenu): |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
80 transfer_menu = transfer_menu.parent |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
81 transfer_menu.do_callback(self.plug_info) |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
82 return True |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
83 |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
84 |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
85 class SideMenu(BoxLayout): |
|
216
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
86 size_hint_close = (0, 1) |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
87 size_hint_open = (0.4, 1) |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
88 size_close = (100, 100) |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
89 size_open = (0, 0) |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
90 bg_color = properties.ListProperty([0, 0, 0, 1]) |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
91 # callback will be called with arguments relevant to menu |
| 86 | 92 callback = properties.ObjectProperty() |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
93 # call do_callback even when menu is cancelled |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
94 callback_on_close = properties.BooleanProperty(False) |
| 86 | 95 # cancel callback need to remove the widget for UI |
| 96 # will be called with the widget to remove as argument | |
| 97 cancel_cb = properties.ObjectProperty() | |
| 98 | |
| 99 def __init__(self, **kwargs): | |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
100 super(SideMenu, self).__init__(**kwargs) |
| 86 | 101 if self.cancel_cb is None: |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
102 self.cancel_cb = self.onMenuCancelled |
| 86 | 103 |
|
216
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
104 def _set_anim_kw(self, kw, size_hint, size): |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
105 """Set animation keywords |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
106 |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
107 for each value of size_hint it is used if not None, |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
108 else size is used. |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
109 If one value of size is bigger than the respective one of Window |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
110 the one of Window is used |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
111 """ |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
112 size_hint_x, size_hint_y = size_hint |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
113 width, height = size |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
114 if size_hint_x is not None: |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
115 kw['size_hint_x'] = size_hint_x |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
116 elif width is not None: |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
117 kw['width'] = min(width, Window.width) |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
118 |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
119 if size_hint_y is not None: |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
120 kw['size_hint_y'] = size_hint_y |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
121 elif height is not None: |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
122 kw['height'] = min(height, Window.height) |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
123 |
| 86 | 124 def show(self, caller_wid=None): |
|
168
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
125 Window.bind(on_keyboard=self.key_input) |
|
97
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
126 G.host.app.root.add_widget(self) |
|
216
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
127 kw = {'d': 0.3, 't': 'out_back'} |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
128 self._set_anim_kw(kw, self.size_hint_open, self.size_open) |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
129 Animation(**kw).start(self) |
|
168
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
130 |
|
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
131 def hide(self): |
|
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
132 Window.unbind(on_keyboard=self.key_input) |
|
216
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
133 kw = {'d': 0.2} |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
134 self._set_anim_kw(kw, self.size_hint_close, self.size_close) |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
135 anim = Animation(**kw) |
|
168
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
136 anim.bind(on_complete=lambda anim, menu: self.parent.remove_widget(self)) |
|
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
137 anim.start(self) |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
138 if self.callback_on_close: |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
139 self.do_callback() |
|
97
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
140 |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
141 def on_touch_down(self, touch): |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
142 # we remove the menu if we click outside |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
143 # else we want to handle the event, but not |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
144 # transmit it to parents |
|
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
145 if not self.collide_point(*touch.pos): |
|
168
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
146 self.hide() |
| 86 | 147 else: |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
148 return super(SideMenu, self).on_touch_down(touch) |
|
97
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
149 return True |
| 86 | 150 |
|
168
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
151 def key_input(self, window, key, scancode, codepoint, modifier): |
|
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
152 if key == 27: |
|
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
153 self.hide() |
|
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
154 return True |
|
397f2fb67aab
core (menu): animate transfer menu opening/closing + close it on [ESC]/back
Goffi <goffi@goffi.org>
parents:
126
diff
changeset
|
155 |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
156 def onMenuCancelled(self, wid, cleaning_cb=None): |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
157 self._closeUI(wid) |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
158 if cleaning_cb is not None: |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
159 cleaning_cb() |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
160 |
| 86 | 161 def _closeUI(self, wid): |
| 162 G.host.closeUI() | |
| 163 | |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
164 def do_callback(self, *args, **kwargs): |
| 312 | 165 log.warning("callback not implemented") |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
166 |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
167 |
| 376 | 168 class ExtraMenuItem(Button): |
| 169 pass | |
| 170 | |
| 171 | |
| 172 class ExtraSideMenu(SideMenu): | |
| 173 """Menu with general app actions like showing the about widget""" | |
| 174 | |
| 175 def __init__(self, **kwargs): | |
| 176 super().__init__(**kwargs) | |
| 177 G.local_platform.on_extra_menu_init(self) | |
| 178 | |
| 179 def addItem(self, label, callback): | |
| 180 self.add_widget( | |
| 181 ExtraMenuItem( | |
| 182 text=label, | |
| 183 on_press=partial(self.onItemPress, callback=callback), | |
| 184 ), | |
| 185 # we want the new item above "About" and last empty Widget | |
| 186 index=2) | |
| 187 | |
| 188 def onItemPress(self, *args, callback): | |
| 189 self.hide() | |
| 190 callback() | |
| 191 | |
| 192 def onAbout(self): | |
| 193 self.hide() | |
| 194 about = AboutPopup() | |
| 195 about.title = ABOUT_TITLE | |
| 196 about.content = AboutContent( | |
| 197 text=ABOUT_CONTENT.format( | |
| 198 backend_version = G.host.backend_version, | |
| 199 version=G.host.version), | |
| 200 markup=True) | |
| 201 about.open() | |
| 202 | |
| 203 | |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
204 class TransferMenu(SideMenu): |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
205 """transfer menu which handle display and callbacks""" |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
206 # callback will be called with path to file to transfer |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
207 # profiles if set will be sent to transfer widget, may be used to get specific files |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
208 profiles = properties.ObjectProperty() |
|
417
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
209 transfer_txt = properties.StringProperty() |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
210 transfer_info = properties.ObjectProperty() |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
211 upload_btn = properties.ObjectProperty() |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
212 encrypted = properties.BooleanProperty(False) |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
213 items_layout = properties.ObjectProperty() |
|
216
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
214 size_hint_close = (1, 0) |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
215 size_hint_open = (1, 0.5) |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
216 |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
217 def __init__(self, **kwargs): |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
218 super(TransferMenu, self).__init__(**kwargs) |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
219 if self.profiles is None: |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
220 self.profiles = iter(G.host.profiles) |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
221 for plug_info in G.host.getPluggedWidgets(type_=C.PLUG_TYPE_TRANSFER): |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
222 item = TransferItem( |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
223 plug_info = plug_info |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
224 ) |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
225 self.items_layout.add_widget(item) |
| 86 | 226 |
|
417
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
227 def on_kv_post(self, __): |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
228 self.updateTransferInfo() |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
229 |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
230 def getTransferInfo(self): |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
231 if self.upload_btn.state == "down": |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
232 # upload |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
233 if self.encrypted: |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
234 return _( |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
235 "The file will be [color=00aa00][b]encrypted[/b][/color] and sent to " |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
236 "your server\nServer admin(s) can delete the file, but they won't be " |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
237 "able to see its content" |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
238 ) |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
239 else: |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
240 return _( |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
241 "Beware! The file will be sent to your server and stay " |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
242 "[color=ff0000][b]unencrypted[/b][/color] there\nServer admin(s) " |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
243 "can see the file, and they choose how, when and if it will be " |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
244 "deleted" |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
245 ) |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
246 else: |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
247 # P2P |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
248 if self.encrypted: |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
249 return _( |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
250 "The file will be sent [color=ff0000][b]unencrypted[/b][/color] " |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
251 "directly to your contact (it may be transiting by the " |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
252 "server if direct connection is not possible).\n[color=ff0000]" |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
253 "Please not that end-to-end encryption is not yet implemented for " |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
254 "P2P transfer." |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
255 ) |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
256 else: |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
257 return _( |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
258 "The file will be sent [color=ff0000][b]unencrypted[/b][/color] " |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
259 "directly to your contact (it [i]may be[/i] transiting by the " |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
260 "server if direct connection is not possible)." |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
261 ) |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
262 |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
263 def updateTransferInfo(self): |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
264 self.transfer_info.text = self.getTransferInfo() |
|
5b50b7ef2617
menu (TransferMenu): UI improvments:
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
265 |
|
400
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
266 def _onTransferCb(self, file_path, external, wid_cont, cleaning_cb=None): |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
267 if not external: |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
268 wid = wid_cont[0] |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
269 self._closeUI(wid) |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
270 self.callback( |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
271 file_path, |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
272 transfer_type = (C.TRANSFER_UPLOAD |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
273 if self.ids['upload_btn'].state == "down" else C.TRANSFER_SEND), |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
274 cleaning_cb=cleaning_cb, |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
275 ) |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
276 |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
277 def _check_plugin_permissions_cb(self, plug_info): |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
278 external = plug_info.get('external', False) |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
279 wid_cont = [] |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
280 wid_cont.append(plug_info['factory']( |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
281 plug_info, |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
282 partial(self._onTransferCb, external=external, wid_cont=wid_cont), |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
283 self.cancel_cb, |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
284 self.profiles)) |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
285 if not external: |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
286 G.host.showExtraUI(wid_cont[0]) |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
287 |
| 86 | 288 def do_callback(self, plug_info): |
|
97
5d2289127bb7
menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents:
88
diff
changeset
|
289 self.parent.remove_widget(self) |
| 86 | 290 if self.callback is None: |
| 312 | 291 log.warning("TransferMenu callback is not set") |
| 86 | 292 else: |
|
400
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
293 G.local_platform.check_plugin_permissions( |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
294 plug_info, |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
295 callback=partial(self._check_plugin_permissions_cb, plug_info), |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
296 errback=lambda: G.host.addNote( |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
297 _("permission refused"), |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
298 _("this transfer menu can't be used if you refuse the requested " |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
299 "permission"), |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
300 C.XMLUI_DATA_LVL_WARNING) |
|
71f51198478c
android: handle runtime permissions:
Goffi <goffi@goffi.org>
parents:
379
diff
changeset
|
301 ) |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
302 |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
303 |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
304 class EntitiesSelectorMenu(SideMenu, FilterBehavior): |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
305 """allow to select entities from roster""" |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
306 profiles = properties.ObjectProperty() |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
307 layout = properties.ObjectProperty() |
| 312 | 308 instructions = properties.StringProperty(_("Please select entities")) |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
309 filter_input = properties.ObjectProperty() |
|
216
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
310 size_hint_close = (None, 1) |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
311 size_hint_open = (None, 1) |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
312 size_open = (dp(250), 100) |
|
e42e0c45d384
core (menu): allow to specify size in SideMenu:
Goffi <goffi@goffi.org>
parents:
197
diff
changeset
|
313 size_close = (0, 100) |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
314 |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
315 def __init__(self, **kwargs): |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
316 super(EntitiesSelectorMenu, self).__init__(**kwargs) |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
317 self.filter_input.bind(text=self.do_filter_input) |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
318 if self.profiles is None: |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
319 self.profiles = iter(G.host.profiles) |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
320 for profile in self.profiles: |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
321 for jid_, jid_data in G.host.contact_lists[profile].all_iter: |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
322 jid_wid = JidToggle( |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
323 jid=jid_, |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
324 profile=profile) |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
325 self.layout.add_widget(jid_wid) |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
326 |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
327 def do_callback(self): |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
328 if self.callback is not None: |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
329 jids = [c.jid for c in self.layout.children if c.state == 'down'] |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
330 self.callback(jids) |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
331 |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
332 def do_filter_input(self, filter_input, text): |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
333 self.layout.spacing = 0 if text else dp(5) |
|
404
f7476818f9fb
core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents:
400
diff
changeset
|
334 self.do_filter(self.layout, |
|
197
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
335 text, |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
336 lambda c: c.jid, |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
337 width_cb=lambda c: c.width, |
|
c7d15ef4bfa8
core (menu): new EntitiesSelectorMenu:
Goffi <goffi@goffi.org>
parents:
184
diff
changeset
|
338 height_cb=lambda c: dp(70)) |