From 73c54ca47207079c7dfccc4d90ff8eadb72c47dc Mon Sep 17 00:00:00 2001 From: Sebastian Marro Date: Fri, 23 Mar 2012 15:36:11 -0300 Subject: [PATCH] Improve column space in tree view issue2488 review286001 --- CHANGELOG | 1 + doc/topics/views/index.rst | 8 +++++--- trytond/ir/action.xml | 4 ++-- trytond/ir/ui/menu.xml | 8 ++++---- trytond/ir/ui/tree.rnc | 4 ++-- trytond/ir/ui/tree.rng | 20 ++++++++++---------- trytond/ir/ui/view.xml | 5 ++--- trytond/res/group.xml | 4 ++-- 8 files changed, 28 insertions(+), 26 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 248447cc2c..25b4421d36 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Replace fill by expand * Integer, Numeric and Float allow None as value * NULL value is None and not False * Replace user action by a list of actions diff --git a/doc/topics/views/index.rst b/doc/topics/views/index.rst index ba6eb007c5..82fa81cd99 100644 --- a/doc/topics/views/index.rst +++ b/doc/topics/views/index.rst @@ -447,9 +447,6 @@ Each tree view must start with this tag. * ``colors``: A PySON string that will be evaluated for each record. A string containing the name of the color will be returned. - * ``fill``: A boolean to specify if the last column must fill the remaining - free space in the view. - * ``keyword_open``: A boolean to specify if the client should look for a tree_open action on double click instead of switching view. @@ -473,6 +470,11 @@ field list with the sum of all the fields in the column. * ``width``: Set the width of the column. + + * ``expand``: Boolean to specify if the column should be expanded to take + available extra space in the view. This space is shared equally among all + columns that have their "expand" property set to True. Resize don't work + if this option is enabled. Example ------- diff --git a/trytond/ir/action.xml b/trytond/ir/action.xml index 118687c6db..c4e895808f 100644 --- a/trytond/ir/action.xml +++ b/trytond/ir/action.xml @@ -289,9 +289,9 @@ this repository contains the full copyright notices and license terms. --> + - + ]]> diff --git a/trytond/ir/ui/menu.xml b/trytond/ir/ui/menu.xml index acb7a9dec1..7fc7749b3c 100644 --- a/trytond/ir/ui/menu.xml +++ b/trytond/ir/ui/menu.xml @@ -10,8 +10,8 @@ this repository contains the full copyright notices and license terms. --> - + + ]]> @@ -23,8 +23,8 @@ this repository contains the full copyright notices and license terms. --> - + + ]]> diff --git a/trytond/ir/ui/tree.rnc b/trytond/ir/ui/tree.rnc index e1b966d46e..374133b83f 100644 --- a/trytond/ir/ui/tree.rnc +++ b/trytond/ir/ui/tree.rnc @@ -10,8 +10,6 @@ attlist.tree &= attribute on_write { text }? attlist.tree &= attribute editable { "top" | "bottom" }? attlist.tree &= attribute sequence { text }? attlist.tree &= attribute colors { text }? -attlist.tree &= - [ a:defaultValue = "0" ] attribute fill { "0" | "1" }? attlist.tree &= [ a:defaultValue = "0" ] attribute keyword_open { "0" | "1" }? field = element field { attlist.field, empty } @@ -39,6 +37,8 @@ attlist.field &= }? attlist.field &= [ a:defaultValue = "0" ] attribute tree_invisible { "0" | "1" }? +attlist.field &= + [ a:defaultValue = "0" ] attribute expand { "0" | "1" }? attlist.field &= attribute icon { text }? attlist.field &= attribute sum { text }? attlist.field &= attribute width { text }? diff --git a/trytond/ir/ui/tree.rng b/trytond/ir/ui/tree.rng index d7d726e251..9d58a48954 100644 --- a/trytond/ir/ui/tree.rng +++ b/trytond/ir/ui/tree.rng @@ -41,16 +41,6 @@ - - - - - 0 - 1 - - - - @@ -115,6 +105,16 @@ + + + + + 0 + 1 + + + + diff --git a/trytond/ir/ui/view.xml b/trytond/ir/ui/view.xml index 9f18b4cd0a..76814ed407 100644 --- a/trytond/ir/ui/view.xml +++ b/trytond/ir/ui/view.xml @@ -131,9 +131,8 @@ this repository contains the full copyright notices and license terms. --> tree - + + ]]> diff --git a/trytond/res/group.xml b/trytond/res/group.xml index b015873a79..c75fd3cd5a 100644 --- a/trytond/res/group.xml +++ b/trytond/res/group.xml @@ -34,8 +34,8 @@ this repository contains the full copyright notices and license terms. --> tree - + + ]]>