1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
|
Description: Provide compatibility with pygobject>=3.52
This replaces the deprecated usage od pygtkcompat now finally removed with
pygobject 3.52.
Author: Cédric Krier <cedric.krier@b2ck.com>
Bug: https://foss.heptapod.net/tryton/tryton/-/issues/13855, https://foss.heptapod.net/tryton/tryton/-/issues/8489
Forwarded: not-needed
--- a/tryton/gui/window/view_form/view/list.py
+++ b/tryton/gui/window/view_form/view/list.py
@@ -5,9 +5,9 @@
import locale
import sys
from functools import wraps
+from weakref import WeakValueDictionary
from gi.repository import Gdk, GLib, GObject, Gtk
-from pygtkcompat.generictreemodel import GenericTreeModel
import tryton.common as common
from tryton.common import (
@@ -60,15 +60,30 @@
return tuple(indexes)
-class AdaptModelGroup(GenericTreeModel):
+class ModelGroup(GObject.GObject, Gtk.TreeModel):
def __init__(self, group, children_field=None):
- super(AdaptModelGroup, self).__init__()
+ super().__init__()
+ self._pool = WeakValueDictionary()
self.group = group
- self.set_property('leak_references', False)
self.children_field = children_field
self.__removed = None # XXX dirty hack to allow update of has_child
+ def _get_user_data(self, iter):
+ return self._pool.get(iter.user_data)
+
+ def _set_user_data(self, iter, data):
+ if data is not None:
+ iter.user_data = id(data)
+ self._pool[iter.user_data] = data
+ else:
+ iter.user_data = None
+
+ def _create_tree_iter(self, data):
+ iter = Gtk.TreeIter()
+ self._set_user_data(iter, data)
+ return iter
+
def added(self, group, record):
if (group is self.group
and (record.group is self.group
@@ -100,7 +115,6 @@
def remove(self, iter_):
record = self.get_value(iter_, 0)
record.group.remove(record)
- self.invalidate_iters()
def __move(self, record, path, offset=0):
iter_ = self.get_iter(path)
@@ -169,43 +183,51 @@
def __len__(self):
return len(self.group)
- def on_get_flags(self):
+ def do_get_flags(self):
if not self.children_field:
return Gtk.TreeModelFlags.LIST_ONLY
return 0
- def on_get_n_columns(self):
+ def do_get_n_columns(self):
# XXX
return 1
- def on_get_column_type(self, index):
+ def do_get_column_type(self, index):
# XXX
return GObject.TYPE_PYOBJECT
- def on_get_path(self, record):
- return record.get_index_path(self.group)
+ def do_get_path(self, iter):
+ record = self._get_user_data(iter)
+ path = record.get_index_path(self.group)
+ if path is None:
+ return None
+ else:
+ return Gtk.TreePath(path)
- def on_get_iter(self, path):
+ def do_get_iter(self, path):
group = self.group
record = None
for i in path:
if group is None or i >= len(group):
- return None
+ return (False, None)
record = group[i]
if not self.children_field:
break
group = record.children_group(self.children_field)
- return record
+ return (True, self._create_tree_iter(record))
- def on_get_value(self, record, column):
- return record
+ def do_get_value(self, iter, column):
+ return self._get_user_data(iter)
- def on_iter_next(self, record):
- if record is None:
- return None
- return record.next.get(id(record.group))
+ def do_iter_next(self, iter):
+ record = self._get_user_data(iter)
+ if record is not None:
+ record = record.next.get(id(record.group))
+ self._set_user_data(iter, record)
+ return record is not None
- def on_iter_has_child(self, record):
+ def do_iter_has_child(self, parent):
+ record = self._get_user_data(parent) if parent else None
if record is None or not self.children_field:
return False
children = record.children_group(self.children_field)
@@ -216,40 +238,49 @@
length -= 1
return bool(length)
- def on_iter_children(self, record):
+ def do_iter_children(self, parent):
+ record = self._get_user_data(parent) if parent else None
+ child = None
if record is None:
if self.group:
- return self.group[0]
- else:
- return None
- if self.children_field:
+ child = self.group[0]
+ elif self.children_field:
children = record.children_group(self.children_field)
if children:
- return children[0]
- return None
+ child = children[0]
+ if child:
+ return (True, self._create_tree_iter(child))
+ else:
+ return (False, None)
- def on_iter_n_children(self, record):
+ def do_iter_n_children(self, iter):
+ record = self._get_user_data(iter) if iter else None
if record is None:
return len(self.group)
if not self.children_field:
return 0
return len(record.children_group(self.children_field))
- def on_iter_nth_child(self, record, nth):
+ def do_iter_nth_child(self, parent, n):
+ record = self._get_user_data(parent) if parent else None
+ child = None
if record is None:
- if nth < len(self.group):
- return self.group[nth]
- return None
- if not self.children_field:
- return None
- if nth < len(record.children_group(self.children_field)):
- return record.children_group(self.children_field)[nth]
- return None
+ if n < len(self.group):
+ child = self.group[n]
+ elif self.children_field:
+ if n < len(record.children_group(self.children_field)):
+ child = record.children_group(self.children_field)[n]
+ if child:
+ return (True, self._create_tree_iter(child))
+ else:
+ return (False, None)
- def on_iter_parent(self, record):
- if record is None:
- return None
- return record.parent
+ def do_iter_parent(self, child):
+ record = self._get_user_data(child) if child else None
+ if record and record.parent:
+ return (True, self._create_tree_iter(record.parent))
+ else:
+ return (False, None)
class TreeXMLViewParser(XMLViewParser):
@@ -1107,7 +1138,7 @@
if (force
or not self.treeview.get_model()
or self.group != self.treeview.get_model().group):
- model = AdaptModelGroup(self.group, self.children_field)
+ model = ModelGroup(self.group, self.children_field)
self.treeview.set_model(model)
# __select_changed resets current_record to None
self.record = current_record
--- a/setup.py
+++ b/setup.py
@@ -137,7 +137,7 @@
install_requires=[
'pycairo',
"python-dateutil",
- 'PyGObject>=3.19,<3.51',
+ 'PyGObject>=3.19',
],
extras_require={
'calendar': ['GooCalendar>=0.7'],
|
