# HG changeset patch
# User gernotbelger
# Date 1519148612 -3600
# Node ID be0220889e1faf3359ce191e2b8443799e182c56
# Parent  863f2850dbcf3bfafa13c8304a08659539576d70
Moved comments to virtual.xml and configured sinfo themes

diff -r 863f2850dbcf -r be0220889e1f artifacts/doc/conf/themes/default.xml
--- a/artifacts/doc/conf/themes/default.xml	Mon Feb 19 18:04:25 2018 +0100
+++ b/artifacts/doc/conf/themes/default.xml	Tue Feb 20 18:43:32 2018 +0100
@@ -143,16 +143,12 @@
             <inherit from="Areas" />
         </inherits>
         <fields>
-            <!-- 'areashowbg': no code exits that reads it... -->
             <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
                 default="true" hints="hidden" />
-            <!-- FIXME: "areashowborder" does not exist, the constant in ThemeDocument is 'showborder" -->
             <field name="areashowborder" type="boolean" display="Begrenzung"
                 default="false" hints="hidden" />
-            <!-- 'areabordercolor' is not used in the code... -->
             <field name="areabordercolor" type="Color" default="0, 0, 0"
                 display="Begrenzungslinienfarbe" hints="hidden" />
-            <!-- 'showarea' is not used in the code... -->
             <field name="showarea" type="boolean" display="Flaeche anzeigen"
               default="true" hints="hidden" />
             <field name="showarealabel" type="boolean"
@@ -2880,7 +2876,7 @@
     <!-- S-INFO Flow-Depth Themes -->
     <theme name="SInfoFlowDepth">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="LongitudinalSectionW" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
@@ -2888,27 +2884,31 @@
     </theme>
     <theme name="SInfoFlowDepthTkh">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="LongitudinalSectionW" />
         </inherits>
         <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 128" />
+            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255" />
         </fields>
     </theme>
     <theme name="SInfoTkh">
         <inherits>
-            <inherit from="LongitudinalSectionArea" />
+            <inherit from="LongitudinalSection" />
         </inherits>
         <fields>
             <field name="calculateRange" type="boolean" display="Ausdehnung berechnen" default="true" hints="hidden" />
-            
-            <field name="showborder" type="boolean" display="Begrenzung" default="true" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe" default="241, 195, 155" />
-            <field name="linesize" type="int" display="Liniendicke" default="2"/>
-            
-            <field name="areabgcolor" type="Color" default="241, 195, 155" display="Füllfarbe" />            
-            <field name="areatransparency" type="int" default="85"  />
-            
+
+            <!-- Areas use 'showborder' instead of showlines (but inconsistently uses 'linecolor' and 'linesize'), so we hide 'showline' and replace it with 'showbordder' -->
+            <field name="showlines" type="boolean" display="Linie anzeigen" default="true" hints="hidden"/>
+            <field name="showborder" type="boolean" display="Linien anzeigen" default="true" />
+            <field name="linecolor" type="Color" display="Linienfarbe" default="228, 108, 10" />
+            <field name="linesize" type="int" display="Liniendicke" default="1"/>
+
+            <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" />
+            <field name="areabgcolor" type="Color" default="245, 245, 220" display="Füllfarbe" />            
+            <field name="areabgpattern" type="areapattern" default="pattern1" display="Flächenfarbe" />            
+            <field name="areatransparency" type="int" default="10"  />
+
             <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" hint="hidden"/>
         </fields>
     </theme>
-</themegroup>
+</themegroup>
\ No newline at end of file
diff -r 863f2850dbcf -r be0220889e1f artifacts/doc/conf/themes/second.xml
--- a/artifacts/doc/conf/themes/second.xml	Mon Feb 19 18:04:25 2018 +0100
+++ b/artifacts/doc/conf/themes/second.xml	Tue Feb 20 18:43:32 2018 +0100
@@ -956,6 +956,7 @@
             <field name="pointcolor" type="Color" display="Punktfarbe" default="0, 255, 0" />
         </fields>
     </theme>
+
     <theme name="PorosityTopLines">
         <inherits>
             <inherit from="LongitudinalSection" />
@@ -2495,15 +2496,6 @@
         </fields>
     </theme>
 
-    <theme name="MySQCurve">
-        <inherits>
-            <inherit from="SQCurve" />
-        </inherits>
-        <fields>
-            <field name="linecolor" type="Color" default="255, 0, 0" />
-        </fields>
-    </theme>
-
     <theme name="SQMeasurementsA">
         <inherits>
             <inherit from="SQMeasurements" />
@@ -2869,40 +2861,42 @@
             <field name="linecolor" type="color" default="175, 175, 175" />
         </fields>
     </theme>
-    
+
     <!-- S-INFO Flow-Depth Themes -->
     <theme name="SInfoFlowDepth">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="LongitudinalSectionW" />
         </inherits>
         <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 255" />
+            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" />
         </fields>
     </theme>
     <theme name="SInfoFlowDepthTkh">
         <inherits>
+            <inherit from="LongitudinalSectionW" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe" default="0, 204, 255" />
+        </fields>
+    </theme>
+    <theme name="SInfoTkh">
+        <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
         <fields>
-            <field name="linecolor" type="Color" display="Linienfarbe"
-                default="0, 0, 128" />
-        </fields>
-    </theme>
-    <theme name="SInfoTkh">
-        <inherits>
-            <inherit from="LongitudinalSectionArea" />
-        </inherits>
-        <fields>
             <field name="calculateRange" type="boolean" display="Ausdehnung berechnen" default="true" hints="hidden" />
-            
-            <field name="showborder" type="boolean" display="Begrenzung" default="true" hints="hidden" />
-            <field name="linecolor" type="Color" display="Linienfarbe" default="241, 195, 155" />
-            <field name="linesize" type="int" display="Liniendicke" default="2"/>
-            
-            <field name="areabgcolor" type="Color" default="241, 195, 155" display="Füllfarbe" />            
-            <field name="areatransparency" type="int" default="85"  />
-            
+
+            <!-- Areas use 'showborder' instead of showlines (but inconsistently uses 'linecolor' and 'linesize'), so we hide 'showline' and replace it with 'showbordder' -->
+            <field name="showlines" type="boolean" display="Linie anzeigen" default="true" hints="hidden"/>
+            <field name="showborder" type="boolean" display="Linien anzeigen" default="true" />
+            <field name="linecolor" type="Color" display="Linienfarbe" default="228, 108, 10" />
+            <field name="linesize" type="int" display="Liniendicke" default="1"/>
+
+            <field name="showarea" type="boolean" display="Flaeche anzeigen" default="true" />
+            <field name="areabgcolor" type="Color" default="245, 245, 220" display="Füllfarbe" />            
+            <field name="areabgpattern" type="areapattern" default="pattern1" display="Flächenfarbe" />            
+            <field name="areatransparency" type="int" default="10"  />
+
             <field name="showarealabel" type="boolean" display="Flächenbeschriftung anzeigen" default="false" hint="hidden"/>
         </fields>
     </theme>
diff -r 863f2850dbcf -r be0220889e1f artifacts/doc/conf/themes/virtual.xml
--- a/artifacts/doc/conf/themes/virtual.xml	Mon Feb 19 18:04:25 2018 +0100
+++ b/artifacts/doc/conf/themes/virtual.xml	Tue Feb 20 18:43:32 2018 +0100
@@ -79,16 +79,20 @@
 
     <theme name="Areas" type="virtual">
         <fields>
+            <!-- 'showarea' is not used in the code... -->        
             <field name="showarea" type="boolean" display="Flaeche anzeigen"
                 default="true" />
             <field name="showarealabel" type="boolean"
                 display="Flaechenbeschriftung anzeigen" default="false" />
             <field name="areabgcolor" type="Color" display="Fuellfarbe"
                 default="0, 100, 0" />
+            <!-- 'areashowbg': no code exits that reads it... -->                
             <field name="areashowbg" type="boolean"
                 display="Hintergrund anzeigen" default="true" hidden="true" />
+            <!-- FIXME: "areashowborder" does not exist, the constant in ThemeDocument is 'showborder" -->
             <field name="areashowborder" type="boolean"
                 display="Flaechebegrenzungslinie anzeigen" default="false" />
+            <!-- 'areabordercolor' is not used in the code..., implementation uses 'linecolor' -->                
             <field name="areabordercolor" type="Color" default="0, 0, 0"
                 display="Begrenzungslinienfarbe" />
             <field name="areatransparency" type="int" default="50" display="Transparenz" />