Merge lp:~openerp-dev/openobject-client/page_tooltips into lp:~openerp-dev/openobject-client/trunk-dev-client

[Ravi Gadhia (OpenERP)]

Hello
This branch implement following blueprint
https://blueprints.launchpad.net/openobject-client/+spec/tooltips-tab-information

[lp:~openerp-dev/openobject-client/page_tooltips]

1459. By Ravi Gadhia (OpenERP) on 2011-02-23

[IMP] check current_model has name field value before set tooltip

[Naresh(OpenERP) (nch-openerp)]

Hello,

I have tested your merge proposal,seems good but with a problem
that is it shows you the tooltip even if you are in the list view with the value of the name field of current_model. Same is the case for Calendar view,graph view. Here it should only show the view title.

Thanks

review: Needs Fixing

[Naresh(OpenERP) (nch-openerp)]

review: Needs Resubmitting

Unmerged revisions

1459. By Ravi Gadhia (OpenERP) on 2011-02-23

[IMP] check current_model has name field value before set tooltip

1458. By Ravi Gadhia (OpenERP) on 2011-02-22

[IMP] Refectore code of set tooltips on page header (remove set_data from VBox)

1457. By Ravi Gadhia (OpenERP) on 2011-02-21

[IMP] set model name field's value as page tooltips'

=== modified file 'bin/modules/gui/main.py'
--- bin/modules/gui/main.py	2011-01-27 06:31:03 +0000
+++ bin/modules/gui/main.py	2011-02-23 12:31:44 +0000
@@ -1206,6 +1206,7 @@
                 return True
             return False
         return True
+    
 
     def win_add(self, win, datas):
         """
@@ -1226,6 +1227,10 @@
         closebtn.unset_flags(gtk.CAN_FOCUS)
 
         box_label = gtk.Label(win.name)
+        box_label.set_tooltip_text(win.name)
+        win.page_label = box_label
+
+        
         event_box = gtk.EventBox()
         event_box.add(box_label)
         event_box.set_visible_window(False)

=== modified file 'bin/modules/gui/window/__init__.py'
--- bin/modules/gui/window/__init__.py	2010-12-21 05:18:43 +0000
+++ bin/modules/gui/window/__init__.py	2011-02-23 12:31:44 +0000
@@ -40,7 +40,6 @@
         if context is None:
             context = {}
         context.update(rpc.session.context)
-
         if view_type=='form':
             mode = (mode or 'form,tree').split(',')
             win = form.form(model, res_id, domain, view_type=mode,
@@ -49,6 +48,8 @@
                     auto_refresh=auto_refresh, auto_search=auto_search, search_view=search_view)
             spool = service.LocalService('spool')
             spool.publish('gui.window', win, {})
+            if win.screen.current_model:
+                win.page_label.set_tooltip_text(win.screen.current_model.value.get('name',''))
         elif view_type=='tree':
             if view_ids and view_ids[0]:
                 view_base =  rpc.session.rpc_exec_auth('/object', 'execute',

=== modified file 'bin/modules/gui/window/form.py'
--- bin/modules/gui/window/form.py	2011-01-27 10:49:17 +0000
+++ bin/modules/gui/window/form.py	2011-02-23 12:31:44 +0000
@@ -67,6 +67,7 @@
         self.fields = fields
         self.domain = domain
         self.context = context
+        self.page_label = None
         self.screen = Screen(self.model, view_type=view_type,
                 context=self.context, view_ids=view_ids, domain=domain,help=help,
                 hastoolbar=options.options['form.toolbar'], hassubmenu=options.options['form.submenu'],
@@ -136,7 +137,15 @@
 
         if auto_refresh and int(auto_refresh):
             gobject.timeout_add(int(auto_refresh) * 1000, self.sig_reload)
-
+    
+    def set_tooltips(fn):
+        def _decorate(self, *args, **kws):
+            result = fn(self, *args, **kws)
+            tooltips = self.screen.current_model and self.screen.current_model.value.get('name') or self.name
+            self.page_label.set_tooltip_text(tooltips)
+            return result
+        return _decorate
+    
     def sig_switch_diagram(self, widget=None):
         return self.sig_switch(widget, 'diagram')
 
@@ -229,7 +238,7 @@
         else:
             self.message_state(_('No record selected ! You can only attach to existing record.'), color='red')
         return True
-
+    
     def sig_switch(self, widget=None, mode=None):
         if not self.modified_save():
             return
@@ -262,7 +271,8 @@
                 message+=val+': '+str(line[key] or '/')+'\n'
         common.message(message)
         return True
-
+    
+    @set_tooltips
     def sig_remove(self, widget=None):
         if not self.id_get():
             msg = _('Record is not saved ! \n Do you want to clear current record ?')
@@ -286,7 +296,7 @@
         screen_fields = copy.deepcopy(self.screen.fields)
         win = win_import.win_import(self.model, screen_fields, fields, parent=self.window,local_context= self.screen.context)
         res = win.go()
-
+        
     def sig_save_as(self, widget=None):
         fields = []
         while(self.screen.view_to_load):
@@ -294,7 +304,7 @@
         screen_fields = copy.deepcopy(self.screen.fields)
         win = win_export.win_export(self.model, self.screen.ids_get(), screen_fields, fields, parent=self.window, context=self.context)
         res = win.go()
-
+    
     def sig_new(self, widget=None, autosave=True):
         if autosave:
             if not self.modified_save():
@@ -303,6 +313,8 @@
             return
         self.screen.new()
         self.message_state('')
+        self.page_label and self.page_label.set_tooltip_text(self.name)
+
 
     def sig_copy(self, *args):
         if not self.modified_save():
@@ -319,7 +331,8 @@
 
     def _form_save(self, auto_continue=True):
         pass
-
+    
+    @set_tooltips
     def sig_save(self, widget=None, sig_new=True, auto_continue=True):
         res = self.screen.save_current()
         warning = False
@@ -337,12 +350,14 @@
             common.warning(warning,_('Warning !'), parent=self.screen.current_view.window)
         return bool(id)
 
+    @set_tooltips
     def sig_previous(self, widget=None):
         if not self.modified_save():
             return
         self.screen.display_prev()
         self.message_state('')
-
+        
+    @set_tooltips
     def sig_next(self, widget=None):
         if not self.modified_save():
             return

=== modified file 'bin/widget/screen/screen.py'
--- bin/widget/screen/screen.py	2011-01-27 12:43:03 +0000
+++ bin/widget/screen/screen.py	2011-02-23 12:31:44 +0000
@@ -498,6 +498,13 @@
         del self.win_search
         del self.win_search_callback
         del self.window
+        
+    def set_tooltips(self):
+        terp_main = service.LocalService('gui.main')
+        page_id= terp_main.notebook.get_current_page()
+        form_ojb = terp_main.pages[page_id]
+        tooltips = self.current_model and self.current_model.value.get('name') or form_ojb.name
+        form_ojb.page_label.set_tooltip_text(tooltips)
 
     # mode: False = next view, value = open this view
     def switch_view(self, screen=None, mode=False):
@@ -546,6 +553,8 @@
         self.current_view.set_cursor()
 
         main = service.LocalService('gui.main')
+        if mode:
+            self.set_tooltips()
         if main:
             main.sb_set()