Merge lp:~syleam/openobject-client/trunk-field-name into lp:openobject-client

Proposed by Christophe CHAUVET
Status: Merged
Merged at revision: not available
Proposed branch: lp:~syleam/openobject-client/trunk-field-name
Merge into: lp:openobject-client
Diff against target: 51 lines (+18/-8)
1 file modified
bin/widget/view/form_gtk/parser.py (+18/-8)
To merge this branch: bzr merge lp:~syleam/openobject-client/trunk-field-name
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+16485@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christophe CHAUVET (christophe-chauvet) wrote :

It may be usefull to see the name (and object) when move mouse on the field label

this work only if user is admin.

Regards,

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/widget/view/form_gtk/parser.py'
2--- bin/widget/view/form_gtk/parser.py 2009-12-03 08:52:25 +0000
3+++ bin/widget/view/form_gtk/parser.py 2009-12-22 15:29:15 +0000
4@@ -186,7 +186,7 @@
5 table.resize(y+1,self.col[-1])
6
7 def wid_add(self, widget, name=None, expand=False, ypadding=2, rowspan=1,
8- colspan=1, translate=False, fname=None, help=False, fill=False, invisible=False):
9+ colspan=1, translate=False, fname=None, help=False, fill=False, invisible=False, model=False):
10 (table, x, y) = self.cont[-1]
11 if colspan>self.col[-1]:
12 colspan=self.col[-1]
13@@ -207,13 +207,23 @@
14 eb.set_events(gtk.gdk.BUTTON_PRESS_MASK)
15 self.trans_box_label.append((eb, name, fname))
16 eb.add(label)
17- if help:
18- try:
19+ try:
20+ uid = rpc.session.uid
21+ if help and uid ==1:
22+ eb.set_tooltip_markup("""<span foreground="darkred"><b>%s</b></span>\n%s\n<span foreground="#009900"><b>%s:</b> %s [%s]</span>""" %
23+ (tools.to_xml(name), tools.to_xml(help), _('Field name'), tools.to_xml(fname), tools.to_xml(model)))
24+ label.set_markup("<sup><span foreground=\"darkgreen\">?</span></sup>"+tools.to_xml(name))
25+ eb.show()
26+ elif help and uid != 1:
27 eb.set_tooltip_markup('<span foreground=\"darkred\"><b>'+tools.to_xml(name)+'</b></span>\n'+tools.to_xml(help))
28- except:
29- pass
30- label.set_markup("<sup><span foreground=\"darkgreen\">?</span></sup>"+tools.to_xml(name))
31- eb.show()
32+ label.set_markup("<sup><span foreground=\"darkgreen\">?</span></sup>"+tools.to_xml(name))
33+ eb.show()
34+ elif not help and uid ==1:
35+ eb.set_tooltip_markup("""<span foreground="#009900"><b>%s:</b> %s [%s]</span>""" %
36+ (_('Field name'), tools.to_xml(fname), tools.to_xml(model)))
37+ except:
38+ pass
39+
40 if '_' in name:
41 label.set_text_with_mnemonic(name)
42 label.set_mnemonic_widget(widget)
43@@ -423,7 +433,7 @@
44 visval = eval(attrs['invisible'], {'context':self.screen.context})
45 if visval:
46 continue
47- container.wid_add(widget_act.widget, label, expand, translate=fields[name].get('translate',False), colspan=size, fname=name, help=hlp, fill=fill)
48+ container.wid_add(widget_act.widget, label, expand, translate=fields[name].get('translate',False), colspan=size, fname=name, help=hlp, fill=fill, model=model)
49
50 elif node.localName=='group':
51 frame = gtk.Frame(attrs.get('string', None))