Merge lp:~syleam/vim-openerp/many_improvements_in_snippets into lp:vim-openerp

[Sylvain Garancher]

Added in Python :
- help attribute for fields
- logger methods (debug, info, warning, error)

Added in XML :
- most used gtk icons
- some useful widgets for views (url, progressbar, etc.)

Fixed the ir.values declaration for osv_memory toolbar wizards

[Christophe CHAUVET (christophe-chauvet)]

ok

review: Approve

[lp:~syleam/vim-openerp/many_improvements_in_snippets]

99. By Christophe CHAUVET on 2011-12-22

[MERGE] Merge improvement from Sylvain

=== modified file 'vim/snippets/python.snippets'
--- vim/snippets/python.snippets	2011-12-19 16:07:41 +0000
+++ vim/snippets/python.snippets	2011-12-22 15:30:41 +0000
@@ -99,66 +99,67 @@
 # Define type of fields
 #
 snippet fields fields.char
-	'${1:fieldname}': fields.char('${2:Label}', size=${3:64}, ${4}),
+	'${1:fieldname}': fields.char('${2:Label}', size=${3:64}, ${5}help='${4:Help note}'),${6}
 snippet fields fields.integer
-	'${1:fieldname}': fields.integer('${2:Label}', ${3}),
+	'${1:fieldname}': fields.integer('${2:Label}', ${4}help='${3:Help note}'),${5}
 snippet fields fields.float
-	'${1:fieldname}': fields.float('${2:Label}', ${3}),
+	'${1:fieldname}': fields.float('${2:Label}', ${4}help='${3:Help note}'),${5}
 snippet fields fields.boolean
-	'${1:fieldname}': fields.boolean('${2:Label}', ${3}),
+	'${1:fieldname}': fields.boolean('${2:Label}', ${4}help='${3:Help note}'),${5}
 snippet fields fields.date
-	'${1:fieldname}': fields.date('${2:Label}', ${3}),
+	'${1:fieldname}': fields.date('${2:Label}', ${4}help='${3:Help note}'),${5}
 snippet fields fields.datetime
-	'${1:fieldname}': fields.datetime('${2:Label}', ${3}),
+	'${1:fieldname}': fields.datetime('${2:Label}', ${4}help='${3:Help note}'),${5}
 snippet fields fields.selection
-	'${1:fieldname}': fields.selection(${2:[('','')]}, '${3:Label}', ${4}),
+	'${1:fieldname}': fields.selection(${2:[('', '')]}, '${3:Label}', ${5}help='${4:Help note}'),${6}
 snippet fields fields.many2one
-	'${1:fieldname}_id': fields.many2one('${2:ObjectName}', '${3:Label}', ${4}),
+	'${1:fieldname}_id': fields.many2one('${2:ObjectName}', '${3:Label}', ${5}help='${4:Help note}'),${6}
 snippet fields fields.many2many
-	'${1:fieldname}_ids': fields.many2many('${2:ObjectName}', '${3:TableRel}', '${4:src_id}', '${5:dst_id}', '${6:Label}', ${7}),
+	'${1:fieldname}_ids': fields.many2many('${2:ObjectName}', '${3:TableRel}', '${4:src_id}', '${5:dst_id}', '${6:Label}', ${8}help='${7:Help note}'),${9}
 snippet fields fields.one2many
-	'${1:fieldname}_ids': fields.one2many('${2:ObjectName}', '${3:fieldname}_id', '${4:Label}', ${5}),
+	'${1:fieldname}_ids': fields.one2many('${2:ObjectName}', '${3:fieldname}_id', '${4:Label}', ${6}help='${5:Help note}'),${7}
 snippet fields fields.function
 	'${1:fieldname}': fields.function(${2:FunctionName},
 					    method=${3:True},
 					    string='${4:label}',
 					    type='${5:float}',
-					    store=${6:False}, ${7}),
+					    store=${6:False},${8}
+					    help='${7:Help note}'),${9}
 snippet fields fields.related
-	'${1:fieldname}': fields.related('${2:field in}', '${3:field rel}', type='${4:many2one}', ${5:relation='res.partner'}, 
-					    string='${6:Label}', ${7}),
+	'${1:fieldname}': fields.related('${2:field in}', '${3:field rel}', type='${4:many2one}', ${5:relation='res.partner'},
+					    string='${6:Label}', ${8}help='${7:Help note}'),${9}
 snippet fields fields.property
-	'${1:fieldname}': fields.property('${2:object}', method=${3:True}, 
-			    string='${4:label}', type='${5:many2one}', ${6}),
+	'${1:fieldname}': fields.property('${2:object}', method=${3:True},
+			    string='${4:label}', type='${5:many2one}', ${7}help='${6:Help note}'),${8}
 snippet fields fields.text
-	'${1:fieldname}': fields.text('${2:Label}', ${4}),
+	'${1:fieldname}': fields.text('${2:Label}', ${4}help='${3:Help note}'),${5}
 snippet fields fields.binary
-	'${1:fieldname}': fields.binary('${2:Label}', ${4}),
+	'${1:fieldname}': fields.binary('${2:Label}', ${4}help='${3:Help note}'),${5}
 snippet fields fields.reference
-	'${1:fieldname}': fields.reference('${2:Label}',selection=${3:[('','')]}, size=128, ${4}),
+	'${1:fieldname}': fields.reference('${2:Label}', selection=${3:[('', '')]}, size=128, ${5}help='${4:Help note}'),${6}
 # Attribute for fields
 snippet domain
-	domain=[('${1:state}','${2:=}','${3:done}')]
+	domain=[('${1:state}', '${2:=}', '${3:done}')]
 snippet help
 	help='${1:Help about Field}',
 snippet readonly
-	readonly=True,
+	readonly=True, ${1}
 snippet required
-	required=True,
+	required=True, ${1}
 snippet translate
-	translate=True,
+	translate=True, ${1}
 snippet select
-	select=True,
+	select=True, ${1}
 snippet ondel OnDelete Cascade
-	ondelete='cascade',
+	ondelete='cascade', ${1}
 snippet ondel OnDelete Set Null
-	ondelete='set null'
+	ondelete='set null', ${1}
 snippet ondelete OnDelete Cascade
-	ondelete='cascade',
+	ondelete='cascade', ${1}
 snippet ondelete OnDelete Set Null
-	ondelete='set null'
+	ondelete='set null', ${1}
 snippet store
-	store=True,
+	store=True, ${1}
 #
 # Define function in osv.osv
 #
@@ -263,7 +264,7 @@
 	    cr.execute("""CREATE OR REPLACE VIEW ${1:View} AS (
 	            ${3:SELECT...})
 	    """)
-	${2}
+	${4}
 snippet func def _name_get
 	def name_get(self, cr, uid, ids, context=None):
 	    """
@@ -286,7 +287,7 @@
 	def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=80):
 	    """
 	    #TODO make doc string
-	    ${2:Comment this}
+	    ${1:Comment this}
 	    """
 	    #TODO: make a search on specific fields and get ids
 	    if args is None:
@@ -295,18 +296,18 @@
 	        context = {}
 	    ids = []
 	    if name:
-	        ids = self.search(cr, uid, [('code','ilike',name)]+ args, limit=limit)
+	        ids = self.search(cr, uid, [('code', 'ilike', name)] + args, limit=limit)
 	    if not ids:
-	        ids = self.search(cr, uid, [('name',operator,name)]+ args, limit=limit)
+	        ids = self.search(cr, uid, [('name', operator, name)] + args, limit=limit)
 	    return self.name_get(cr, uid, ids, context=context)
-	    ${3}
+	    ${2}
 snippet func on_change
 	def onchange_${1:fields}(self, cr, uid, ids, $1, context=None):
 	    """
 	    #TODO make doc string
 	    ${2:Comment this/compute new values from the db/system}
 	    """
-	    #TODO : compute new values from the db/system 
+	    #TODO : compute new values from the db/system
 	    if context is None:
 	        context = {}
 	    ${3}
@@ -350,19 +351,19 @@
 ## Common method define in osv.osv
 ##
 snippet read
-	self.read(cr, uid, ids, ['${1:field}'], context=context)
+	self.read(cr, uid, ${1:ids}, ['${2:field}'], context=context)${3}
 snippet browse
-	self.browse(cr, uid, ids, context=context)
+	self.browse(cr, uid, ${1:ids}, context=context)${2}
 snippet search
-	self.search(cr, uid, [('${1:state}','${2:=}','${3:done}')], context=context)
+	self.search(cr, uid, [('${1:state}', '${2:=}', '${3:done}')], context=context)${4}
 snippet create
-	id = self.create(cr, uid, ${1:vals}, context=context)
+	id = self.create(cr, uid, ${1:vals}, context=context)${2}
 snippet write
-	self.write(cr, uid, ${1:ids}, ${2:vals}, context=context)
+	self.write(cr, uid, ${1:ids}, ${2:vals}, context=context)${3}
 snippet unlink
-	self.unlink(cr, uid, ${1:ids}, context=context)
+	self.unlink(cr, uid, ${1:ids}, context=context)${2}
 snippet perm_read
-	self.perm_read(cr, uid, [${1:id}], context=context)
+	self.perm_read(cr, uid, [${1:id}], context=context)${2}
 #
 # Define all variables in osv.osv begin by _
 #
@@ -459,9 +460,9 @@
 # Usefull Snippet
 #
 snippet active
-	'active': fields.boolean('${1:Active}', help='if check, ${2:this object is always available}'),
+	'active': fields.boolean('${1:Active}', help='if check, ${2:this object is always available}'),${3}
 snippet sequence
-	'sequence': fields.integer('${1:Sequence}'),
+	'sequence': fields.integer('${1:Sequence}'),${2}
 snippet logger
 	import netsvc
 	logger = netsvc.Logger()
@@ -469,7 +470,15 @@
 	import logging
 	logger = logging.getLogger('${1:module}')
 snippet notify
-	logger.notifyChannel('${1:module}', netsvc.${2:LOG_DEBUG}, '${3:Message}') ${4}
+	logger.notifyChannel('${1:module}', netsvc.${2:LOG_DEBUG}, '${3:Message}')${4}
+snippet log Debug
+	logger.debug('${1}')
+snippet log Info
+	logger.info('${1}')
+snippet log Warning
+	logger.warning('${1}')
+snippet log Error
+	logger.error('${1}')
 #
 # Other python declaration
 #

=== modified file 'vim/snippets/xml.snippets'
--- vim/snippets/xml.snippets	2011-12-15 15:07:28 +0000
+++ vim/snippets/xml.snippets	2011-12-22 15:30:41 +0000
@@ -73,13 +73,13 @@
 snippet nol
 	nolabel="1" ${1}
 snippet nolabel
-	nolabel="1" ${0}
+	nolabel="1" ${1}
 snippet readonly
 	readonly="1" ${1}
 snippet required
-	required="1"
+	required="1" ${1}
 snippet invisible
-	invisible="1"
+	invisible="1" ${1}
 snippet pos
 	position="${1:inside}"
 snippet position
@@ -136,7 +136,7 @@
 		    <group colspan="4" col="6">
 		        <label string ="" colspan="2"/>
 		        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-		        <button  icon="terp-gtk-go-back-rtl" string="Start" name="${5:_continue}" type="object"/>
+		        <button icon="terp-gtk-go-back-rtl" string="Start" name="${5:_continue}" type="object"/>
 		    </group>
 		</form>
 	    </field>
@@ -186,8 +186,7 @@
 	    <field name="object" eval="1"/>
 	    <field name="key">action</field>
 	    <field name="key2">client_action_multi</field>
-	    <field name="model_id" ref="${5:ir_model_data}"/>
-	    <field name="model">$2</field>
+	    <field name="model">${2:Model to launch wizard}</field>
 	    <field name="value" eval="'ir.actions.act_window,' + str(ref('action_$1_view'))" />
 	</record>
 snippet view form
@@ -436,6 +435,16 @@
 	widget="selection"
 snippet widget float_time
 	widget="float_time"
+snippet widget url
+	widget="url"
+snippet widget progressbar
+	widget="progressbar"
+snippet widget many2many
+	widget="many2many"
+snippet widget one2many_list
+	widget="one2many_list"
+snippet widget password
+	password="1"
 snippet test <test expr=""/>
 	<test expr="len(${1:one2many}) == ${2:1}"/>
 snippet test <test expr=""></test>
@@ -460,3 +469,23 @@
 	<delete model="${1:model}" id="${2:ir_model_data}"/>
 snippet delete search
 	<delete model="${1:model}" search="[('${2:field}', '${3:operator}', '${4:value}')]"/>
+snippet icon gtk-apply
+	icon="gtk-apply"
+snippet icon gtk-cancel
+	icon="gtk-cancel"
+snippet icon gtk-close
+	icon="gtk-close"
+snippet icon gtk-convert
+	icon="gtk-convert"
+snippet icon gtk-execute
+	icon="gtk-execute"
+snippet icon gtk-go-forward
+	icon="gtk-go-forward"
+snippet icon gtk-jump-to
+	icon="gtk-jump-to"
+snippet icon gtk-media-pause
+	icon="gtk-media-pause"
+snippet icon gtk-ok
+	icon="gtk-ok"
+snippet icon gtk-print
+	icon="gtk-print"