tryton 7.4.10__py3-none-any.whl → 7.6.1__py3-none-any.whl

tryton/gui/window/view_form/view/form_gtk/state_widget.py

@@ -14,7 +14,7 @@ class StateMixin(object):
 
     def __init__(self, *args, **kwargs):
         self.attrs = kwargs.pop('attrs')
-        super(StateMixin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def state_set(self, record):
         if record:
@@ -30,7 +30,7 @@ class StateMixin(object):
 class Label(StateMixin, Gtk.Label):
 
     def state_set(self, record):
-        super(Label, self).state_set(record)
+        super().state_set(record)
         if 'name' in self.attrs and record:
             field = record.group.fields[self.attrs['name']]
         else:
@@ -61,7 +61,7 @@ class VBox(StateMixin, Gtk.VBox):
 class Image(StateMixin, Gtk.Image):
 
     def state_set(self, record):
-        super(Image, self).state_set(record)
+        super().state_set(record)
         if not record:
             return
         name = self.attrs['name']
@@ -72,6 +72,8 @@ class Image(StateMixin, Gtk.Image):
         if self.attrs.get('type') == 'url':
             pixbuf = common.IconFactory.get_pixbuf_url(
                 name, size=size, size_param=self.attrs.get('url_size'))
+        elif self.attrs.get('type') == 'color':
+            pixbuf = common.SolidColorFactory.get_pixbuf(name, size, size)
         else:
             pixbuf = common.IconFactory.get_pixbuf(name, size)
         self.set_from_pixbuf(pixbuf)
@@ -82,7 +84,7 @@ class Frame(StateMixin, Gtk.Frame):
     def __init__(self, label=None, attrs=None):
         if not label:  # label must be None to have no label widget
             label = None
-        super(Frame, self).__init__(label=label, attrs=attrs)
+        super().__init__(label=label, attrs=attrs)
         if not label:
             self.set_shadow_type(Gtk.ShadowType.NONE)
         self.set_border_width(0)
@@ -93,7 +95,7 @@ class ScrolledWindow(StateMixin, Gtk.ScrolledWindow):
     def state_set(self, record):
         # Force to show first to ensure it is displayed in the Notebook
         self.show()
-        super(ScrolledWindow, self).state_set(record)
+        super().state_set(record)
 
 
 class Notebook(StateMixin, Gtk.Notebook):
@@ -105,7 +107,7 @@ class Expander(StateMixin, Gtk.Expander):
     def __init__(self, label=None, attrs=None):
         if not label:
             label = None
-        super(Expander, self).__init__(label=label, attrs=attrs)
+        super().__init__(label=label, attrs=attrs)
 
 
 class Link(StateMixin, Gtk.Button):

tryton/gui/window/view_form/view/form_gtk/textbox.py

@@ -20,7 +20,7 @@ class TextBox(Widget, TranslateMixin):
     expand = True
 
     def __init__(self, view, attrs):
-        super(TextBox, self).__init__(view, attrs)
+        super().__init__(view, attrs)
 
         self.widget = Gtk.VBox()
         self.scrolledwindow = Gtk.ScrolledWindow()
@@ -92,7 +92,7 @@ class TextBox(Widget, TranslateMixin):
         textview.props.sensitive = not value
 
     def _readonly_set(self, value):
-        super(TextBox, self)._readonly_set(value)
+        super()._readonly_set(value)
         self.textview.set_editable(not value)
 
     @property
@@ -120,7 +120,7 @@ class TextBox(Widget, TranslateMixin):
         return buf.get_text(iter_start, iter_end, False)
 
     def display(self):
-        super(TextBox, self).display()
+        super().display()
         value = self.field and self.field.get(self.record)
         if not value:
             value = ''
@@ -153,7 +153,7 @@ class TextBufferLimitSize(Gtk.TextBuffer):
         }
 
     def __init__(self, max_length):
-        super(TextBufferLimitSize, self).__init__()
+        super().__init__()
         self.max_length = max_length
 
     def do_insert_text(self, iter, text, length):

tryton/gui/window/view_form/view/form_gtk/timedelta.py

@@ -10,7 +10,7 @@ from .widget import Widget
 class TimeDelta(Widget):
 
     def __init__(self, view, attrs):
-        super(TimeDelta, self).__init__(view, attrs)
+        super().__init__(view, attrs)
 
         self.widget = Gtk.HBox()
         self.entry = self.mnemonic_widget = Gtk.Entry()
@@ -37,7 +37,7 @@ class TimeDelta(Widget):
         return self.entry.get_text()
 
     def display(self):
-        super(TimeDelta, self).display()
+        super().display()
         if not self.field:
             value = ''
         else:
@@ -46,5 +46,5 @@ class TimeDelta(Widget):
         reset_position(self.entry)
 
     def _readonly_set(self, value):
-        super(TimeDelta, self)._readonly_set(value)
+        super()._readonly_set(value)
         self.entry.set_editable(not value)

tryton/gui/window/view_form/view/form_gtk/url.py

@@ -22,7 +22,7 @@ class URL(Char):
     "url"
 
     def __init__(self, view, attrs):
-        super(URL, self).__init__(view, attrs)
+        super().__init__(view, attrs)
 
         self.tooltips = common.Tooltips()
         self.button = Gtk.Button()
@@ -34,7 +34,7 @@ class URL(Char):
             self.button, expand=False, fill=False, padding=0)
 
     def display(self):
-        super(URL, self).display()
+        super().display()
         self.set_tooltips()
         if self.record and 'icon' in self.attrs:
             icon = self.attrs['icon']

tryton/gui/window/view_form/view/form_gtk/widget.py

@@ -19,7 +19,7 @@ class Widget(object):
     default_width_chars = 8
 
     def __init__(self, view, attrs):
-        super(Widget, self).__init__()
+        super().__init__()
         self.view = view
         self.attrs = attrs
         self.widget = None

tryton/gui/window/view_form/view/graph_gtk/bar.py

@@ -17,7 +17,7 @@ from .graph import Graph
 class Bar(Graph):
 
     def __init__(self, *args, **kwargs):
-        super(Bar, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.bars = []
 
     def drawGraph(self, cr, width, height):
@@ -63,7 +63,7 @@ class Bar(Graph):
         return linear
 
     def motion(self, widget, event):
-        super(Bar, self).motion(widget, event)
+        super().motion(widget, event)
 
         if not getattr(self, 'area', None):
             return
@@ -127,7 +127,7 @@ class Bar(Graph):
                     maxx - minx + 2, maxy - miny + 2)
 
     def action(self):
-        super(Bar, self).action()
+        super().action()
         for bar in self.bars:
             if bar.highlight:
                 ids = self.ids[bar.xname]
@@ -171,11 +171,11 @@ class VerticalBar(Bar):
             i += 1
 
     def XLabels(self):
-        xlabels = super(VerticalBar, self).XLabels()
+        xlabels = super().XLabels()
         return [(x[0] + (self.xscale / 2), x[1]) for x in xlabels]
 
     def YLabels(self):
-        ylabels = super(VerticalBar, self).YLabels()
+        ylabels = super().YLabels()
         if all('timedelta' in f for f in self.yfields):
             converter = {f.get('timedelta') for f in self.yfields}
             if len(converter) == 1:
@@ -227,11 +227,11 @@ class HorizontalBar(Bar):
             i += 1
 
     def YLabels(self):
-        xlabels = super(HorizontalBar, self).XLabels()
+        xlabels = super().XLabels()
         return [(1 - (x[0] + (self.xscale / 2)), x[1]) for x in xlabels]
 
     def XLabels(self):
-        ylabels = super(HorizontalBar, self).YLabels()
+        ylabels = super().YLabels()
         if all('timedelta' in f for f in self.yfields):
             converter = {f.get('timedelta') for f in self.yfields}
             if len(converter) == 1:

tryton/gui/window/view_form/view/graph_gtk/graph.py

@@ -75,7 +75,7 @@ class Graph(Gtk.DrawingArea):
     __gsignals__ = {"draw": "override"}
 
     def __init__(self, view, xfield, yfields):
-        super(Graph, self).__init__()
+        super().__init__()
         self.view = view
         self.xfield = xfield
         self.yfields = yfields
@@ -99,7 +99,7 @@ class Graph(Gtk.DrawingArea):
 
     def destroy(self):
         self.popup.destroy()
-        super(Graph, self).destroy()
+        super().destroy()
 
     def motion(self, widget, event):
         self.popup.set_position(self, event.x, event.y)

tryton/gui/window/view_form/view/graph_gtk/line.py

@@ -145,7 +145,7 @@ class Line(Graph):
         cr.restore()
 
     def drawLegend(self, cr, widht, height):
-        super(Line, self).drawLegend(cr, widht, height)
+        super().drawLegend(cr, widht, height)
         cr.save()
         for point in self.points:
             if point.highlight:
@@ -237,7 +237,7 @@ class Line(Graph):
                     int(maxx - minx + 1), int(maxy - miny + 1))
 
     def updateXY(self):
-        super(Line, self).updateXY()
+        super().updateXY()
         if self.xrange != 0:
             self.xrange -= 1
             if self.xrange == 0:
@@ -246,18 +246,18 @@ class Line(Graph):
                 self.xscale = 1.0 / self.xrange
 
     def drawAxis(self, cr, width, height):
-        super(Line, self).drawAxis(cr, width, height)
+        super().drawAxis(cr, width, height)
         self.drawLine(cr, 1.0, 0)
 
     def action(self):
-        super(Line, self).action()
+        super().action()
         for point in self.points:
             if point.highlight:
                 ids = self.ids[point.xname]
                 self.action_keyword(ids)
 
     def YLabels(self):
-        ylabels = super(Line, self).YLabels()
+        ylabels = super().YLabels()
         if all('timedelta' in f for f in self.yfields):
             converter = {f.get('timedelta') for f in self.yfields}
             if len(converter) == 1:

tryton/gui/window/view_form/view/graph_gtk/pie.py

@@ -110,7 +110,7 @@ class Pie(Graph):
         cr.restore()
 
     def motion(self, widget, event):
-        super(Pie, self).motion(widget, event)
+        super().motion(widget, event)
 
         if not getattr(self, 'area', None):
             return
@@ -172,7 +172,7 @@ class Pie(Graph):
                     self.queue_draw()
 
     def action(self):
-        super(Pie, self).action()
+        super().action()
         for slice in self.slices:
             if slice.highlight:
                 ids = self.ids[slice.xname]

tryton/gui/window/view_form/view/list.py

@@ -8,13 +8,14 @@ import sys
 from collections import defaultdict
 from functools import wraps
 from io import StringIO
+from weakref import WeakValueDictionary
 
 from gi.repository import Gdk, GLib, GObject, Gtk
 
 import tryton.common as common
 from tryton.common import (
-    RPCException, RPCExecute, Tooltips, domain_inversion, node_attributes,
-    simplify, unique_value)
+    RPCException, RPCExecute, Tooltips, domain_inversion, get_monitor_size,
+    node_attributes, simplify, unique_value)
 from tryton.common.cellrendererbutton import CellRendererButton
 from tryton.common.popup_menu import populate, popup
 from tryton.config import CONFIG
@@ -23,7 +24,6 @@ from tryton.pyson import PYSONDecoder
 
 from . import View, XMLViewParser
 from .list_gtk.editabletree import EditableTreeView, TreeView
-from .list_gtk.generictreemodel import GenericTreeModel
 from .list_gtk.widget import (
     M2M, M2O, O2M, O2O, URL, Affix, Binary, Boolean, Button, Char, Date, Dict,
     Float, Image, Int, MultiSelection, ProgressBar, Reference, Selection, Text,
@@ -63,15 +63,30 @@ def path_convert_id2pos(model, id_path):
     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
@@ -103,7 +118,6 @@ class AdaptModelGroup(GenericTreeModel):
     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)
@@ -172,43 +186,51 @@ class AdaptModelGroup(GenericTreeModel):
     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)
@@ -219,40 +241,49 @@ class AdaptModelGroup(GenericTreeModel):
             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):
@@ -407,19 +438,23 @@ class TreeXMLViewParser(XMLViewParser):
             'binary': 200,
             }
 
+        field_attrs = self.field_attrs.get(attributes['name'], {})
+        if field_attrs:
+            computed_width = default_width.get(field_attrs['type'], 100)
+            if attributes.get('symbol'):
+                computed_width += 20
+        else:
+            computed_width = 80
+
         screen = self.view.screen
         width = screen.tree_column_width[screen.model_name].get(column.name)
-        field_attrs = self.field_attrs.get(attributes['name'], {})
         if not width:
             if 'width' in attributes:
-                width = int(attributes['width'])
-            elif field_attrs:
-                width = default_width.get(field_attrs['type'], 100)
-                if attributes.get('symbol'):
-                    width += 20
+                computed_width = width = int(attributes['width'])
             else:
-                width = 80
+                width = computed_width
         column.width = width
+        column.computed_width = computed_width
         if width > 0:
             column.set_fixed_width(width)
         column.set_min_width(1)
@@ -537,6 +572,11 @@ class ViewTree(View):
             menuitem.set_active(visible)
             menuitem.connect('toggled', toggle, columns)
             menu.add(menuitem)
+        if self.optionals:
+            menu.add(Gtk.SeparatorMenuItem())
+        menuitem = Gtk.MenuItem(label=_("Reset Column Widths"))
+        menuitem.connect('activate', self.reset_width)
+        menu.add(menuitem)
         popup(menu, widget)
 
     def save_optional(self):
@@ -551,6 +591,20 @@ class ViewTree(View):
             pass
         self.screen.tree_column_optional[self.view_id] = fields
 
+    def reset_width(self, menuitem):
+        try:
+            screen_width, _ = get_monitor_size()
+            RPCExecute(
+                'model', 'ir.ui.view_tree_width', 'reset_width',
+                self.screen.model_name, screen_width)
+        except RPCException:
+            pass
+        self.screen.tree_column_width.pop(self.screen.model_name, None)
+
+        for col in self.treeview.get_columns():
+            if col.name:
+                col.set_fixed_width(col.computed_width)
+
     def get_column_widget(self, column):
         'Return the widget of the column'
         idx = [c for c in self.treeview.get_columns()
@@ -1048,11 +1102,12 @@ class ViewTree(View):
         if last_col and last_col.name in fields:
             del fields[last_col.name]
 
+        screen_width, _ = get_monitor_size()
         if fields and any(fields.values()):
             model_name = self.screen.model_name
             try:
                 RPCExecute('model', 'ir.ui.view_tree_width', 'set_width',
-                    model_name, fields)
+                    model_name, fields, screen_width)
             except RPCException:
                 pass
             self.screen.tree_column_width[model_name].update(fields)
@@ -1149,7 +1204,7 @@ class ViewTree(View):
         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

tryton/gui/window/view_form/view/list_gtk/editabletree.py

@@ -29,7 +29,7 @@ class TreeView(Gtk.TreeView):
     display_counter = 0
 
     def __init__(self, view):
-        super(TreeView, self).__init__()
+        super().__init__()
         self.view = view
 
     def next_column(
@@ -153,7 +153,7 @@ class EditableTreeView(TreeView):
         if cell:
             self.set_cursor_on_cell(path, focus_column, cell, start_editing)
         else:
-            super(EditableTreeView, self).set_cursor(
+            super().set_cursor(
                 path, focus_column, start_editing)
 
     def set_value(self):