odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] ir.ui.menu,rng: support for embedded web icons for menuitems 

bzr revid: odo@openerp.com-20101125105002-o6pbzql6lsqhx60w
This commit is contained in:
GPA (OpenERP) 2010-11-25 11:50:02 +01:00 committed by Olivier Dony
parent 37f2e927e7 9de5e301e1
commit f4c509bcfb
4 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/addons/base/ir/ir.xml
View File

@ -1379,6 +1379,12 @@
<field name="action" colspan="4" />
<field name="icon" on_change="onchange_icon(icon)" colspan="2"/>
<field name="icon_pict" widget="picture" nolabel="1" colspan="2"/>
<group col="4" colspan="8" groups="base.group_extended">
<field name="web_icon" groups="base.group_extended" />
<field name="web_icon_hover" groups="base.group_extended" />
<field name="web_icon_data" widget="image" groups="base.group_extended"/>
<field name="web_icon_hover_data" widget="image" groups="base.group_extended"/>
</group>
</group>
<notebook colspan="4">
<page string="Groups">

28
bin/addons/base/ir/ir_ui_menu.py
View File

@ -22,6 +22,8 @@
from osv import fields, osv
import re
import tools
import base64
import addons
def one_in(setA, setB):
"""Check the presence of an element of setA in setB
@ -260,8 +262,26 @@ class ir_ui_menu(osv.osv):
return False
level -= 1
return True
def read_image(self, path):
path_info = path.split(',')
icon_path = addons.get_module_resource(path_info[0],path_info[1])
icon = tools.file_open(icon_path,'rb').read()
return base64.encodestring(icon)
def _get_image_icon(self, cr, uid, ids, name, args, context=None):
res = {}
for menu in self.browse(cr, uid, ids, context=context):
res[menu.id] = {
'web_icon_data': False,
'web_icon_hover_data': False,
}
if not menu.parent_id:
if menu.web_icon_hover:
res[menu.id]['web_icon_hover_data'] = self.read_image(menu.web_icon_hover)
if menu.web_icon:
res[menu.id]['web_icon_data'] = self.read_image(menu.web_icon)
return res
_columns = {
'name': fields.char('Menu', size=64, required=True, translate=True),
@ -275,6 +295,10 @@ class ir_ui_menu(osv.osv):
string='Complete Name', type='char', size=128),
'icon': fields.selection(tools.icons, 'Icon', size=64),
'icon_pict': fields.function(_get_icon_pict, method=True, type='char', size=32),
'web_icon': fields.char('Icon File', size=128),
'web_icon_hover':fields.char('Icon hover File', size=128),
'web_icon_data': fields.function(_get_image_icon, string='Web Icons', type='binary', method=True, readonly=True, store=True, multi='icon'),
'web_icon_hover_data':fields.function(_get_image_icon, string='Web Icons Hover', type='binary', method=True, readonly=True, store=True,multi='icon'),
'action': fields.function(_action, fnct_inv=_action_inv,
method=True, type='reference', string='Action',
selection=[

2
bin/import_xml.rng
View File

@ -176,6 +176,8 @@
<rng:optional> <rng:attribute name="name"/></rng:optional>
<rng:optional> <rng:attribute name="parent"/> </rng:optional>
<rng:optional> <rng:attribute name="icon"/> </rng:optional>
<rng:optional> <rng:attribute name="web_icon"/> </rng:optional>
<rng:optional> <rng:attribute name="web_icon_hover"/> </rng:optional>
<rng:optional> <rng:attribute name="action"/> </rng:optional>
<rng:optional> <rng:attribute name="string"/> </rng:optional>
<rng:optional> <rng:attribute name="sequence"/> </rng:optional>

8
bin/tools/convert.py
View File

@ -284,7 +284,7 @@ form: module.record_id""" % (xml_id,)
d_search = rec.get("search",'').encode('utf-8')
d_id = rec.get("id",'')
ids = []
if d_search:
idref = _get_idref(self, cr, self.uid, d_model, context={}, idref={})
ids = self.pool.get(d_model).search(cr, self.uid, unsafe_eval(d_search, idref))
@ -556,7 +556,7 @@ form: module.record_id""" % (xml_id,)
values = {'parent_id': False}
if rec.get('parent', False) is False and len(m_l) > 1:
# No parent attribute specified and the menu name has several menu components,
# No parent attribute specified and the menu name has several menu components,
# try to determine the ID of the parent according to menu path
pid = False
res = None
@ -637,6 +637,10 @@ form: module.record_id""" % (xml_id,)
values['sequence'] = int(rec.get('sequence'))
if rec.get('icon'):
values['icon'] = str(rec.get('icon'))
if rec.get('web_icon'):
values['web_icon'] = "%s,%s" %(self.module, str(rec.get('web_icon')))
if rec.get('web_icon_hover'):
values['web_icon_hover'] = "%s,%s" %(self.module, str(rec.get('web_icon_hover')))
if rec.get('groups'):
g_names = rec.get('groups','').split(',')