Mercurial > dive4elements > river
changeset 4023:e064e781d255
Merged.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 04 Oct 2012 11:27:06 +0200 |
| parents | 017e3d8526e0 (diff) 7cc05da7e35c (current diff) |
| children | 62d99de39a8d |
| files | flys-artifacts/ChangeLog |
| diffstat | 4 files changed, 29 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Oct 04 10:57:24 2012 +0200 +++ b/flys-artifacts/ChangeLog Thu Oct 04 11:27:06 2012 +0200 @@ -1,3 +1,12 @@ +2012-10-03 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Fix issue417. + + * flys-artifacts/doc/conf/default-themes, + flys-artifacts/doc/conf/second-themes, + flys-artifacts/doc/conf/virtual-themes: + Remove not needed theme props from main-value-annotations. + 2012-10-04 Christian Lins <christian.lins@intevation.de> * flys-artifacts/src/main/java/de/intevation/flys/exports/LegendProcessor.java, @@ -9,7 +18,7 @@ flys-artifacts/src/main/resources/messages_de_DE.properties, flys-artifacts/src/main/resources/messages_en.properties: Add message for 'state.chart.km' (#899). - + Add message for 'state.chart.km' (#899). 2012-10-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> * flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/AnnotationRiverState.java:
--- a/flys-artifacts/doc/conf/default-themes.xml Thu Oct 04 10:57:24 2012 +0200 +++ b/flys-artifacts/doc/conf/default-themes.xml Thu Oct 04 11:27:06 2012 +0200 @@ -624,9 +624,10 @@ </theme> <!-- Main Values --> + <!-- Default should be to show label, but label should be unshowable --> <theme name="MainValuesQ"> <inherits> - <inherit from="HiddenColorLines" /> + <inherit from="ColorLinesOnly" /> <inherit from="Text" /> </inherits> <fields> @@ -645,7 +646,7 @@ <theme name="MainValuesW"> <inherits> - <inherit from="HiddenColorLines" /> + <inherit from="ColorLinesOnly" /> <inherit from="Text" /> </inherits> <fields>
--- a/flys-artifacts/doc/conf/second-themes.xml Thu Oct 04 10:57:24 2012 +0200 +++ b/flys-artifacts/doc/conf/second-themes.xml Thu Oct 04 11:27:06 2012 +0200 @@ -626,7 +626,7 @@ <!-- Main Values --> <theme name="MainValuesQ"> <inherits> - <inherit from="HiddenColorLines" /> + <inherit from="ColorLinesOnly" /> <inherit from="Text" /> </inherits> <fields> @@ -645,7 +645,7 @@ <theme name="MainValuesW"> <inherits> - <inherit from="HiddenColorLines" /> + <inherit from="ColorLinesOnly" /> <inherit from="Text" /> </inherits> <fields>
--- a/flys-artifacts/doc/conf/virtual-themes.xml Thu Oct 04 10:57:24 2012 +0200 +++ b/flys-artifacts/doc/conf/virtual-themes.xml Thu Oct 04 11:27:06 2012 +0200 @@ -84,6 +84,20 @@ </fields> </theme> + <theme name="ColorLinesOnly" type="virtual"> + <inherits> + <inherit from="ColorLines" /> + </inherits> + <fields> + <field name="showlines" type="boolean" display="Linie anzeigen" + default="true" hints="h" /> + <field name="linesize" type="int" display="Liniendicke" + default="1" hints="h" /> + <field name="linetype" type="Dash" display="Linienart" + default="10" hints="h" /> + </fields> + </theme> + <theme name="ColorPoints" type="virtual"> <inherits> <inherit from="Points" />