# HG changeset patch
# User Raimund Renkert <rrenkert@intevation.de>
# Date 1369662214 -7200
# Node ID 439809f4d2b7c95d6b1224e28544cb93a0f9cdc0
# Parent  6815714c1f97ee080db0081458cb82cf9099cd3a
Merged theme config files default.xml and second.xml.

diff -r 6815714c1f97 -r 439809f4d2b7 artifacts/doc/conf/themes/default.xml
--- a/artifacts/doc/conf/themes/default.xml	Mon May 27 15:40:42 2013 +0200
+++ b/artifacts/doc/conf/themes/default.xml	Mon May 27 15:43:34 2013 +0200
@@ -1,5 +1,146 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <themegroup name="default">
+    <theme name="MainValuesQ">
+        <inherits>
+            <inherit from="Lines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Farbe"
+                default="200, 0, 15" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+            <field name="showlinelabel" type="boolean"
+                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="MainValuesW">
+        <inherits>
+            <inherit from="Lines" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Farbe"
+                default="0, 215, 0" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+            <field name="showlinelabel" type="boolean"
+                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
+
+    <theme name="RelativePoint">
+        <inherits>
+            <inherit from="Points" />
+        </inherits>
+    </theme>
+
+    <theme name="Annotations">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="Text" />
+        </inherits>
+        <fields>
+        </fields>
+    </theme>
+
+    <theme name="ManualPoints">
+        <inherits>
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" hints="hidden" />
+            <field name="textorientation" type="boolean" display="Textausrichtung"
+                default="true" />
+        </fields>
+    </theme>
+
+    <theme name="WKms">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="WKmsAnnotation">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" hints="h" />
+        </fields>
+    </theme>
+
+    <theme name="WQKms">
+        <inherits>
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="MinMaxPoints" />
+        </inherits>
+        <fields>
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="204, 204, 204" />
+        </fields>
+    </theme>
+
+    <theme name="WQPoints">
+        <inherits>
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Linienfarbe"
+                default="204, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="heightmarks_points">
+        <inherits>
+            <inherit from="Points" />
+            <inherit from="Label" />
+        </inherits>
+        <fields>
+            <field name="pointcolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" />
+        </fields>
+    </theme>
+
+    <theme name="Area">
+        <inherits>
+            <inherit from="Areas" />
+        </inherits>
+        <fields>
+            <field name="areashowbg" type="boolean" display="Hintergrund anzeigen"
+                default="true" hints="hidden" />
+            <field name="areashowborder" type="boolean" display="Begrenzung"
+                default="false" hints="hidden" />
+            <field name="areabordercolor" type="Color" default="0, 0, 0"
+                display="Begrenzungslinienfarbe" hints="hidden" />
+            <field name="showarea" type="boolean" display="Flaeche anzeigen"
+              default="true" hints="hidden" />
+            <field name="showarealabel" type="boolean"
+                display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
+    </theme>
     <!-- top level classes defining additional attributes-->
     <theme name="LongitudinalSection">
         <inherits>
@@ -1559,6 +1700,13 @@
         </inherits>
     </theme>
 
+    <theme name="Floodmarks">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
     <theme name="WSPLGEN">
         <inherits>
             <inherit from="Uesk" />
@@ -1604,6 +1752,14 @@
         </inherits>
     </theme>
 
+
+    <theme name="GaugeLocation">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
     <theme name="Qps">
         <inherits>
             <inherit from="MapLines" />
diff -r 6815714c1f97 -r 439809f4d2b7 artifacts/doc/conf/themes/second.xml
--- a/artifacts/doc/conf/themes/second.xml	Mon May 27 15:40:42 2013 +0200
+++ b/artifacts/doc/conf/themes/second.xml	Mon May 27 15:43:34 2013 +0200
@@ -141,10 +141,6 @@
                 display="Flächenbeschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
-
-
-
-
     <!-- top level classes defining additional attributes-->
     <theme name="LongitudinalSection">
         <inherits>
@@ -801,6 +797,26 @@
         </fields>
     </theme>
 
+    <theme name="LongitudinalSectionQInfoldCut">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="102, 102, 102" />
+        </fields>
+    </theme>
+
+    <theme name="LongitudinalSectionQInfolding">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="51, 51, 51" />
+        </fields>
+    </theme>
+
     <!-- MIDDLE BED HEIGHT -->
     <theme name="MiddleBedHeightSingle">
         <inherits>
@@ -954,6 +970,16 @@
         </fields>
     </theme>
 
+    <theme name="MorphologicWidth">
+        <inherits>
+            <inherit from="LongitudinalSection" />
+        </inherits>
+        <fields>
+            <field name="linecolor" type="Color" default="0, 100, 200" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="h" />
+        </fields>
+    </theme>
     <!-- Flow velocity -->
     <theme name="FlowVelocityVMainChannel">
         <inherits>
@@ -1059,7 +1085,7 @@
                 display="Beschriftung anzeigen" default="false" hints="h" />
         </fields>
     </theme>
-     <theme name="SedimentLoadTotal">
+    <theme name="SedimentLoadTotal">
         <inherits>
             <inherit from="LongitudinalSection" />
         </inherits>
@@ -1271,7 +1297,6 @@
 
 
 
-
     <theme name="DurationCurve">
         <inherits>
             <inherit from="Lines" />
@@ -1720,6 +1745,13 @@
         </inherits>
     </theme>
 
+    <theme name="Floodmarks">
+        <inherits>
+            <inherit from="MapLines" />
+            <inherit from="Symbol" />
+        </inherits>
+    </theme>
+
 
     <theme name="GaugeLocation">
         <inherits>
@@ -1728,7 +1760,6 @@
         </inherits>
     </theme>
 
-
     <theme name="Qps">
         <inherits>
             <inherit from="MapLines" />
@@ -1962,19 +1993,41 @@
 
     <theme name="SQMeasurements">
         <inherits>
+            <inherit from="Lines" />
             <inherit from="Points" />
         </inherits>
         <fields>
             <field name="pointcolor" type="Color" default="0, 153, 255" />
+            <field name="showlines" type="boolean" display="Linie anzeigen"
+                default="false" hints="hidden" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="1" hints="hidden" />
+            <field name="linetype" type="Dash" display="Linienart"
+                default="10" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" hints="hidden" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
     <theme name="SQOutliers">
         <inherits>
+            <inherit from="Lines" />
             <inherit from="Points" />
         </inherits>
         <fields>
             <field name="pointcolor" type="Color" default="204, 0, 0" />
+            <field name="showlines" type="boolean" display="Linie anzeigen"
+                default="false" hints="hidden" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="1" hints="hidden" />
+            <field name="linetype" type="Dash" display="Linienart"
+                default="10" hints="hidden" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 0" hints="hidden" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>