diff --git a/CHANGELOG b/CHANGELOG index 6f17754af8..b4fe1f0b0f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Add toolbar attribute for richtext widget * Add PYSON widget * Allow to define the text color and background color in calendar view * Allow to override cache implementation diff --git a/doc/topics/views/index.rst b/doc/topics/views/index.rst index ccf9190e33..21f56734cf 100644 --- a/doc/topics/views/index.rst +++ b/doc/topics/views/index.rst @@ -243,6 +243,9 @@ Display a field of the object with the value of the current record. * ``filename_visible``: Only for Binary fields, boolean that enables the display of the filename. + * ``toolbar``: Only for Rich Text widget, boolean that enables the + display of the Rich Text toolbar. The default value is 1. + * ``yexpand``: see in common-attributes-yexpand_. * ``yfill``: see in common-attributes-yfill_. diff --git a/trytond/ir/ui/form.rnc b/trytond/ir/ui/form.rnc index 148262ab3d..a0c4a03e43 100644 --- a/trytond/ir/ui/form.rnc +++ b/trytond/ir/ui/form.rnc @@ -103,6 +103,8 @@ attlist.field &= [a:defaultValue = "1"] attribute completion { "0" | "1" }? attlist.field &= attribute string { text }? attlist.field &= [a:defaultValue = "1"] attribute factor { text }? attlist.field &= attribute filename { text }? +attlist.field &= + [a:defaultValue = "0"] attribute toolbar { "0" | "1" }? 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 d7c1fd6aae..bacb1a9a14 100644 --- a/trytond/ir/ui/form.rng +++ b/trytond/ir/ui/form.rng @@ -363,6 +363,16 @@ + + + + + 0 + 1 + + + +