Merge lp:~openerp-commiter/openobject-client/client-image-widget into lp:openobject-client

[Nicolas DS]

* Add image widget for Tree.image (and so for Form.M2M too), Tree.M2O_image, Form.M2O_image
* Add more image format support.

Pictures of those new widgets in action:
* http://zyphos.be/openobject/img_widget_tree.jpg (Tree.image)
* http://zyphos.be/openobject/M2O_img_widget_tree.jpg (Tree.many2one_image)
* http://zyphos.be/openobject/M2O_img_widget_form.jpg (Form.many2one_image)

See branch description for more details.

[Christophe Simonis (OpenERP) (kangol)]

I don't get it. I don't see why you need to define a new widget ? Is keeping widget="image" not enough, and just handle the case where this is display in tree view? Beeing displayed into a x2many [1] is not a special case.

[1] this is a one2many, not a many2one. And only for this error, the merge is in "Needs Fixing"

review: Needs Fixing

[Nicolas DS (zyphos)]

In GTK client all widget are separated by view. And the "Tree.image" does NOT exist for now in GTK client.

This branch is keeping widget="image" for image in Tree view, Form view and many2many in Form view (of course it is a tree view embedded in a screen view that acts as a form widget.).

In GTK client, "Tree view" widget are a lot different from "Form" one indeed:
- You need to define a new kind of cell renderer for special content. (It's not as easy as Form view)
- GTK treeview widget is asking a LOT of time to refresh row and column. (2 times to show the widget and then each time the mouse pointer get over, get out of any cell.)

In any refresh with the standard widget you need to: get the image data, compute the pixbuf (GTK image), then rescale the pixbuf to fit into screen. Those operations are very CPU/bandwidth intensive, that's why those widget need to be cached (for 120sec defined in bin/widget/view/common_gtk.py @line 137).

The problem with caching is the fact that if the image change in DB, the client will see the change maximum 120 sec further, and not in real time. Real time is still working for the basic "Form.image" widget.

At first I tried to use the widget="image" for many2one, but it's impossible in widget definition in openobject to know where type of field data come from.
Indeed widget python code is called from:
client/bin/widget/view/form_gtk/parser.py @line 416
widget_act = widgets_type[type][0](self.window, self.parent, model, fields[name])

and "type" is not alway the original field type, indeed:
@line 401
type = attrs.get('widget', fields[name]['type'])

and the many2one image widget needs to search for a binary field to get the data from.

I don't understand your one2many thing, I didn't made any one2many widget, if you look into source you will see that many2one_image is inheriting from the many2one class. So even if the many2one original class is a one2many I am lost.

The only fixing I see could be a different caching time or avoiding this caching time. But the best solution would be to create some kind of "push on field content change" from server to the client. But this feature needs a persistent connection to the server.
http://en.wikipedia.org/wiki/Push_technology

Or another one is to store hash of binary fields to quickly see if the image content has changed without eating lot of resource (CPU/bandwidth).

Don't forget to have a look at branch description for more information how this branch is working:
https://code.launchpad.net/~openerp-commiter/openobject-client/client-image-widget

Thank you for your review.

[Christophe Simonis (OpenERP) (kangol)]

After seeing you example module, I see what you try to do with the many2one_image.
You are doing it wrong. You have to create a related field on your object and use it with widget="image"

I modify your code (untested):
http://sprunge.us/MhFQ?python
http://sprunge.us/EfKA?xml

review: Needs Fixing

[Nicolas DS (zyphos)]

You are right for the Tree.many2one_image widget !
I must admit that I never used field.related before ;)
It acts like the one I created.

But for the Form.many2one_image the purpose isn't the same.

The Form.many2one_image represent a M2O object, so you can change the M2O relation directly, with your solution you will directly change the showed image itself and not the M2O relation.

[lp:~openerp-commiter/openobject-client/client-image-widget]

1214. By Nicolas DS on 2010-07-08

[MERGE] from official trunk GTK client

1215. By Nicolas DS on 2010-07-08

[IMP] get_pixbuf and get_thumbnail support multi id query

1216. By Nicolas DS on 2010-07-08

[FIX] image-widget: Typos + Making code more robust

1217. By Nicolas DS on 2010-10-06

[REF] Form.M2O_image widget

1218. By Nicolas DS on 2010-10-06

[IMP] Added clear button for the form.M2O_image widget

1219. By Nicolas DS on 2010-10-06

[IMP] form.M2O_image code clean up

Unmerged revisions

1219. By Nicolas DS on 2010-10-06

[IMP] form.M2O_image code clean up

1218. By Nicolas DS on 2010-10-06

[IMP] Added clear button for the form.M2O_image widget

1217. By Nicolas DS on 2010-10-06

[REF] Form.M2O_image widget

1216. By Nicolas DS on 2010-07-08

[FIX] image-widget: Typos + Making code more robust

1215. By Nicolas DS on 2010-07-08

[IMP] get_pixbuf and get_thumbnail support multi id query

1214. By Nicolas DS on 2010-07-08

[MERGE] from official trunk GTK client

1213. By Nicolas DS on 2010-04-13

[FIX] Bug due to model field change

1212. By Nicolas DS on 2010-04-13

[FIX] M2O image find and get

1211. By Nicolas DS on 2010-04-13

[FIX] Case when M2O relation is empty

1210. By Nicolas DS on 2010-04-13

[MERGE] From trunk

=== modified file 'bin/widget/model/field.py'
--- bin/widget/model/field.py	2010-10-05 07:05:05 +0000
+++ bin/widget/model/field.py	2010-10-06 13:46:15 +0000
@@ -496,6 +496,7 @@
     'integer' : IntegerField,
     'float' : FloatField,
     'many2one' : M2OField,
+    'many2one_image' : M2OField,
     'many2many' : M2MField,
     'one2many' : O2MField,
     'reference' : ReferenceField,

=== added file 'bin/widget/view/common_gtk.py'
--- bin/widget/view/common_gtk.py	1970-01-01 00:00:00 +0000
+++ bin/widget/view/common_gtk.py	2010-10-06 13:46:15 +0000
@@ -0,0 +1,193 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.     
+#
+##############################################################################
+
+import collections
+import base64
+import time
+import gtk
+import rpc
+import common
+
+NOIMAGE = file(common.terp_path_pixmaps("noimage.png"), 'rb').read()
+
+def make_pixbuf(data):
+    ''' Generate a pixbuf (gnome image) from a image file data
+     Warning this processing is slow and should be cached'''
+    if not data:
+        data = NOIMAGE
+    else:
+        data = base64.decodestring(data)
+    pixbuf = None
+    loader = gtk.gdk.PixbufLoader()
+    try:
+        loader.write(data, len(data))
+        pixbuf = loader.get_pixbuf()
+    except:
+        pass
+    if not pixbuf:
+        loader.close()
+        loader = gtk.gdk.PixbufLoader('png')
+        loader.write(NOIMAGE, len(NOIMAGE))
+        pixbuf = loader.get_pixbuf()
+
+    loader.close()
+    return pixbuf
+
+def thumbnail_pixbuf(pixbuf, to_width, to_height):
+    ''' Make a thumbnail of the image according to dimensions provided  
+     Warning this processing is slow and should be cached'''
+    img_height = pixbuf.get_height()
+    if img_height > to_height:
+        height = to_height
+    else:
+        height = img_height
+
+    img_width = pixbuf.get_width()
+    if img_width > to_width:
+        width = to_width
+    else:
+        width = img_width
+
+    if (img_width / width) < (img_height / height):
+        width = float(img_width) / float(img_height) * float(height)
+    else:
+        height = float(img_height) / float(img_width) * float(width)
+
+    return pixbuf.scale_simple(int(width), int(height), gtk.gdk.INTERP_BILINEAR)
+
+class CacheDict(collections.MutableMapping):
+    ''' Act like a dict but with timeout
+        @param timeout: timeout in seconds 
+    '''
+    def __init__(self, timeout=30):
+        self.cache = {}
+        self.timeout = int(timeout)
+        self.last_check = time.time()
+
+    def __setitem__(self, key, value):
+        if not self.timeout:
+            return
+        self.check_timeout()
+        self.cache[key] = (value, time.time())
+
+    def __getitem__(self, key):
+        if key not in self.cache:
+            raise KeyError
+        return self.cache[key][0]
+
+    def __delitem__(self, key):
+        if key not in self.cache:
+            raise KeyError
+        del self.cache[key]
+
+    def keys(self):
+        return self.cache.keys()
+
+    def __iter__(self):
+        for key in self.cache:
+            yield key
+
+    def __len__(self):
+        return len(self.cache)
+
+    def check_timeout(self):
+        ''' Remove expired cache '''
+        now = time.time()
+        if  now < self.last_check + self.timeout / 10:
+            return
+        ct = now - self.timeout # Critical time
+        key2del = [k for k in self.cache if self.cache[k][1] < ct]
+        for key in key2del:
+            self.cache.pop(key)
+
+CACHE_TIME_OUT = 120 # In second
+pixbuf_cache = CacheDict(CACHE_TIME_OUT)
+
+
+def get_pixbuf(model, field, ids):
+    ''' Retrieve the data and convert to pixbuf if possible
+    @param model: The model that the image come from. (Ie: res.images)
+    @param field: The column of the model. (Ie: img)
+    @param ids: Id of records row in database (int or list of int)
+    @return pixbuf or dict of pixbuf 
+    '''
+    result = {}
+    is_int = isinstance(ids, int)
+    if is_int:
+        ids = [ids]
+    cache_ids = dict([(id, "%s[%s][%d]" % (model, field, id)) for id in ids])
+    ids2query = []
+    for id in ids:
+        if cache_ids[id] in pixbuf_cache:
+            result[id] = pixbuf_cache[cache_ids[id]]
+        else:
+            ids2query.append(id)
+
+    if ids2query:
+        datas = rpc.session.rpc_exec_auth('/object', 'execute', model, 'read',
+                                           ids2query, ['id', field])
+        for res in datas:
+            id = res['id']
+            pixbuf = make_pixbuf(res[field])
+            pixbuf_cache[cache_ids[id]] = pixbuf
+            result[id] = pixbuf
+
+    # Complete result table
+    for id in ids:
+        if id not in result:
+            result[id] = None
+
+    if is_int:
+        return result[0]
+    return result
+
+def get_thumbnail(model, field, ids, to_width, to_height):
+    ''' Resize Image to fit width, height cache result to be used later.
+    @param model: The model that the image come from. (Ie: res.images)
+    @param field: The column of the resource. (Ie: img)
+    @param ids: Id of records row in database. (int or list of int)
+    @param to_width: Maximum width in pixel.
+    @param to_height: Maximum height in pixel.
+    @return pixbuf or dict of pixbuf
+    '''
+    if not ids:
+        return None
+    result = {}
+    is_int = isinstance(ids, int)
+    if is_int:
+        ids = [ids]
+
+    ids2query = []
+    cache_ids = dict([(id, "%s[%s][%d]-%dx%d" % (model, field, id, to_width, to_height)) for id in ids])
+    for id in ids:
+        if cache_ids[id] in pixbuf_cache:
+            result[id] = pixbuf_cache[cache_ids[id]]
+        else:
+            ids2query.append(id)
+    if ids2query:
+        pixbufs = get_pixbuf(model, field, ids2query)
+        for id, pixbuf in pixbufs.iteritems():
+            thumbnail = thumbnail_pixbuf(pixbuf, to_width, to_height)
+            pixbuf_cache[cache_ids[id]] = thumbnail
+            result[id] = thumbnail
+    if is_int:
+        return result[ids[0]]
+    return result

=== modified file 'bin/widget/view/form_gtk/image.py'
--- bin/widget/view/form_gtk/image.py	2010-09-08 06:30:55 +0000
+++ bin/widget/view/form_gtk/image.py	2010-10-06 13:46:15 +0000
@@ -31,9 +31,13 @@
 import interface
 import tempfile
 import urllib
+<<<<<<< TREE
 
 NOIMAGE = file(common.terp_path_pixmaps("noimage.png"), 'rb').read()
 REQUIRED_IMG = file(common.terp_path_pixmaps("image_required.png"), 'rb').read()
+=======
+from widget.view import common_gtk
+>>>>>>> MERGE-SOURCE
 
 
 class image_wid(interface.widget_interface):
@@ -106,9 +110,16 @@
 
         filter_image = gtk.FileFilter()
         filter_image.set_name(_('Images'))
-        for mime in ("image/png", "image/jpeg", "image/gif"):
+        supported_mime = ('image/bmp', 'image/gif', 'image/jpeg', 'image/tiff', 
+                         'image/x-cmu-raster', 'image/x-icon', 
+                         'image/x-portable-anymap', 'image/x-xbitmap', 
+                         'image/x-xpixmap', 'image/png')
+        supported_pat = ('*.ani', '*.bmp', '*.gif', '*.ico', '*.jpe', '*.jpeg', 
+                         '*.jpg', '*.pcx', '*.png', '*.pnm', '*.ras', '*.tga', 
+                         '*.tif', '*.tiff', '*.xbm', '*.xpm')
+        for mime in supported_mime:
             filter_image.add_mime_type(mime)
-        for pat in ("*.png", "*.jpg", "*.gif", "*.tif", "*.xpm"):
+        for pat in supported_pat:
             filter_image.add_pattern(pat)
 
         filename = common.file_selection(_('Open...'), parent=self._window, preview=True,
@@ -164,6 +175,7 @@
                 self.update_img()
 
     def update_img(self):
+<<<<<<< TREE
         if not self._value:
             if self._set_required_img:
                 data = REQUIRED_IMG
@@ -207,6 +219,10 @@
             height = float(img_height) / float(img_width) * float(width)
 
         scaled = pixbuf.scale_simple(int(width), int(height), gtk.gdk.INTERP_BILINEAR)
+=======
+        pixbuf = common_gtk.make_pixbuf(self._value)
+        scaled = common_gtk.thumbnail_pixbuf(pixbuf, self.width, self.height)
+>>>>>>> MERGE-SOURCE
         self.image.set_from_pixbuf(scaled)
 
     def display(self, model, model_field):

=== added file 'bin/widget/view/form_gtk/many2one_image.py'
--- bin/widget/view/form_gtk/many2one_image.py	1970-01-01 00:00:00 +0000
+++ bin/widget/view/form_gtk/many2one_image.py	2010-10-06 13:46:15 +0000
@@ -0,0 +1,202 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+import gobject
+import gtk
+
+import interface
+import common
+
+import widget
+from widget.screen import Screen
+
+from modules.gui.window.win_search import win_search
+import rpc
+
+import service
+
+import many2one
+from widget.view import common_gtk
+
+class many2one_image(many2one.many2one):
+    ''' Binary many2one image form widget
+    Ie:
+    <field name="img_id" widget="many2one_image" fieldname="img"/>
+    
+    img_field (optional): field of the many2one relation to show in widget
+                          Otherwise it will take the first binary field.
+    '''
+    def __init__(self, window, parent, model, attrs={}):
+        interface.widget_interface.__init__(self, window, parent, model, attrs)
+
+        self.widget = gtk.VBox(spacing=3)
+
+        self.image = gtk.Image()
+        self.height = int(attrs.get('img_height', 100))
+        self.width = int(attrs.get('img_width', 300))
+        self.model_field = False
+
+        self.widget.pack_start(self.image, expand=True, fill=True)
+
+        alignment = gtk.Alignment(xalign=0.5, yalign=0.5)
+        hbox = gtk.HBox()
+
+        self.but_open = many2one.Button('gtk-open', self.sig_edit,
+                                        _('Open this resource'))
+        hbox.pack_start(self.but_open, padding=2, expand=False, fill=False)
+
+        self.but_find = many2one.Button('gtk-find', self.sig_find,
+                                        _('Search a resource'))
+        hbox.pack_start(self.but_find, padding=2, expand=False, fill=False)
+
+        self.but_remove = many2one.Button('gtk-clear', self.sig_remove,
+                                          _('Clear'))
+        hbox.pack_start(self.but_remove, padding=2, expand=False, fill=False)
+
+        alignment.add(hbox)
+        self.widget.pack_start(alignment, expand=False, fill=False)
+
+        self.value_on_field = ''
+        self.ok = True
+        self._readonly = False
+        self.model_type = attrs['relation']
+        self._menu_loaded = False
+        self._menu_entries.append((None, None, None))
+        self._menu_entries.append((_('Action'), lambda x: self.click_and_action('client_action_multi'), 0))
+        self._menu_entries.append((_('Report'), lambda x: self.click_and_action('client_print_multi'), 0))
+
+    def _readonly_set(self, value):
+        self._readonly = value
+        #self.but_new.set_sensitive(not value)
+
+    def _color_widget(self):
+        return self.image
+
+    def sig_find(self, widget, event=None, leave=True):
+        self.ok = False
+        if not self._readonly:
+            domain = self.model_field.domain_get(self._view.model)
+            context = self.model_field.context_get(self._view.model)
+            #self.wid_text.grab_focus()
+            name_search = ''
+            relation = self.attrs['relation']
+            ids = rpc.session.rpc_exec_auth('/object', 'execute', relation,
+                                            'name_search', name_search, domain,
+                                            'ilike', context)
+            if (len(ids) == 1) and leave:
+                self.model_field.set_client(self._view.model, ids[0],
+                        force_change=True)
+                self.display(self._view.model, self.model_field)
+                self.ok = True
+                return True
+
+            win = win_search(self.attrs['relation'], sel_multi=False,
+                             ids=map(lambda x: x[0], ids), context=context,
+                             domain=domain, parent=self._window)
+            ids = win.go()
+            if ids:
+                name = rpc.session.rpc_exec_auth('/object', 'execute', relation,
+                                                 'name_get', [ids[0]],
+                                                 rpc.session.context)[0]
+                self.model_field.set_client(self._view.model, name,
+                        force_change=True)
+        self.display(self._view.model, self.model_field)
+        self.ok = True
+
+    def sig_edit(self, widget, event=None, leave=False):
+        self.ok = False
+        if not leave:
+            domain = self.model_field.domain_get(self._view.model)
+            context = self.model_field.context_get(self._view.model)
+            m2o_value = self.model_field.get(self._view.model, False)
+            relation_record_id = self.model_field.get(self._view.model)
+            dia = many2one.dialog(self.attrs['relation'],
+                                  relation_record_id,
+                                  attrs=self.attrs, window=self._window,
+                                  domain=domain, context=context)
+            ok, value = dia.run()
+            if ok:
+                self.model_field.set_client(self._view.model, value,
+                        force_change=True)
+            dia.destroy()
+        self.display(self._view.model, self.model_field)
+        self.ok = True
+
+    def sig_new(self, *args):
+        domain = self.model_field.domain_get(self._view.model)
+        context = self.model_field.context_get(self._view.model)
+        dia = many2one.dialog(self.attrs['relation'], attrs=self.attrs,
+                              window=self._window, domain=domain,
+                              context=context)
+        ok, value = dia.run()
+        if ok:
+            self.model_field.set_client(self._view.model, value)
+            self.display(self._view.model, self.model_field)
+        dia.destroy()
+
+    def sig_remove(self, widget=None):
+        self.model_field.set_client(self._view.model, False)
+        self.display(self._view.model, False)
+
+    def sig_key_press(self, widget, event, *args):
+        if event.keyval == gtk.keysyms.F1:
+            self.sig_new(widget, event)
+        elif event.keyval == gtk.keysyms.F2:
+            self.sig_activate(widget, event)
+        elif event.keyval == gtk.keysyms.F3:
+            self.sig_edit(widget, event)
+        elif event.keyval == gtk.keysyms.Tab:
+            self.sig_activate(widget, event, leave=True)
+            return True
+        return False
+
+    def display(self, model, model_field):
+        if not model_field:
+            self.ok = False
+            return False
+        self.model_field = model_field
+        interface.widget_interface.display(self, model, model_field)
+        self.ok = False
+        # retrieve image data
+        m2o_value = model.value.get(model_field.name, False)
+        relation_record_id = m2o_value and m2o_value[0]
+        relation = model_field.attrs['relation']
+        img_field_name = model_field.attrs.get('fieldname', False)
+        if not img_field_name:
+            # if not img_field is set get the first binary field
+            fields = rpc.session.rpc_exec_auth('/object', 'execute', relation,
+                                               'fields_get')
+            for field_name in fields:
+                if fields[field_name]['type'] == 'binary':
+                    img_field_name = field_name
+                    break
+
+        if not img_field_name:
+            return
+
+        thumbnail = common_gtk.get_thumbnail(relation, img_field_name,
+                                             relation_record_id, self.width,
+                                             self.height)
+        self.image.set_from_pixbuf(thumbnail)
+        self.ok = True
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== modified file 'bin/widget/view/form_gtk/parser.py'
--- bin/widget/view/form_gtk/parser.py	2010-09-23 09:18:56 +0000
+++ bin/widget/view/form_gtk/parser.py	2010-10-06 13:46:15 +0000
@@ -462,11 +462,9 @@
                     continue
 
                 fields[name]['name'] = name
-                if 'saves' in attrs:
-                    fields[name]['saves'] = attrs['saves']
-
-                if 'filename' in attrs:
-                    fields[name]['filename'] = attrs['filename']
+                for attr in ['saves', 'filename', 'fieldname']:
+                    if attr in attrs:
+                        fields[name][attr] = attrs[attr]
 
                 if fields[name]['type'] == 'many2one' and 'search_mode' in attrs:
                     fields[name]['search_mode'] = attrs['search_mode']
@@ -907,6 +905,7 @@
 #import one2many
 import many2many
 import many2one
+import many2one_image
 import selection
 import one2many_list
 import picture
@@ -937,6 +936,7 @@
     'one2many_list': (one2many_list.one2many_list, 1, True, True),
     'many2many': (many2many.many2many, 1, True, True),
     'many2one': (many2one.many2one, 1, False, False),
+    'many2one_image': (many2one_image.many2one_image, 1, False, False),
     'email' : (url.email, 1, False, False),
     'url' : (url.url, 1, False, False),
     'callto' : (url.callto, 1, False, False),

=== added file 'bin/widget/view/tree_gtk/image.py'
--- bin/widget/view/tree_gtk/image.py	1970-01-01 00:00:00 +0000
+++ bin/widget/view/tree_gtk/image.py	2010-10-06 13:46:15 +0000
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+
+import gtk
+
+import service
+import common
+from widget.view import common_gtk
+
+class Image(object):
+    def __init__(self, field_name, treeview=None, attrs=None, window=None):
+        self.field_name = field_name
+        self.attrs = attrs or {}
+        self.renderer = gtk.CellRendererPixbuf()
+        self.editable = attrs.get('editable',False)
+        self.height = int(attrs.get('img_height', 33))
+        self.width = int(attrs.get('img_width', 100))
+        self.treeview = treeview
+        if not window:
+            window = service.LocalService('gui.main').window
+        self.window = window
+        self.pixbuf_cache = {} # warning caching consequence is memory eated.
+    
+    def setter(self, column, cell, store, iter):
+        model_record = store.get_value(iter, 0)
+        resource = model_record.resource
+        resource_id = model_record.id
+        field_name = column.name
+        thumbnail = common_gtk.get_thumbnail(resource, field_name, 
+                                             resource_id, self.width, 
+                                             self.height)
+        
+        cell.set_property('pixbuf', thumbnail)
+
+    def open_remote(self, model, create, changed=False, text=None):
+        raise NotImplementedError
+    
+    def _get_data(self, model_record):
+        return model_record[self.field_name].get_client(model_record)
+
+    def get_textual_value(self, model):
+        return ''
+
+    def value_from_text(self, model, text):
+        return text
\ No newline at end of file

=== added file 'bin/widget/view/tree_gtk/many2one_image.py'
--- bin/widget/view/tree_gtk/many2one_image.py	1970-01-01 00:00:00 +0000
+++ bin/widget/view/tree_gtk/many2one_image.py	2010-10-06 13:46:15 +0000
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+
+import gtk
+
+import service
+import common
+from widget.view import common_gtk
+import rpc
+
+class many2one_image(object):
+    ''' Binary many2one image tree widget
+    Ie:
+    <field name="img_id" widget="many2one_image" fieldname="img"/>
+    
+    fieldname (optional): field of the many2one relation to show in widget
+                          Otherwise it will take the first binary field.
+    '''
+    def __init__(self, field_name, treeview=None, attrs=None, window=None):
+        self.field_name = field_name
+        self.attrs = attrs or {}
+        self.renderer = gtk.CellRendererPixbuf()
+        self.editable = attrs.get('editable',False)
+        self.height = int(attrs.get('img_height', 33))
+        self.width = int(attrs.get('img_width', 100))
+        self.treeview = treeview
+        if not window:
+            window = service.LocalService('gui.main').window
+        self.window = window
+        
+        self.img_field_name = self.attrs.get('fieldname', False)
+        if not self.img_field_name:
+            # if not img_field is set get the first binary field
+            fields = rpc.session.rpc_exec_auth('/object', 'execute', self.attrs['relation'], 'fields_get')
+            for field_name in fields:
+                if fields[field_name]['type'] == 'binary':
+                    self.img_field_name = field_name
+                    break
+    
+    def setter(self, column, cell, store, iter):
+        if not self.img_field_name:
+            return
+        
+        model_record = store.get_value(iter, 0)
+        m2o_value = model_record.value[self.field_name]
+        relation_record_id = m2o_value and m2o_value[0]
+        relation = self.attrs['relation']
+        
+        thumbnail = common_gtk.get_thumbnail(relation, self.img_field_name, 
+                                             relation_record_id, self.width, 
+                                             self.height)
+
+        cell.set_property('pixbuf', thumbnail)
+
+    def open_remote(self, model, create, changed=False, text=None):
+        raise NotImplementedError
+    
+    def get_textual_value(self, model):
+        return ''
+
+    def value_from_text(self, model, text):
+        return text
\ No newline at end of file

=== modified file 'bin/widget/view/tree_gtk/parser.py'
--- bin/widget/view/tree_gtk/parser.py	2010-09-30 06:52:47 +0000
+++ bin/widget/view/tree_gtk/parser.py	2010-10-06 13:46:15 +0000
@@ -131,7 +131,7 @@
             if node.tag == 'field':
                 handler_id = False
                 fname = str(node_attrs['name'])
-                if fields[fname]['type'] in ('image', 'binary'):
+                if fields[fname]['type'] in ('binary', ):
                     continue    # not showed types
                 if fname == 'sequence':
                     treeview.sequence = True
@@ -178,6 +178,7 @@
                     'integer': (60, 170),
                     'float': (80, 300),
                     'float_time': (80,150),
+<<<<<<< TREE
                     'date': (70, False),
                     'datetime': (145, 145),
                     'selection': (90, 250),
@@ -186,6 +187,17 @@
                     'many2many': (50, False),
                     'boolean': (20, 80),
                     'progressbar':(150, 200)
+=======
+                    'date': (70,100),
+                    'datetime': (145,145),
+                    'selection': (90,250),
+                    'char': (100,False),
+                    'one2many': (50,False),
+                    'many2many': (50,False),
+                    'boolean': (20,80),
+                    'progressbar':(150,200),
+                    'image': (20, 100)
+>>>>>>> MERGE-SOURCE
                 }
 
                 if col._type not in twidth:
@@ -697,6 +709,10 @@
         return 0
 #gobject.type_register(CellRendererButton)
 
+
+import image
+import many2one_image
+
 CELLTYPES = {
     'char': Char,
     'many2one': M2O,
@@ -711,6 +727,8 @@
     'boolean': Boolean,
     'progressbar': ProgressBar,
     'button': CellRendererButton,
+    'image': image.Image,
+    'many2one_image': many2one_image.many2one_image,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: