# HG changeset patch
# User Raimund Renkert <rrenkert@intevation.de>
# Date 1355754667 -3600
# Node ID ffe273af84fb2e5b144fb33f0877637b257ff8ac
# Parent  f59fbc9bd04a9a87dd0257afd9d7e7347fbb78a1
Updated fixing  and virutal area themes.

diff -r f59fbc9bd04a -r ffe273af84fb flys-artifacts/doc/conf/themes/default/fixings.xml
--- a/flys-artifacts/doc/conf/themes/default/fixings.xml	Mon Dec 17 15:27:16 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/default/fixings.xml	Mon Dec 17 15:31:07 2012 +0100
@@ -18,18 +18,30 @@
             <inherit from="Label" />
         </inherits>
         <fields>
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="true" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" hints="hidden" />
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" />
         </fields>
     </theme>
 
     <theme name="FixAreas">
         <inherits>
             <inherit from="Areas" />
-            <inherit from="Label" />
         </inherits>
         <fields>
-            <field name="transparency" type="int" default="80" display="Transparenz"/>
+            <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>
 
@@ -225,49 +237,50 @@
 
     <theme name="FixingSectorDeviationLS0">
         <inherits>
-            <inherit from="Areas" />
+            <inherit from="FixAreas" />
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" display="Fuellfarbe"
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
                 default="0, 128, 0" />
         </fields>
     </theme>
     <theme name="FixingSectorDeviationLS1">
         <inherits>
-            <inherit from="Areas" />
+            <inherit from="FixAreas" />
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" display="Fuellfarbe"
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
                 default="0, 0, 255" />
+
         </fields>
     </theme>
 
     <theme name="FixingSectorDeviationLS2">
         <inherits>
-            <inherit from="Areas" />
+            <inherit from="FixAreas" />
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" display="Fuellfarbe"
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
                 default="255, 0, 255" />
         </fields>
     </theme>
 
     <theme name="FixingSectorDeviationLS3">
         <inherits>
-            <inherit from="Areas" />
+            <inherit from="FixAreas" />
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" display="Fuellfarbe"
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
                 default="255, 0, 0" />
         </fields>
     </theme>
 
     <theme name="FixLSDeviation">
         <inherits>
-            <inherit from="Areas" />
+            <inherit from="FixAreas" />
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" display="Fuellfarbe"
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
                 default="100, 100, 100" />
         </fields>
     </theme>
@@ -295,7 +308,7 @@
             <inherit from="FixAreas"/>
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/>
+            <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/>
         </fields>
     </theme>
 
@@ -304,7 +317,7 @@
             <inherit from="FixAreas"/>
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" default="255, 0, 0" display="Füllfarbe" />
+            <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe" />
         </fields>
     </theme>
 
@@ -313,7 +326,7 @@
             <inherit from="FixAreas"/>
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" default="0, 0, 255" display="Füllfarbe" />
+            <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe" />
         </fields>
     </theme>
 
diff -r f59fbc9bd04a -r ffe273af84fb flys-artifacts/doc/conf/themes/second/fixings.xml
--- a/flys-artifacts/doc/conf/themes/second/fixings.xml	Mon Dec 17 15:27:16 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/second/fixings.xml	Mon Dec 17 15:31:07 2012 +0100
@@ -18,18 +18,30 @@
             <inherit from="Label" />
         </inherits>
         <fields>
-            <field name="showlinelabel" type="boolean"
-                display="Beschriftung anzeigen" default="true" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" hints="hidden" />
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="3" />
         </fields>
     </theme>
 
     <theme name="FixAreas">
         <inherits>
             <inherit from="Areas" />
-            <inherit from="Label" />
         </inherits>
         <fields>
-            <field name="transparency" type="int" default="80" display="Transparenz"/>
+            <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>
 
@@ -225,49 +237,50 @@
 
     <theme name="FixingSectorDeviationLS0">
         <inherits>
-            <inherit from="Areas" />
+            <inherit from="FixAreas" />
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" display="Fuellfarbe"
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
                 default="0, 128, 0" />
         </fields>
     </theme>
     <theme name="FixingSectorDeviationLS1">
         <inherits>
-            <inherit from="Areas" />
+            <inherit from="FixAreas" />
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" display="Fuellfarbe"
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
                 default="0, 0, 255" />
+
         </fields>
     </theme>
 
     <theme name="FixingSectorDeviationLS2">
         <inherits>
-            <inherit from="Areas" />
+            <inherit from="FixAreas" />
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" display="Fuellfarbe"
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
                 default="255, 0, 255" />
         </fields>
     </theme>
 
     <theme name="FixingSectorDeviationLS3">
         <inherits>
-            <inherit from="Areas" />
+            <inherit from="FixAreas" />
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" display="Fuellfarbe"
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
                 default="255, 0, 0" />
         </fields>
     </theme>
 
     <theme name="FixLSDeviation">
         <inherits>
-            <inherit from="Areas" />
+            <inherit from="FixAreas" />
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" display="Fuellfarbe"
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
                 default="100, 100, 100" />
         </fields>
     </theme>
@@ -295,7 +308,7 @@
             <inherit from="FixAreas"/>
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/>
+            <field name="areabgcolor" type="Color" default="0, 0, 0" display="Füllfarbe"/>
         </fields>
     </theme>
 
@@ -304,7 +317,7 @@
             <inherit from="FixAreas"/>
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" default="255, 0, 0" display="Füllfarbe" />
+            <field name="areabgcolor" type="Color" default="255, 0, 0" display="Füllfarbe" />
         </fields>
     </theme>
 
@@ -313,7 +326,7 @@
             <inherit from="FixAreas"/>
         </inherits>
         <fields>
-            <field name="backgroundcolor" type="Color" default="0, 0, 255" display="Füllfarbe" />
+            <field name="areabgcolor" type="Color" default="0, 0, 255" display="Füllfarbe" />
         </fields>
     </theme>
 
diff -r f59fbc9bd04a -r ffe273af84fb flys-artifacts/doc/conf/themes/virtual.xml
--- a/flys-artifacts/doc/conf/themes/virtual.xml	Mon Dec 17 15:27:16 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/virtual.xml	Mon Dec 17 15:31:07 2012 +0100
@@ -68,9 +68,11 @@
 
     <theme name="Areas" type="virtual">
         <fields>
-            <field name="showarea" type="boolean" display="Fläche anzeigen"
+            <field name="showarea" type="boolean" display="Flaeche anzeigen"
                 default="true" />
-            <field name="areabgcolor" type="Color" display="Füllfarbe"
+            <field name="showarealabel" type="boolean"
+                display="Flaechenbeschriftung anzeigen" default="false" />
+            <field name="areabgcolor" type="Color" display="Fuellfarbe"
                 default="0, 100, 0" />
             <field name="areashowbg" type="boolean"
                 display="Hintergrund anzeigen" default="true" hidden="true" />