changeset f8159bd01611 in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset;node=f8159bd01611
description:
Add xalign and yalign to group
issue8956
review258581002
diffstat:
CHANGELOG | 1 +
doc/topics/views/index.rst | 8 ++++++++
trytond/ir/ui/board.rnc | 2 ++
trytond/ir/ui/board.rng | 16 ++++++++++++++++
trytond/ir/ui/form.rnc | 2 ++
trytond/ir/ui/form.rng | 16 ++++++++++++++++
6 files changed, 45 insertions(+), 0 deletions(-)
diffs (122 lines):
diff -r 3fd73e872818 -r f8159bd01611 CHANGELOG
--- a/CHANGELOG Tue Jan 21 00:43:21 2020 +0100
+++ b/CHANGELOG Fri Jan 24 00:18:19 2020 +0100
@@ -1,3 +1,4 @@
+* Add xalign and yalign to group
* Add MultiSelection entry to Dict field
* Allow empty order clause
* Change editable tree attribute into boolean
diff -r 3fd73e872818 -r f8159bd01611 doc/topics/views/index.rst
--- a/doc/topics/views/index.rst Tue Jan 21 00:43:21 2020 +0100
+++ b/doc/topics/views/index.rst Fri Jan 24 00:18:19 2020 +0100
@@ -433,6 +433,14 @@
* ``yfill``: see in common-attributes-yfill_.
+ * ``yalign``: see in common-attributes-yalign_.
+
+ * ``xexpand``: see in common-attributes-xexpand_.
+
+ * ``xfill``: see in common-attributes-xfill_.
+
+ * ``xalign``: see in common-attributes-xalign_.
+
* ``colspan``: see in common-attributes-colspan_.
* ``states``: see in common-attributes-states_.
diff -r 3fd73e872818 -r f8159bd01611 trytond/ir/ui/board.rnc
--- a/trytond/ir/ui/board.rnc Tue Jan 21 00:43:21 2020 +0100
+++ b/trytond/ir/ui/board.rnc Fri Jan 24 00:18:19 2020 +0100
@@ -96,9 +96,11 @@
attlist.group &=
[ a:defaultValue = "0" ] attribute yexpand { "0" | "1" }?
attlist.group &= [ a:defaultValue = "1" ] attribute yfill { "0" | "1" }?
+attlist.group &= [ a:defaultValue = "0.5" ] attribute yalign { text }?
attlist.group &=
[ a:defaultValue = "0" ] attribute xexpand { "0" | "1" }?
attlist.group &= [ a:defaultValue = "1" ] attribute xfill { "0" | "1" }?
+attlist.group &= [ a:defaultValue = "0.5" ] attribute xalign { text }?
attlist.group &= [ a:defaultValue = "1" ] attribute rowspan { text }?
attlist.group &= [ a:defaultValue = "4" ] attribute col { text }?
attlist.group &= attribute id { text }
diff -r 3fd73e872818 -r f8159bd01611 trytond/ir/ui/board.rng
--- a/trytond/ir/ui/board.rng Tue Jan 21 00:43:21 2020 +0100
+++ b/trytond/ir/ui/board.rng Fri Jan 24 00:18:19 2020 +0100
@@ -467,6 +467,14 @@
</define>
<define name="attlist.group" combine="interleave">
<optional>
+ <attribute a:defaultValue="0.5">
+ <name ns="">yalign</name>
+ <text/>
+ </attribute>
+ </optional>
+ </define>
+ <define name="attlist.group" combine="interleave">
+ <optional>
<attribute a:defaultValue="0">
<name ns="">xexpand</name>
<choice>
@@ -489,6 +497,14 @@
</define>
<define name="attlist.group" combine="interleave">
<optional>
+ <attribute a:defaultValue="0.5">
+ <name ns="">xalign</name>
+ <text/>
+ </attribute>
+ </optional>
+ </define>
+ <define name="attlist.group" combine="interleave">
+ <optional>
<attribute a:defaultValue="1">
<name ns="">rowspan</name>
<text/>
diff -r 3fd73e872818 -r f8159bd01611 trytond/ir/ui/form.rnc
--- a/trytond/ir/ui/form.rnc Tue Jan 21 00:43:21 2020 +0100
+++ b/trytond/ir/ui/form.rnc Fri Jan 24 00:18:19 2020 +0100
@@ -199,9 +199,11 @@
attlist.group &=
[ a:defaultValue = "0" ] attribute yexpand { "0" | "1" }?
attlist.group &= [ a:defaultValue = "1" ] attribute yfill { "0" | "1" }?
+attlist.group &= [ a:defaultValue = "0.5" ] attribute yalign { text }?
attlist.group &=
[ a:defaultValue = "0" ] attribute xexpand { "0" | "1" }?
attlist.group &= [ a:defaultValue = "1" ] attribute xfill { "0" | "1" }?
+attlist.group &= [ a:defaultValue = "0.5" ] attribute xalign { text }?
attlist.group &= [ a:defaultValue = "1" ] attribute rowspan { text }?
attlist.group &= [ a:defaultValue = "4" ] attribute col { text }?
attlist.group &= ( attribute name { text } | attribute id { text } )
diff -r 3fd73e872818 -r f8159bd01611 trytond/ir/ui/form.rng
--- a/trytond/ir/ui/form.rng Tue Jan 21 00:43:21 2020 +0100
+++ b/trytond/ir/ui/form.rng Fri Jan 24 00:18:19 2020 +0100
@@ -975,6 +975,14 @@
</define>
<define name="attlist.group" combine="interleave">
<optional>
+ <attribute a:defaultValue="0.5">
+ <name ns="">yalign</name>
+ <text/>
+ </attribute>
+ </optional>
+ </define>
+ <define name="attlist.group" combine="interleave">
+ <optional>
<attribute a:defaultValue="0">
<name ns="">xexpand</name>
<choice>
@@ -997,6 +1005,14 @@
</define>
<define name="attlist.group" combine="interleave">
<optional>
+ <attribute a:defaultValue="0.5">
+ <name ns="">xalign</name>
+ <text/>
+ </attribute>
+ </optional>
+ </define>
+ <define name="attlist.group" combine="interleave">
+ <optional>
<attribute a:defaultValue="1">
<name ns="">rowspan</name>
<text/>
