openerp-dev-web team mailing list archive

["Ravi Gadhia \(OpenERP\)" <rga@xxxxxxxxxxx>]

Ravi Gadhia (OpenERP) has proposed merging lp:~openerp-dev/openobject-client/trunk-add_label-rga into lp:openobject-client.

Requested reviews:
  Naresh(OpenERP) (nch-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-add_label-rga/+merge/58458

Hello,
       Here I add field label(gtk event box) to generic interface of form view field
-- 
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-add_label-rga/+merge/58458
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client/trunk-add_label-rga.

=== modified file 'bin/widget/model/field.py'
--- bin/widget/model/field.py	2011-04-13 13:24:05 +0000
+++ bin/widget/model/field.py	2011-04-20 09:42:30 +0000
@@ -150,6 +150,8 @@
             if k == 'invisible' and widget:
                 func = ['show_all', 'hide_all'][bool(result)]
                 getattr(widget, func)()
+                if widget.label_ebox:
+                    getattr(widget.label_ebox, func)()
             elif k in ['readonly', 'required'] :
                 self.get_state_attrs(model)[k] = result
 

=== modified file 'bin/widget/view/form_gtk/binary.py'
--- bin/widget/view/form_gtk/binary.py	2010-07-16 06:36:54 +0000
+++ bin/widget/view/form_gtk/binary.py	2011-04-20 09:42:30 +0000
@@ -37,8 +37,8 @@
 
 
 class wid_binary(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
 
         self.widget = gtk.HBox(spacing=3)
         self.wid_text = gtk.Entry()

=== modified file 'bin/widget/view/form_gtk/calendar.py'
--- bin/widget/view/form_gtk/calendar.py	2011-04-04 13:12:11 +0000
+++ bin/widget/view/form_gtk/calendar.py	2011-04-20 09:42:30 +0000
@@ -40,8 +40,8 @@
 HM_FORMAT = '%H:%M:%S'
 
 class calendar(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, attrs=attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, attrs=attrs, label_ebox=label)
         self.format = user_locale_format.get_date_format()
         self.fmt_length = len((DT.now()).strftime(self.format))
         self.widget = date_widget.ComplexEntry(self.format, spacing=3)
@@ -168,8 +168,8 @@
         win.destroy()
 
 class datetime(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs=attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs=attrs, label_ebox=label)
         self.format = user_locale_format.get_datetime_format(True)
         self.fmt_length = len((DT.now()).strftime(self.format))
         self.widget = date_widget.ComplexEntry(self.format, spacing=3)
@@ -297,8 +297,8 @@
 
 
 class stime(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, parent, attrs=attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, parent, attrs=attrs, label_ebox=label)
 
         self.format = '%H:%M:%S'
         self.widget = date_widget.ComplexEntry(self.format, spacing=3)

=== modified file 'bin/widget/view/form_gtk/char.py'
--- bin/widget/view/form_gtk/char.py	2010-12-21 09:58:49 +0000
+++ bin/widget/view/form_gtk/char.py	2011-04-20 09:42:30 +0000
@@ -26,8 +26,8 @@
 import interface
 
 class char(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, attrs=attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, attrs=attrs, label_ebox=label)
 
         self.widget = gtk.Entry()
         self.widget.set_property('activates_default', True)

=== modified file 'bin/widget/view/form_gtk/checkbox.py'
--- bin/widget/view/form_gtk/checkbox.py	2010-07-16 05:41:32 +0000
+++ bin/widget/view/form_gtk/checkbox.py	2011-04-20 09:42:30 +0000
@@ -24,8 +24,8 @@
 import interface
 
 class checkbox(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
         self.widget = gtk.CheckButton()
         self.widget.connect('focus-in-event', lambda x,y: self._focus_in())
         self.widget.connect('focus-out-event', lambda x,y: self._focus_out())

=== modified file 'bin/widget/view/form_gtk/float_time.py'
--- bin/widget/view/form_gtk/float_time.py	2010-07-16 05:41:32 +0000
+++ bin/widget/view/form_gtk/float_time.py	2011-04-20 09:42:30 +0000
@@ -31,8 +31,8 @@
 from tools import datetime_util
 
 class float_time(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent=parent, attrs=attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent=parent, attrs=attrs, label_ebox=label)
 
         self.widget = gtk.Entry()
         self.widget.set_max_length(int(attrs.get('size',11)))

=== modified file 'bin/widget/view/form_gtk/image.py'
--- bin/widget/view/form_gtk/image.py	2011-01-11 13:13:18 +0000
+++ bin/widget/view/form_gtk/image.py	2011-04-20 09:42:30 +0000
@@ -38,8 +38,8 @@
 
 class image_wid(interface.widget_interface):
 
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent=parent, attrs=attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent=parent, attrs=attrs, label_ebox=label)
 
         self._value = ''
         self._set_required_img = False

=== modified file 'bin/widget/view/form_gtk/interface.py'
--- bin/widget/view/form_gtk/interface.py	2011-03-31 09:26:25 +0000
+++ bin/widget/view/form_gtk/interface.py	2011-04-20 09:42:30 +0000
@@ -32,11 +32,12 @@
 }
 
 class widget_interface(object):
-    def __init__(self, window, parent=None, view=None, attrs=None):
+    def __init__(self, window, parent=None, view=None, attrs=None, label_ebox= None):
         if attrs is None:
             attrs = {}
         self.parent = parent
         self.position = 0
+        self.label_ebox = label_ebox
         self._window = window
         self._view = None
         self.attrs = attrs

=== modified file 'bin/widget/view/form_gtk/many2many.py'
--- bin/widget/view/form_gtk/many2many.py	2010-12-13 12:46:13 +0000
+++ bin/widget/view/form_gtk/many2many.py	2011-04-20 09:42:30 +0000
@@ -39,8 +39,8 @@
 from widget.view.form_gtk.many2one import dialog
 
 class many2many(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
 
         self.widget = gtk.VBox(homogeneous=False, spacing=1)
 

=== modified file 'bin/widget/view/form_gtk/many2one.py'
--- bin/widget/view/form_gtk/many2one.py	2011-04-04 06:46:26 +0000
+++ bin/widget/view/form_gtk/many2one.py	2011-04-20 09:42:30 +0000
@@ -138,8 +138,8 @@
         self.set_tooltip_text(tooltips_string)
 
 class many2one(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
 
         self.widget = gtk.HBox(spacing=0)
         self.widget.set_property('sensitive', True)

=== modified file 'bin/widget/view/form_gtk/one2many_list.py'
--- bin/widget/view/form_gtk/one2many_list.py	2011-04-13 05:31:22 +0000
+++ bin/widget/view/form_gtk/one2many_list.py	2011-04-20 09:42:30 +0000
@@ -146,8 +146,8 @@
         self.dia.destroy()
 
 class one2many_list(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
         self.context = {}
         self._readonly = self.default_readonly
         self.widget = gtk.VBox(homogeneous=False, spacing=5)

=== modified file 'bin/widget/view/form_gtk/parser.py'
--- bin/widget/view/form_gtk/parser.py	2011-04-13 13:24:05 +0000
+++ bin/widget/view/form_gtk/parser.py	2011-04-20 09:42:30 +0000
@@ -467,11 +467,12 @@
                 if 'default_focus' in attrs and not self.default_focus_field:
                     fields[name]['focus_field'] = attrs['default_focus']
                     self.default_focus_field = True
-
-                widget_act = widgets_type[type][0](self.window, self.parent, model, fields[name])
-                self.widget_id += 1
-                widget_act.position = self.widget_id
-
+                
+                hlp = fields[name].get('help', attrs.get('help', False))
+                detail_tooltip = False
+                if options.options['debug_mode_tooltips']:
+                    detail_tooltip = self.create_detail_tooltip(name, fields[name])
+                
                 label = None
                 if not int(attrs.get('nolabel', 0)):
                     # TODO space before ':' depends of lang (ex: english no space)
@@ -479,25 +480,25 @@
                         label = ': '+fields[name]['string']
                     else:
                         label = fields[name]['string']+' :'
+                                                
+                widget_label = container.create_label(label, help=hlp, fname=name, detail_tooltip=detail_tooltip) if label else None
+                widget_act = widgets_type[type][0](self.window, self.parent, model, fields[name], widget_label)
+                self.widget_id += 1
+                widget_act.position = self.widget_id
                 dict_widget[name] = widget_act
                 size = int(attrs.get('colspan', widgets_type[ type ][1]))
                 expand = widgets_type[ type ][2]
                 fill = widgets_type[ type ][3]
-                hlp = fields[name].get('help', attrs.get('help', False))
                 if attrs.get('height', False) or attrs.get('width', False):
                     widget_act.widget.set_size_request(
                             int(attrs.get('width', -1)), int(attrs.get('height', -1)))
+                
                 if attrs.get('invisible', False):
                     visval = eval(attrs['invisible'], {'context':self.screen.context})
                     if visval:
                         continue
 
                 translate = fields[name]['string'] if fields[name].get('translate') else None
-                detail_tooltip = False
-                if options.options['debug_mode_tooltips']:
-                    detail_tooltip = self.create_detail_tooltip(name, fields[name])
-
-                widget_label = container.create_label(label, help=hlp, fname=name, detail_tooltip=detail_tooltip) if label else None
                 container.wid_add(widget=widget_act.widget, label=widget_label, expand=expand, translate=translate, colspan=size, fname=name, fill=fill)
 
             elif node.tag =='group':

=== modified file 'bin/widget/view/form_gtk/picture.py'
--- bin/widget/view/form_gtk/picture.py	2010-01-12 09:24:17 +0000
+++ bin/widget/view/form_gtk/picture.py	2011-04-20 09:42:30 +0000
@@ -27,8 +27,8 @@
 NOIMAGE = file(common.terp_path_pixmaps("noimage.png"), 'rb').read()
 
 class wid_picture(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
 
         self.widget = gtk.VBox(homogeneous=False)
         self.wid_picture = gtk.Image()

=== modified file 'bin/widget/view/form_gtk/progressbar.py'
--- bin/widget/view/form_gtk/progressbar.py	2010-01-12 09:24:17 +0000
+++ bin/widget/view/form_gtk/progressbar.py	2011-04-20 09:42:30 +0000
@@ -23,8 +23,8 @@
 import interface
 
 class progressbar(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
         self.widget = gtk.ProgressBar()
 
     def display(self, model, model_field):

=== modified file 'bin/widget/view/form_gtk/reference.py'
--- bin/widget/view/form_gtk/reference.py	2011-01-17 10:02:18 +0000
+++ bin/widget/view/form_gtk/reference.py	2011-04-20 09:42:30 +0000
@@ -39,10 +39,10 @@
 
 class reference(interface.widget_interface):
 
-    def __init__(self, window, parent, model, attrs=None):
+    def __init__(self, window, parent, model, attrs=None, label=None):
         if attrs is None:
             attrs = {}
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
 
         self.widget = gtk.HBox(spacing=3)
 

=== modified file 'bin/widget/view/form_gtk/selection.py'
--- bin/widget/view/form_gtk/selection.py	2010-07-16 05:41:32 +0000
+++ bin/widget/view/form_gtk/selection.py	2011-04-20 09:42:30 +0000
@@ -27,8 +27,8 @@
 import gettext
 
 class selection(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
 
         self.widget = gtk.HBox(spacing=3)
         self.entry = gtk.ComboBoxEntry()

=== modified file 'bin/widget/view/form_gtk/spinbutton.py'
--- bin/widget/view/form_gtk/spinbutton.py	2011-01-31 10:28:17 +0000
+++ bin/widget/view/form_gtk/spinbutton.py	2011-04-20 09:42:30 +0000
@@ -27,8 +27,8 @@
 from tools import user_locale_format
 
 class spinbutton(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
 
         adj = gtk.Adjustment(0.0, -sys.maxint, sys.maxint, 1.0, 5.0)
         self.widget = gtk.SpinButton(adj, 1.0, digits=int( attrs.get('digits',(14,2))[1] ) )

=== modified file 'bin/widget/view/form_gtk/spinint.py'
--- bin/widget/view/form_gtk/spinint.py	2011-01-31 10:28:17 +0000
+++ bin/widget/view/form_gtk/spinint.py	2011-04-20 09:42:30 +0000
@@ -28,8 +28,8 @@
 
 class spinint(interface.widget_interface):
 
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
 
         adj = gtk.Adjustment(0.0, -sys.maxint, sys.maxint, 1.0, 5.0)
         self.widget = gtk.SpinButton(adj, 1, digits=0)

=== modified file 'bin/widget/view/form_gtk/textbox.py'
--- bin/widget/view/form_gtk/textbox.py	2010-07-16 05:41:32 +0000
+++ bin/widget/view/form_gtk/textbox.py	2011-04-20 09:42:30 +0000
@@ -27,8 +27,8 @@
 
 
 class textbox(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
 
         self.widget = gtk.ScrolledWindow()
         self.widget.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)

=== modified file 'bin/widget/view/form_gtk/textbox_tag.py'
--- bin/widget/view/form_gtk/textbox_tag.py	2010-08-10 09:17:49 +0000
+++ bin/widget/view/form_gtk/textbox_tag.py	2011-04-20 09:42:30 +0000
@@ -94,8 +94,8 @@
                  'face':{'face':True},
                  }
 
-    def __init__(self,window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent, model, attrs)
+    def __init__(self,window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent, model, attrs, label_ebox=label)
         self.win_gl = glade.XML(common.terp_path("openerp.glade"),"widget_textbox_tag", gettext.textdomain())
         self.widget = self.win_gl.get_widget('widget_textbox_tag')
         self.tv = self.win_gl.get_widget('widget_textbox_tag_tv')

=== modified file 'bin/widget/view/form_gtk/url.py'
--- bin/widget/view/form_gtk/url.py	2011-02-25 09:17:02 +0000
+++ bin/widget/view/form_gtk/url.py	2011-04-20 09:42:30 +0000
@@ -27,8 +27,8 @@
 import tools
 
 class url(interface.widget_interface):
-    def __init__(self, window, parent, model, attrs={}):
-        interface.widget_interface.__init__(self, window, parent=parent, attrs=attrs)
+    def __init__(self, window, parent, model, attrs={}, label=None):
+        interface.widget_interface.__init__(self, window, parent=parent, attrs=attrs, label_ebox=label)
 
         self.widget = gtk.HBox(homogeneous=False)
 
@@ -102,8 +102,8 @@
 
 class uri(url):
 
-    def __init__(self, window, parent, model, attrs=None):
-        super(uri, self).__init__(window, parent, model, attrs=attrs)
+    def __init__(self, window, parent, model, attrs=None, label=None):
+        super(uri, self).__init__(window, parent, model, attrs=attrs, label_ebox=label)
 
         self.but_new = gtk.Button()
         img_new = gtk.Image()