tryton-do/tryton
2
0 Fork 0
Code Issues Pull Requests 2 Actions 1 Packages Projects Releases Wiki Activity

Fix align, expand and fill attributes on board

Browse Source
This commit is contained in:
Cédric Krier committed 2011-08-06 21:24:08 +02:00
1 parent d26164af74
commit d5bd8b8d2e
2 files changed
+26 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

trytond/ir/ui/board.rnc
+11 -10
View File
@@ -20,8 +20,8 @@ image = element image { attlist.image, empty }
attlist.image &= attribute name { text }
attlist.image &= [ a:defaultValue = "1" ] attribute colspan { text }?
attlist.image &=
[ a:defaultValue = "0" ] attribute expand { "0" | "1" }?
attlist.image &= [ a:defaultValue = "0" ] attribute fill { "0" | "1" }?
[ a:defaultValue = "0" ] attribute yexpand { "0" | "1" }?
attlist.image &= [ a:defaultValue = "0" ] attribute yfill { "0" | "1" }?
attlist.image &= attribute help { text }?
attlist.image &= attribute states { text }?
separator = element separator { attlist.separator, empty }
@@ -29,22 +29,23 @@ attlist.separator &= [ a:defaultValue = "" ] attribute string { text }?
attlist.separator &= ( attribute name { text } | attribute name { text } )
attlist.separator &= attribute states { text }?
attlist.separator &=
[ a:defaultValue = "0.0" ] attribute align { text }?
[ a:defaultValue = "0.0" ] attribute xalign { text }?
attlist.separator &=
[ a:defaultValue = "1" ] attribute colspan { text }?
attlist.separator &=
[ a:defaultValue = "0" ] attribute expand { "0" | "1" }?
[ a:defaultValue = "0" ] attribute yexpand { "0" | "1" }?
attlist.separator &=
[ a:defaultValue = "0" ] attribute fill { "0" | "1" }?
[ a:defaultValue = "0" ] attribute yfill { "0" | "1" }?
attlist.separator &= attribute help { text }?
label = element label { attlist.label, empty }
attlist.label &= [ a:defaultValue = "" ] attribute string { text }?
attlist.label &= ( attribute name { text } | attribute name { text } )
attlist.label &= attribute states { text }?
attlist.label &= [ a:defaultValue = "0.0" ] attribute align { text }?
attlist.label &= [ a:defaultValue = "0.0" ] attribute xalign { text }?
attlist.label &= [ a:defaultValue = "0.5" ] attribute yalign { text }?
attlist.label &=
[ a:defaultValue = "0" ] attribute expand { "0" | "1" }?
attlist.label &= [ a:defaultValue = "0" ] attribute fill { "0" | "1" }?
[ a:defaultValue = "0" ] attribute yexpand { "0" | "1" }?
attlist.label &= [ a:defaultValue = "0" ] attribute yfill { "0" | "1" }?
attlist.label &=
[ a:defaultValue = "0" ] attribute xexpand { "0" | "1" }?
attlist.label &= [ a:defaultValue = "1" ] attribute xfill { "0" | "1" }?
@@ -90,8 +91,8 @@ group =
attlist.group &= attribute string { text }?
attlist.group &= [ a:defaultValue = "1" ] attribute colspan { text }?
attlist.group &=
[ a:defaultValue = "0" ] attribute expand { "0" | "1" }?
attlist.group &= [ a:defaultValue = "1" ] attribute fill { "0" | "1" }?
[ a:defaultValue = "0" ] attribute yexpand { "0" | "1" }?
attlist.group &= [ a:defaultValue = "1" ] attribute yfill { "0" | "1" }?
attlist.group &= [ a:defaultValue = "1" ] attribute rowspan { text }?
attlist.group &= [ a:defaultValue = "4" ] attribute col { text }?
attlist.group &= attribute id { text }
trytond/ir/ui/board.rng
+15 -10
View File
@@ -44,7 +44,7 @@
</define>
<define name="attlist.image" combine="interleave">
<optional>
<attribute name="expand" a:defaultValue="0">
<attribute name="yexpand" a:defaultValue="0">
<choice>
<value>0</value>
<value>1</value>
@@ -54,7 +54,7 @@
</define>
<define name="attlist.image" combine="interleave">
<optional>
<attribute name="fill" a:defaultValue="0">
<attribute name="yfill" a:defaultValue="0">
<choice>
<value>0</value>
<value>1</value>
@@ -96,7 +96,7 @@
</define>
<define name="attlist.separator" combine="interleave">
<optional>
<attribute name="align" a:defaultValue="0.0"/>
<attribute name="xalign" a:defaultValue="0.0"/>
</optional>
</define>
<define name="attlist.separator" combine="interleave">
@@ -106,7 +106,7 @@
</define>
<define name="attlist.separator" combine="interleave">
<optional>
<attribute name="expand" a:defaultValue="0">
<attribute name="yexpand" a:defaultValue="0">
<choice>
<value>0</value>
<value>1</value>
@@ -116,7 +116,7 @@
</define>
<define name="attlist.separator" combine="interleave">
<optional>
<attribute name="fill" a:defaultValue="0">
<attribute name="yfill" a:defaultValue="0">
<choice>
<value>0</value>
<value>1</value>
@@ -153,12 +153,17 @@
</define>
<define name="attlist.label" combine="interleave">
<optional>
<attribute name="align" a:defaultValue="0.0"/>
<attribute name="xalign" a:defaultValue="0.0"/>
</optional>
</define>
<define name="attlist.label" combine="interleave">
<optional>
<attribute name="expand" a:defaultValue="0">
<attribute name="yalign" a:defaultValue="0.5"/>
</optional>
</define>
<define name="attlist.label" combine="interleave">
<optional>
<attribute name="yexpand" a:defaultValue="0">
<choice>
<value>0</value>
<value>1</value>
@@ -168,7 +173,7 @@
</define>
<define name="attlist.label" combine="interleave">
<optional>
<attribute name="fill" a:defaultValue="0">
<attribute name="yfill" a:defaultValue="0">
<choice>
<value>0</value>
<value>1</value>
@@ -309,7 +314,7 @@
</define>
<define name="attlist.group" combine="interleave">
<optional>
<attribute name="expand" a:defaultValue="0">
<attribute name="yexpand" a:defaultValue="0">
<choice>
<value>0</value>
<value>1</value>
@@ -319,7 +324,7 @@
</define>
<define name="attlist.group" combine="interleave">
<optional>
<attribute name="fill" a:defaultValue="1">
<attribute name="yfill" a:defaultValue="1">
<choice>
<value>0</value>
<value>1</value>