Mercurial > dive4elements > river
changeset 6744:e5fc8c18bed5
issue1337: fix. Let theme not inherit from longitudinal_section, as this
defines a default color.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 01 Aug 2013 15:37:17 +0200 |
| parents | 0db5f3642335 |
| children | aee8cb5c801a |
| files | artifacts/doc/conf/themes/default.xml artifacts/doc/conf/themes/second.xml |
| diffstat | 2 files changed, 34 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/themes/default.xml Thu Aug 01 15:16:32 2013 +0200 +++ b/artifacts/doc/conf/themes/default.xml Thu Aug 01 15:37:17 2013 +0200 @@ -834,11 +834,26 @@ <!-- MIDDLE BED HEIGHT --> <theme name="MiddleBedHeightSingle"> <inherits> - <inherit from="LongitudinalSection" /> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="MinMaxPoints" /> + <inherit from="Label" /> </inherits> <fields> + <field name="showlines" type="boolean" display="Linie anzeigen" + default="true" /> + <field name="linesize" type="int" display="Liniendicke" + default="1" /> + <field name="linetype" type="Dash" display="Linienart" + default="10" /> <field name="linecolor" type="Color" display="Linienfarbe" - default="204, 204, 204" /> + /> + <field name="showlinelabel" type="boolean" + display="Beschriftung anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" + default="false" /> + <field name="showpointlabel" type="boolean" + display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme>
--- a/artifacts/doc/conf/themes/second.xml Thu Aug 01 15:16:32 2013 +0200 +++ b/artifacts/doc/conf/themes/second.xml Thu Aug 01 15:37:17 2013 +0200 @@ -834,11 +834,26 @@ <!-- MIDDLE BED HEIGHT --> <theme name="MiddleBedHeightSingle"> <inherits> - <inherit from="LongitudinalSection" /> + <inherit from="Lines" /> + <inherit from="Points" /> + <inherit from="MinMaxPoints" /> + <inherit from="Label" /> </inherits> <fields> + <field name="showlines" type="boolean" display="Linie anzeigen" + default="true" /> + <field name="linesize" type="int" display="Liniendicke" + default="2" /> + <field name="linetype" type="Dash" display="Linienart" + default="10" /> <field name="linecolor" type="Color" display="Linienfarbe" - default="204, 204, 204" /> + /> + <field name="showlinelabel" type="boolean" + display="Beschriftung anzeigen" default="false" /> + <field name="showpoints" type="boolean" display="Punkte anzeigen" + default="false" /> + <field name="showpointlabel" type="boolean" + display="Punktbeschriftung anzeigen" default="false" hints="hidden" /> </fields> </theme>