# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1349342826 -7200
# Node ID e064e781d2552971dcdfcad947b10d6bf6756a49
# Parent  017e3d8526e02c1756a80c4a098a6c0b4df955e2# Parent  7cc05da7e35c76cc020f4c41beb58fc212c5d8d7
Merged.

diff -r 7cc05da7e35c -r e064e781d255 flys-artifacts/ChangeLog
--- 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:
diff -r 7cc05da7e35c -r e064e781d255 flys-artifacts/doc/conf/default-themes.xml
--- 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>
diff -r 7cc05da7e35c -r e064e781d255 flys-artifacts/doc/conf/second-themes.xml
--- 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>
diff -r 7cc05da7e35c -r e064e781d255 flys-artifacts/doc/conf/virtual-themes.xml
--- 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" />