# HG changeset patch
# User Sascha L. Teichmann <teichmann@intevation.de>
# Date 1355763543 -3600
# Node ID 0ba0f3e4f4c200398f0b308506f4d91a9e392bc2
# Parent  756aba0d2a7acc8e00111aba7f93ead8106268b0# Parent  dfac28805d7952496a629ea64f3ff2cfa5a9b0fe
Merged

diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes.xml
--- a/flys-artifacts/doc/conf/themes.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -5,6 +5,7 @@
     <!ENTITY longitudinal-section SYSTEM "conf/themes/default/longitudinal-section.xml">
     <!ENTITY cross-section SYSTEM "conf/themes/default/cross-section.xml">
     <!ENTITY discharge SYSTEM "conf/themes/default/discharge.xml">
+    <!ENTITY duration SYSTEM "conf/themes/default/duration.xml">
     <!ENTITY fixings SYSTEM "conf/themes/default/fixings.xml">
     <!ENTITY floodmap SYSTEM "conf/themes/default/floodmap.xml">
     <!ENTITY historical-discharge SYSTEM "conf/themes/default/historical-discharge.xml">
@@ -15,6 +16,7 @@
     <!ENTITY longitudinal-section_sec SYSTEM "conf/themes/second/longitudinal-section.xml">
     <!ENTITY cross-section_sec SYSTEM "conf/themes/second/cross-section.xml">
     <!ENTITY discharge_sec SYSTEM "conf/themes/second/discharge.xml">
+    <!ENTITY duration_sec SYSTEM "conf/themes/second/duration.xml">
     <!ENTITY fixings_sec SYSTEM "conf/themes/second/fixings.xml">
     <!ENTITY floodmap_sec SYSTEM "conf/themes/second/floodmap.xml">
     <!ENTITY historical-discharge_sec SYSTEM "conf/themes/second/historical-discharge.xml">
@@ -28,6 +30,7 @@
       &longitudinal-section;
       &cross-section;
       &discharge;
+      &duration;
       &fixings;
       &floodmap;
       &historical-discharge;
@@ -39,6 +42,7 @@
       &longitudinal-section_sec;
       &cross-section_sec;
       &discharge_sec;
+      &duration_sec;
       &fixings_sec;
       &floodmap_sec;
       &historical-discharge_sec;
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes/default/cross-section.xml
--- a/flys-artifacts/doc/conf/themes/default/cross-section.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/default/cross-section.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -4,6 +4,7 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
@@ -18,6 +19,7 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
         </inherits>
         <fields>
             <field name="showpoints" type="boolean" display="Punkte anzeigen"
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes/default/discharge.xml
--- a/flys-artifacts/doc/conf/themes/default/discharge.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/default/discharge.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -4,6 +4,7 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
@@ -22,13 +23,18 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0, 0, 153" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="hidden" />
+                default="2" />
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
@@ -68,24 +74,39 @@
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0, 0, 153" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="hidden" />
+                default="2" />
         </fields>
     </theme>
 
     <theme name="ExtremeWQCurve">
         <inherits>
-            <inherit from="DischargeCurve" />
+            <inherit from="Lines" />
+            <inherit from="MinMaxPoints" />
         </inherits>
-        <field name="showextramark" type="boolean" display="Linie anzeigen ab wo extrapoliert wurde"
-            default="true" hidden="true" />
+        <fields>
+            <field name="showextramark" type="boolean" display="Linie anzeigen ab wo extrapoliert wurde"
+                default="true" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 153" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="2" />
+            <field name="showlinelabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />           
+        </fields>
     </theme>
 
     <theme name="ExtremeWQBaseCurve">
         <inherits>
+            <inherit from="Lines" />
             <inherit from="Points" />
-            <inherit from="Label" />
         </inherits>
-        <field name="pointsize" type="int" display="Punktdicke"
-            default="2" hidden="true" />
+        <fields>
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="2" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showlinelabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
     </theme>
 <!--/themegroup-->
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes/default/duration.xml
--- a/flys-artifacts/doc/conf/themes/default/duration.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/default/duration.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -5,13 +5,14 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
             <field name="showpoints" type="boolean" display="Punkte anzeigen"
                 default="false" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="hidden" />
+                default="2" />
             <field name="showpointlabel" type="boolean"
                 display="Punktbeschriftung anzeigen" default="false"
                 hints="hidden"/>
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes/default/general.xml
--- a/flys-artifacts/doc/conf/themes/default/general.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/default/general.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -3,38 +3,28 @@
     <theme name="MainValuesQ">
         <inherits>
             <inherit from="Lines" />
-            <inherit from="Text" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Farbe"
                 default="200, 0, 15" />
-            <field name="textcolor" type="Color" display="Farbe"
-                default="200, 0, 15" />
-            <field name="showhorizontalline" type="boolean"
-                display="Horizontale Linie" default="true" />
-            <field name="showverticalline" type="boolean" display="Vertikale Linie"
-                default="true" />
             <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" />
-            <inherit from="Text" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Farbe"
                 default="0, 215, 0" />
-            <field name="textcolor" type="Color" display="Farbe"
-                default="0, 215, 0" />
-            <field name="showhorizontalline" type="boolean"
-                display="Horizontale Linie" default="true" />
-            <field name="showverticalline" type="boolean" display="Vertikale Linie"
-                default="true" />
             <field name="textorientation" type="boolean" display="Textausrichtung"
                 default="true" />
+            <field name="showlinelabel" type="boolean"
+                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes/default/historical-discharge.xml
--- a/flys-artifacts/doc/conf/themes/default/historical-discharge.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/default/historical-discharge.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -9,7 +9,7 @@
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0, 0, 153" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="hidden" />
+                default="2" />
         </fields>
     </theme>
 
@@ -19,6 +19,10 @@
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
@@ -30,6 +34,10 @@
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="204, 204, 204" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
@@ -41,6 +49,10 @@
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="100, 100, 153" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
@@ -52,6 +64,10 @@
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="250, 250, 204" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
@@ -62,74 +78,63 @@
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0, 0, 204" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" />
         </fields>
     </theme>
 
     <theme name="HistoricalDischargeWQW">
+        <!-- the facet has no styling...
         <inherits>
             <inherit from="HistoricalDischargeCurve" />
+            <inherit from="Label" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0, 0, 255" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="hidden" />
+                default="1" />
             <field name="linetype" type="Dash" display="Linienart"
-                default="10" hints="hidden" />
+                default="10" />
             <field name="showlines" type="boolean" display="Linie anzeigen"
                 default="true" hints="hidden" />
             <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" hints="hidden" />
+                default="false" />
             <field name="pointsize" type="int" display="Punktdicke"
-                default="5" hints="hidden" />
+                default="3" />
             <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" />
+            <field name="showpointlabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="labelfontface" type="Font"
-                display="Beschriftung: Schriftart" default="arial" hints="hidden"/>
-            <field name="labelfontcolor" type="Color"
-                display="Beschriftung: Schriftfarbe" default="0, 0, 0" hints="hidden" />
-            <field name="labelfontsize" type="int"
-                display="Beschriftung: Schriftgröße" default="10" hints="hidden" />
-            <field name="labelfontstyle" type="Style"
-                display="Beschriftung: Schriftstil" default="standard" hints="hidden" />
-            <field name="labelbgcolor" type="Color"
-                display="Beschriftung: Hintergrundfarbe" default="0, 0, 0" hints="hidden" />
-            <field name="labelshowbg" type="boolean"
-                display="Beschriftung: Hintergrund füllen" default="false" hints="hidden" />
-        </fields>
+        </fields>-->
     </theme>
 
     <theme name="HistoricalDischargeWQQ">
         <inherits>
             <inherit from="HistoricalDischargeCurve" />
+            <inherit from="Label" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="204, 204, 204" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="hidden" />
+                default="1" />
             <field name="linetype" type="Dash" display="Linienart"
-                default="10" hints="hidden" />
+                default="10" />
             <field name="showlines" type="boolean" display="Linie anzeigen"
                 default="true" hints="hidden" />
             <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" hints="hidden" />
+                default="false" />
             <field name="pointsize" type="int" display="Punktdicke"
-                default="5" hints="hidden" />
+                default="3" />
             <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" />
+            <field name="showpointlabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="labelfontface" type="Font"
-                display="Beschriftung: Schriftart" default="arial" hints="hidden" />
-            <field name="labelfontcolor" type="Color"
-                display="Beschriftung: Schriftfarbe" default="0, 0, 0" hints="hidden" />
-            <field name="labelfontsize" type="int"
-                display="Beschriftung: Schriftgröße" default="10" hints="hidden" />
-            <field name="labelfontstyle" type="Style"
-                display="Beschriftung: Schriftstil" default="standard" hints="hidden" />
-            <field name="labelbgcolor" type="Color"
-                display="Beschriftung: Hintergrundfarbe" default="0, 0, 0" hints="hidden" />
-            <field name="labelshowbg" type="boolean"
-                display="Beschriftung: Hintergrund füllen" default="false" hints="hidden" />
         </fields>
     </theme>
 <!--/themegroup-->
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes/default/reference.xml
--- a/flys-artifacts/doc/conf/themes/default/reference.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/default/reference.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -4,6 +4,7 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes/second/cross-section.xml
--- a/flys-artifacts/doc/conf/themes/second/cross-section.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/second/cross-section.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -4,6 +4,7 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
@@ -18,6 +19,7 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
         </inherits>
         <fields>
             <field name="showpoints" type="boolean" display="Punkte anzeigen"
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes/second/discharge.xml
--- a/flys-artifacts/doc/conf/themes/second/discharge.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/second/discharge.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -4,6 +4,7 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
@@ -22,13 +23,18 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0, 0, 153" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="hidden" />
+                default="2" />
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
@@ -68,24 +74,39 @@
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0, 0, 153" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="hidden" />
+                default="2" />
         </fields>
     </theme>
 
     <theme name="ExtremeWQCurve">
         <inherits>
-            <inherit from="DischargeCurve" />
+            <inherit from="Lines" />
+            <inherit from="MinMaxPoints" />
         </inherits>
-        <field name="showextramark" type="boolean" display="Linie anzeigen ab wo extrapoliert wurde"
-            default="true" hidden="true" />
+        <fields>
+            <field name="showextramark" type="boolean" display="Linie anzeigen ab wo extrapoliert wurde"
+                default="true" />
+            <field name="linecolor" type="Color" display="Linienfarbe"
+                default="0, 0, 153" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="2" />
+            <field name="showlinelabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />           
+        </fields>
     </theme>
 
     <theme name="ExtremeWQBaseCurve">
         <inherits>
+            <inherit from="Lines" />
             <inherit from="Points" />
-            <inherit from="Label" />
         </inherits>
-        <field name="pointsize" type="int" display="Punktdicke"
-            default="2" hidden="true" />
+        <fields>
+            <field name="pointsize" type="int" display="Punktdicke"
+                default="2" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showlinelabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
+        </fields>
     </theme>
 <!--/themegroup-->
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes/second/duration.xml
--- a/flys-artifacts/doc/conf/themes/second/duration.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/second/duration.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -5,13 +5,14 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
             <field name="showpoints" type="boolean" display="Punkte anzeigen"
                 default="false" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="hidden" />
+                default="2" />
             <field name="showpointlabel" type="boolean"
                 display="Punktbeschriftung anzeigen" default="false"
                 hints="hidden"/>
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes/second/general.xml
--- a/flys-artifacts/doc/conf/themes/second/general.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/second/general.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -3,38 +3,28 @@
     <theme name="MainValuesQ">
         <inherits>
             <inherit from="Lines" />
-            <inherit from="Text" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Farbe"
                 default="200, 0, 15" />
-            <field name="textcolor" type="Color" display="Farbe"
-                default="200, 0, 15" />
-            <field name="showhorizontalline" type="boolean"
-                display="Horizontale Linie" default="true" />
-            <field name="showverticalline" type="boolean" display="Vertikale Linie"
-                default="true" />
             <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" />
-            <inherit from="Text" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Farbe"
                 default="0, 215, 0" />
-            <field name="textcolor" type="Color" display="Farbe"
-                default="0, 215, 0" />
-            <field name="showhorizontalline" type="boolean"
-                display="Horizontale Linie" default="true" />
-            <field name="showverticalline" type="boolean" display="Vertikale Linie"
-                default="true" />
             <field name="textorientation" type="boolean" display="Textausrichtung"
                 default="true" />
+            <field name="showlinelabel" type="boolean"
+                display="Linienbeschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes/second/historical-discharge.xml
--- a/flys-artifacts/doc/conf/themes/second/historical-discharge.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/second/historical-discharge.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -9,7 +9,7 @@
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0, 0, 153" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="2" hints="hidden" />
+                default="2" />
         </fields>
     </theme>
 
@@ -19,6 +19,10 @@
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
@@ -30,6 +34,10 @@
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="204, 204, 204" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
@@ -41,6 +49,10 @@
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="100, 100, 153" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
@@ -52,6 +64,10 @@
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="250, 250, 204" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
@@ -62,74 +78,63 @@
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0, 0, 204" />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpointlabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" hints="hidden" />
+            <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
+                default="false" />
         </fields>
     </theme>
 
     <theme name="HistoricalDischargeWQW">
+        <!-- the facet has no styling...
         <inherits>
             <inherit from="HistoricalDischargeCurve" />
+            <inherit from="Label" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="0, 0, 255" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="hidden" />
+                default="1" />
             <field name="linetype" type="Dash" display="Linienart"
-                default="10" hints="hidden" />
+                default="10" />
             <field name="showlines" type="boolean" display="Linie anzeigen"
                 default="true" hints="hidden" />
             <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" hints="hidden" />
+                default="false" />
             <field name="pointsize" type="int" display="Punktdicke"
-                default="5" hints="hidden" />
+                default="3" />
             <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" />
+            <field name="showpointlabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="labelfontface" type="Font"
-                display="Beschriftung: Schriftart" default="arial" hints="hidden"/>
-            <field name="labelfontcolor" type="Color"
-                display="Beschriftung: Schriftfarbe" default="0, 0, 0" hints="hidden" />
-            <field name="labelfontsize" type="int"
-                display="Beschriftung: Schriftgröße" default="10" hints="hidden" />
-            <field name="labelfontstyle" type="Style"
-                display="Beschriftung: Schriftstil" default="standard" hints="hidden" />
-            <field name="labelbgcolor" type="Color"
-                display="Beschriftung: Hintergrundfarbe" default="0, 0, 0" hints="hidden" />
-            <field name="labelshowbg" type="boolean"
-                display="Beschriftung: Hintergrund füllen" default="false" hints="hidden" />
-        </fields>
+        </fields>-->
     </theme>
 
     <theme name="HistoricalDischargeWQQ">
         <inherits>
             <inherit from="HistoricalDischargeCurve" />
+            <inherit from="Label" />
         </inherits>
         <fields>
             <field name="linecolor" type="Color" display="Linienfarbe"
                 default="204, 204, 204" />
             <field name="linesize" type="int" display="Liniendicke"
-                default="1" hints="hidden" />
+                default="1" />
             <field name="linetype" type="Dash" display="Linienart"
-                default="10" hints="hidden" />
+                default="10" />
             <field name="showlines" type="boolean" display="Linie anzeigen"
                 default="true" hints="hidden" />
             <field name="showpoints" type="boolean" display="Datenpunkte anzeigen"
-                default="false" hints="hidden" />
+                default="false" />
             <field name="pointsize" type="int" display="Punktdicke"
-                default="5" hints="hidden" />
+                default="3" />
             <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" />
+            <field name="showpointlabel" type="boolean"
                 display="Beschriftung anzeigen" default="false" hints="hidden" />
-            <field name="labelfontface" type="Font"
-                display="Beschriftung: Schriftart" default="arial" hints="hidden" />
-            <field name="labelfontcolor" type="Color"
-                display="Beschriftung: Schriftfarbe" default="0, 0, 0" hints="hidden" />
-            <field name="labelfontsize" type="int"
-                display="Beschriftung: Schriftgröße" default="10" hints="hidden" />
-            <field name="labelfontstyle" type="Style"
-                display="Beschriftung: Schriftstil" default="standard" hints="hidden" />
-            <field name="labelbgcolor" type="Color"
-                display="Beschriftung: Hintergrundfarbe" default="0, 0, 0" hints="hidden" />
-            <field name="labelshowbg" type="boolean"
-                display="Beschriftung: Hintergrund füllen" default="false" hints="hidden" />
         </fields>
     </theme>
 <!--/themegroup-->
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-artifacts/doc/conf/themes/second/reference.xml
--- a/flys-artifacts/doc/conf/themes/second/reference.xml	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-artifacts/doc/conf/themes/second/reference.xml	Mon Dec 17 17:59:03 2012 +0100
@@ -4,6 +4,7 @@
         <inherits>
             <inherit from="Lines" />
             <inherit from="Points" />
+            <inherit from="Label" />
             <inherit from="MinMaxPoints" />
         </inherits>
         <fields>
diff -r 756aba0d2a7a -r 0ba0f3e4f4c2 flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java	Mon Dec 17 17:57:32 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java	Mon Dec 17 17:59:03 2012 +0100
@@ -214,6 +214,9 @@
             public void onClick(ClickEvent e) {
                 // TODO Fix this, for whatever reason it doesnt work
                 // (always valid).
+                if (df == null) {
+                    return;
+                }
                 if (!df.hasErrors() && df.validate()) {
                     saveStyle();
                 }