diff --git a/trytond/ir/ui/form.rnc b/trytond/ir/ui/form.rnc index 9d9080e776..f9f55a30a0 100644 --- a/trytond/ir/ui/form.rnc +++ b/trytond/ir/ui/form.rnc @@ -90,6 +90,7 @@ attlist.field &= | "binary" | "many2many" | "image" + | "progressbar" }? attlist.field &= attribute saves { "0" | "1" }? attlist.field &= attribute expand { "0" | "1" }? @@ -116,6 +117,13 @@ attlist.field &= attribute domain { text }? attlist.field &= attribute color { text }? attlist.field &= [ a:defaultValue = "0" ] attribute select { "0" | "1" | "2" }? +attlist.field &= + [ a:defaultValue = "left_to_right" ] attribute orientation { + "left_to_right" + | "right_to_left" + | "bottom_to_top" + | "top_to_bottom" + } image = element image { attlist.image, empty } attlist.image &= attribute name { text } attlist.image &= [ a:defaultValue = "1" ] attribute colspan { text }? diff --git a/trytond/ir/ui/form.rng b/trytond/ir/ui/form.rng index e1a3511ea6..78883d36b8 100644 --- a/trytond/ir/ui/form.rng +++ b/trytond/ir/ui/form.rng @@ -274,6 +274,7 @@ binary many2many image + progressbar @@ -429,6 +430,18 @@ + + + + + left_to_right + right_to_left + bottom_to_top + top_to_bottom + + + + diff --git a/trytond/ir/ui/tree.rnc b/trytond/ir/ui/tree.rnc index 84cb3d8ff0..a8c1bd3c4a 100644 --- a/trytond/ir/ui/tree.rnc +++ b/trytond/ir/ui/tree.rnc @@ -33,6 +33,7 @@ attlist.field &= | "email" | "callto" | "sip" + | "progressbar" }? attlist.field &= [ a:defaultValue = "0" ] attribute select { "0" | "1" | "2" }? @@ -41,6 +42,13 @@ attlist.field &= attlist.field &= attribute icon { text }? attlist.field &= attribute sum { text }? attlist.field &= attribute width { text }? +attlist.field &= + [ a:defaultValue = "left_to_right" ] attribute orientation { + "left_to_right" + | "right_to_left" + | "bottom_to_top" + | "top_to_bottom" + } data = element data { attlist.data, xpath+ } attlist.data &= empty xpath = element xpath { attlist.xpath, any } diff --git a/trytond/ir/ui/tree.rng b/trytond/ir/ui/tree.rng index b45871d5a2..5f17050cd7 100644 --- a/trytond/ir/ui/tree.rng +++ b/trytond/ir/ui/tree.rng @@ -97,6 +97,7 @@ email callto sip + progressbar @@ -137,6 +138,18 @@ + + + + + left_to_right + right_to_left + bottom_to_top + top_to_bottom + + + +