diff --git a/src/kdefrontend/ui/dockwidgets/xycurvedock.ui b/src/kdefrontend/ui/dockwidgets/xycurvedock.ui
index 1dd9f24eb..3c6d12229 100644
--- a/src/kdefrontend/ui/dockwidgets/xycurvedock.ui
+++ b/src/kdefrontend/ui/dockwidgets/xycurvedock.ui
@@ -1,1453 +1,1453 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>XYCurveDock</class>
  <widget class="QWidget" name="XYCurveDock">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>436</width>
     <height>873</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>0</number>
    </property>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tabGeneral">
       <attribute name="title">
        <string>General</string>
       </attribute>
      </widget>
      <widget class="QWidget" name="tabLine">
       <attribute name="title">
        <string>Line</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_4">
        <item row="0" column="0">
         <widget class="QLabel" name="lValuesGeneral_2">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>Connection</string>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="lLineType">
          <property name="text">
           <string>Type:</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>10</width>
-           <height>23</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="1" column="2">
         <widget class="KComboBox" name="cbLineType">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="lLineInterpolationPointsCount">
          <property name="toolTip">
           <string/>
          </property>
          <property name="text">
           <string>Interm. points:</string>
          </property>
         </widget>
        </item>
        <item row="2" column="2">
         <widget class="QSpinBox" name="sbLineInterpolationPointsCount">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="toolTip">
           <string>intermediate points to evaluate between each two points</string>
          </property>
          <property name="minimum">
           <number>1</number>
          </property>
         </widget>
        </item>
        <item row="3" column="0">
         <widget class="QLabel" name="lLineSkipGaps">
          <property name="text">
           <string>Ignore gaps:</string>
          </property>
         </widget>
        </item>
        <item row="5" column="2">
         <widget class="KComboBox" name="cbLineStyle"/>
        </item>
        <item row="3" column="2">
         <widget class="QCheckBox" name="chkLineSkipGaps">
          <property name="text">
           <string/>
          </property>
         </widget>
        </item>
        <item row="5" column="0">
         <widget class="QLabel" name="lLineStyle">
          <property name="text">
           <string>Style:</string>
          </property>
         </widget>
        </item>
        <item row="6" column="2">
         <widget class="KColorButton" name="kcbLineColor">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="6" column="0">
         <widget class="QLabel" name="lLineColor">
          <property name="text">
           <string>Color:</string>
          </property>
         </widget>
        </item>
        <item row="7" column="0">
         <widget class="QLabel" name="lLineWidth">
          <property name="text">
           <string>Width:</string>
          </property>
         </widget>
        </item>
        <item row="7" column="2">
         <widget class="QDoubleSpinBox" name="sbLineWidth">
          <property name="suffix">
           <string> pt</string>
          </property>
          <property name="singleStep">
           <double>0.500000000000000</double>
          </property>
         </widget>
        </item>
        <item row="8" column="0">
         <widget class="QLabel" name="lLineOpacity">
          <property name="text">
           <string>Opacity:</string>
          </property>
         </widget>
        </item>
        <item row="8" column="2">
         <widget class="QSpinBox" name="sbLineOpacity">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="toolTip">
           <string>The opacity ranges from 0 to 100, where 0 is fully transparent and 100 is fully opaque.</string>
          </property>
          <property name="suffix">
           <string> %</string>
          </property>
          <property name="minimum">
           <number>0</number>
          </property>
          <property name="maximum">
           <number>100</number>
          </property>
          <property name="singleStep">
           <number>10</number>
          </property>
          <property name="value">
           <number>100</number>
          </property>
         </widget>
        </item>
        <item row="9" column="0">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>32</width>
            <height>18</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="11" column="2">
         <widget class="KComboBox" name="cbDropLineType">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="10" column="0">
         <widget class="QLabel" name="lDropLines">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>Drop lines</string>
          </property>
         </widget>
        </item>
        <item row="11" column="0">
         <widget class="QLabel" name="lDropLineType">
          <property name="text">
           <string>Type:</string>
          </property>
         </widget>
        </item>
        <item row="12" column="2">
         <widget class="KComboBox" name="cbDropLineStyle"/>
        </item>
        <item row="12" column="0">
         <widget class="QLabel" name="lDropLineStyle">
          <property name="text">
           <string>Style:</string>
          </property>
         </widget>
        </item>
        <item row="13" column="2">
         <widget class="KColorButton" name="kcbDropLineColor">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="13" column="0">
         <widget class="QLabel" name="lDropLineColor">
          <property name="text">
           <string>Color:</string>
          </property>
         </widget>
        </item>
        <item row="14" column="0">
         <widget class="QLabel" name="lDropLineWidth">
          <property name="text">
           <string>Width:</string>
          </property>
         </widget>
        </item>
        <item row="14" column="2">
         <widget class="QDoubleSpinBox" name="sbDropLineWidth">
          <property name="suffix">
           <string> pt</string>
          </property>
          <property name="singleStep">
           <double>0.500000000000000</double>
          </property>
         </widget>
        </item>
        <item row="15" column="0">
         <widget class="QLabel" name="lDropLineOpacity">
          <property name="text">
           <string>Opacity:</string>
          </property>
         </widget>
        </item>
        <item row="15" column="2">
         <widget class="QSpinBox" name="sbDropLineOpacity">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="toolTip">
           <string>The opacity ranges from 0 to 100, where 0 is fully transparent and 100 is fully opaque.</string>
          </property>
          <property name="suffix">
           <string> %</string>
          </property>
          <property name="minimum">
           <number>0</number>
          </property>
          <property name="maximum">
           <number>100</number>
          </property>
          <property name="singleStep">
           <number>10</number>
          </property>
          <property name="value">
           <number>100</number>
          </property>
         </widget>
        </item>
        <item row="16" column="0">
         <spacer name="verticalSpacer_5">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>18</width>
            <height>264</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="4" column="2">
         <widget class="QCheckBox" name="chkLineIncreasingXOnly">
          <property name="text">
           <string/>
          </property>
         </widget>
        </item>
        <item row="4" column="0">
         <widget class="QLabel" name="lLineIncreasingXOnly">
          <property name="text">
           <string>Monoton incr. X:</string>
          </property>
         </widget>
        </item>
+       <item row="5" column="1">
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>10</width>
+           <height>23</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabSymbol">
       <attribute name="title">
        <string>Symbol</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout">
        <item row="3" column="2">
         <widget class="QSpinBox" name="sbSymbolRotation">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="toolTip">
           <string/>
          </property>
          <property name="suffix">
           <string>°</string>
          </property>
          <property name="minimum">
           <number>-360</number>
          </property>
          <property name="maximum">
           <number>360</number>
          </property>
          <property name="singleStep">
           <number>10</number>
          </property>
          <property name="value">
           <number>0</number>
          </property>
         </widget>
        </item>
        <item row="4" column="0">
         <widget class="QLabel" name="lSymbolOpacity">
          <property name="text">
           <string>Opacity:</string>
          </property>
         </widget>
        </item>
        <item row="4" column="2">
         <widget class="QSpinBox" name="sbSymbolOpacity">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="toolTip">
           <string>The opacity ranges from 0 to 100, where 0 is fully transparent and 100 is fully opaque.</string>
          </property>
          <property name="suffix">
           <string> %</string>
          </property>
          <property name="minimum">
           <number>0</number>
          </property>
          <property name="maximum">
           <number>100</number>
          </property>
          <property name="singleStep">
           <number>10</number>
          </property>
          <property name="value">
           <number>100</number>
          </property>
         </widget>
        </item>
        <item row="6" column="0">
         <widget class="QLabel" name="lSymbolFilling">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>Filling</string>
          </property>
         </widget>
        </item>
        <item row="7" column="0">
         <widget class="QLabel" name="lSymbolFillingStyle">
          <property name="text">
           <string>Style:</string>
          </property>
         </widget>
        </item>
        <item row="8" column="0">
         <widget class="QLabel" name="lSymbolFillingColor">
          <property name="text">
           <string>Color:</string>
          </property>
         </widget>
        </item>
        <item row="11" column="0">
         <widget class="QLabel" name="lSymbolBorderStyle">
          <property name="text">
           <string>Style:</string>
          </property>
         </widget>
        </item>
        <item row="8" column="2">
         <widget class="KColorButton" name="kcbSymbolFillingColor">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="12" column="0">
         <widget class="QLabel" name="lSymbolBorderColor">
          <property name="text">
           <string>Color:</string>
          </property>
         </widget>
        </item>
        <item row="10" column="0">
         <widget class="QLabel" name="lSymbolBorder">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>Border</string>
          </property>
         </widget>
        </item>
        <item row="13" column="0">
         <widget class="QLabel" name="lSymbolBorderWidth">
          <property name="text">
           <string>Width:</string>
          </property>
         </widget>
        </item>
        <item row="12" column="2">
         <widget class="KColorButton" name="kcbSymbolBorderColor">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="7" column="2">
         <widget class="KComboBox" name="cbSymbolFillingStyle"/>
        </item>
        <item row="11" column="2">
         <widget class="KComboBox" name="cbSymbolBorderStyle"/>
        </item>
        <item row="2" column="2">
         <widget class="QDoubleSpinBox" name="sbSymbolSize">
          <property name="prefix">
           <string/>
          </property>
          <property name="suffix">
           <string> pt</string>
          </property>
          <property name="singleStep">
           <double>0.500000000000000</double>
          </property>
         </widget>
        </item>
        <item row="13" column="2">
         <widget class="QDoubleSpinBox" name="sbSymbolBorderWidth">
          <property name="suffix">
           <string> pt</string>
          </property>
          <property name="singleStep">
           <double>0.500000000000000</double>
          </property>
         </widget>
        </item>
        <item row="3" column="0">
         <widget class="QLabel" name="lSymbolRotation">
          <property name="text">
           <string>Rotation:</string>
          </property>
         </widget>
        </item>
        <item row="9" column="0">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>72</width>
            <height>18</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="5" column="0" colspan="2">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>72</width>
            <height>18</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="14" column="0" colspan="2">
         <spacer name="verticalSpacer_4">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>72</width>
            <height>0</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="0" column="0">
         <widget class="QLabel" name="lSymbol">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>General</string>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="lSymbolStyle">
          <property name="text">
           <string>Style:</string>
          </property>
         </widget>
        </item>
        <item row="1" column="2">
         <widget class="KComboBox" name="cbSymbolStyle">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="lSymbolSize">
          <property name="text">
           <string>Size:</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <spacer name="horizontalSpacer">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>10</width>
            <height>23</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabValues">
       <attribute name="title">
        <string>Values</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3">
        <item row="2" column="0">
         <widget class="QLabel" name="lValuesColumn">
          <property name="text">
           <string>Column:</string>
          </property>
         </widget>
        </item>
        <item row="10" column="0">
         <widget class="QLabel" name="lValuesPrecision">
          <property name="text">
           <string>Precision:</string>
          </property>
         </widget>
        </item>
        <item row="10" column="2">
         <widget class="QSpinBox" name="sbValuesPrecision">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="minimum">
           <number>0</number>
          </property>
          <property name="maximum">
           <number>16</number>
          </property>
          <property name="value">
           <number>0</number>
          </property>
         </widget>
        </item>
        <item row="15" column="2">
         <widget class="QLineEdit" name="leValuesSuffix">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="13" column="0">
         <widget class="QLabel" name="lValuesText">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>Text</string>
          </property>
         </widget>
        </item>
        <item row="15" column="0">
         <widget class="QLabel" name="lValuesSuffix">
          <property name="text">
           <string>Suffix:</string>
          </property>
         </widget>
        </item>
        <item row="6" column="0">
         <widget class="QLabel" name="lValuesOpacity">
          <property name="text">
           <string>Opacity:</string>
          </property>
         </widget>
        </item>
        <item row="16" column="0">
         <widget class="QLabel" name="lValuesFont">
          <property name="text">
           <string>Font:</string>
          </property>
         </widget>
        </item>
        <item row="0" column="0">
         <widget class="QLabel" name="lValuesGeneral">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>General</string>
          </property>
         </widget>
        </item>
        <item row="16" column="2">
         <widget class="KFontRequester" name="kfrValuesFont"/>
        </item>
        <item row="17" column="2">
         <widget class="KColorButton" name="kcbValuesColor">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="6" column="2">
         <widget class="QSpinBox" name="sbValuesOpacity">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="toolTip">
           <string>The opacity ranges from 0 to 100, where 0 is fully transparent and 100 is fully opaque.</string>
          </property>
          <property name="suffix">
           <string> %</string>
          </property>
          <property name="minimum">
           <number>0</number>
          </property>
          <property name="maximum">
           <number>100</number>
          </property>
          <property name="singleStep">
           <number>10</number>
          </property>
          <property name="value">
           <number>100</number>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <spacer name="horizontalSpacer_3">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>10</width>
            <height>23</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="4" column="0">
         <widget class="QLabel" name="lValuesDistance">
          <property name="text">
           <string>Distance:</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="9" column="2">
         <widget class="KComboBox" name="cbValuesNumericFormat"/>
        </item>
        <item row="1" column="2">
         <widget class="KComboBox" name="cbValuesType">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="17" column="0">
         <widget class="QLabel" name="lValuesColor">
          <property name="text">
           <string>Color:</string>
          </property>
         </widget>
        </item>
        <item row="3" column="2">
         <widget class="KComboBox" name="cbValuesPosition"/>
        </item>
        <item row="14" column="2">
         <widget class="QLineEdit" name="leValuesPrefix">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="5" column="0">
         <widget class="QLabel" name="lValuesRotation">
          <property name="text">
           <string>Rotation:</string>
          </property>
         </widget>
        </item>
        <item row="4" column="2">
         <widget class="QDoubleSpinBox" name="sbValuesDistance">
          <property name="suffix">
           <string> pt</string>
          </property>
          <property name="singleStep">
           <double>0.500000000000000</double>
          </property>
         </widget>
        </item>
        <item row="14" column="0">
         <widget class="QLabel" name="lValuesPrefix">
          <property name="text">
           <string>Prefix:</string>
          </property>
         </widget>
        </item>
        <item row="18" column="0">
         <spacer name="verticalSpacer_8">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>28</width>
            <height>47</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="12" column="0" colspan="2">
         <spacer name="verticalSpacer_7">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>86</width>
            <height>18</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="8" column="0">
         <widget class="QLabel" name="lValuesFormat">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>Format</string>
          </property>
         </widget>
        </item>
        <item row="5" column="2">
         <widget class="QSpinBox" name="sbValuesRotation">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="suffix">
           <string>°</string>
          </property>
          <property name="minimum">
           <number>-360</number>
          </property>
          <property name="maximum">
           <number>360</number>
          </property>
          <property name="singleStep">
           <number>10</number>
          </property>
         </widget>
        </item>
        <item row="3" column="0">
         <widget class="QLabel" name="lValuesPosition">
          <property name="text">
           <string>Position:</string>
          </property>
         </widget>
        </item>
        <item row="9" column="0">
         <widget class="QLabel" name="lValuesNumericFormat">
          <property name="text">
           <string>Numeric:</string>
          </property>
         </widget>
        </item>
        <item row="7" column="0" colspan="2">
         <spacer name="verticalSpacer_6">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>86</width>
            <height>18</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="11" column="0">
         <widget class="QLabel" name="lValuesDateTimeFormat">
          <property name="text">
           <string>DateTime:</string>
          </property>
         </widget>
        </item>
        <item row="11" column="2">
         <widget class="QComboBox" name="cbValuesDateTimeFormat"/>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="lValuesType">
          <property name="text">
           <string>Type:</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabAreaFilling">
       <attribute name="title">
        <string>Filling</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_5">
        <item row="0" column="0">
         <widget class="QLabel" name="lFillingPosition">
          <property name="text">
           <string>Direction:</string>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <spacer name="horizontalSpacer_6">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>13</width>
            <height>23</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="0" column="2">
         <widget class="KComboBox" name="cbFillingPosition">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="lFillingType">
          <property name="text">
           <string>Type:</string>
          </property>
         </widget>
        </item>
        <item row="1" column="2">
         <widget class="KComboBox" name="cbFillingType">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="lFillingFileName">
          <property name="text">
           <string>File name:</string>
          </property>
         </widget>
        </item>
        <item row="2" column="2">
         <widget class="QLineEdit" name="leFillingFileName">
          <property name="toolTip">
           <string>Specify the name of the image file.</string>
          </property>
          <property name="clearButtonEnabled">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="2" column="3">
         <widget class="QPushButton" name="bFillingOpen">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="toolTip">
           <string> Select the file to import</string>
          </property>
          <property name="text">
           <string/>
          </property>
         </widget>
        </item>
        <item row="3" column="0">
         <widget class="QLabel" name="lFillingColorStyle">
          <property name="text">
           <string>Style:</string>
          </property>
         </widget>
        </item>
        <item row="3" column="2">
         <widget class="KComboBox" name="cbFillingColorStyle"/>
        </item>
        <item row="4" column="0">
         <widget class="QLabel" name="lFillingImageStyle">
          <property name="text">
           <string>Style:</string>
          </property>
         </widget>
        </item>
        <item row="4" column="2">
         <widget class="KComboBox" name="cbFillingImageStyle"/>
        </item>
        <item row="5" column="0">
         <widget class="QLabel" name="lFillingBrushStyle">
          <property name="text">
           <string>Style:</string>
          </property>
         </widget>
        </item>
        <item row="5" column="2">
         <widget class="KComboBox" name="cbFillingBrushStyle"/>
        </item>
        <item row="6" column="0">
         <widget class="QLabel" name="lFillingFirstColor">
          <property name="text">
           <string>First color:</string>
          </property>
         </widget>
        </item>
        <item row="6" column="2">
         <widget class="KColorButton" name="kcbFillingFirstColor"/>
        </item>
        <item row="7" column="0">
         <widget class="QLabel" name="lFillingSecondColor">
          <property name="text">
           <string>Second color:</string>
          </property>
         </widget>
        </item>
        <item row="7" column="2">
         <widget class="KColorButton" name="kcbFillingSecondColor"/>
        </item>
        <item row="8" column="0">
         <widget class="QLabel" name="lFillingOpacity">
          <property name="text">
           <string>Opacity:</string>
          </property>
         </widget>
        </item>
        <item row="8" column="2">
         <widget class="QSpinBox" name="sbFillingOpacity">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="toolTip">
           <string>The opacity ranges from 0 to 100, where 0 is fully transparent and 100 is fully opaque.</string>
          </property>
          <property name="suffix">
           <string> %</string>
          </property>
          <property name="minimum">
           <number>0</number>
          </property>
          <property name="maximum">
           <number>100</number>
          </property>
          <property name="singleStep">
           <number>10</number>
          </property>
          <property name="value">
           <number>100</number>
          </property>
         </widget>
        </item>
        <item row="9" column="0">
         <spacer name="verticalSpacer_9">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>24</width>
            <height>271</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabErrorBars">
       <attribute name="title">
        <string>Error bars</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="0" column="0">
         <widget class="QLabel" name="lErrorBarX">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>x-error</string>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="lXErrorType">
          <property name="text">
           <string>Error type:</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <spacer name="horizontalSpacer_4">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>13</width>
            <height>18</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="1" column="2">
         <widget class="KComboBox" name="cbXErrorType">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="lXErrorDataPlus">
          <property name="text">
           <string>Data, +:</string>
          </property>
         </widget>
        </item>
        <item row="3" column="0">
         <widget class="QLabel" name="lXErrorDataMinus">
          <property name="text">
           <string>Data, -:</string>
          </property>
         </widget>
        </item>
        <item row="4" column="0">
         <spacer name="verticalSpacer_10">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>18</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="5" column="0">
         <widget class="QLabel" name="lErrorBarY">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>y-error</string>
          </property>
         </widget>
        </item>
        <item row="6" column="0">
         <widget class="QLabel" name="lYErrorType">
          <property name="text">
           <string>Error type:</string>
          </property>
         </widget>
        </item>
        <item row="6" column="2">
         <widget class="KComboBox" name="cbYErrorType"/>
        </item>
        <item row="7" column="0">
         <widget class="QLabel" name="lYErrorDataPlus">
          <property name="text">
           <string>Data, +:</string>
          </property>
         </widget>
        </item>
        <item row="8" column="0">
         <widget class="QLabel" name="lYErrorDataMinus">
          <property name="text">
           <string>Data, -:</string>
          </property>
         </widget>
        </item>
        <item row="9" column="0">
         <spacer name="verticalSpacer_11">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Fixed</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>18</height>
           </size>
          </property>
         </spacer>
        </item>
        <item row="10" column="0">
         <widget class="QLabel" name="lErrorFormat">
          <property name="font">
           <font>
            <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
          <property name="text">
           <string>Format</string>
          </property>
         </widget>
        </item>
        <item row="11" column="0">
         <widget class="QLabel" name="lErrorBarsType">
          <property name="text">
           <string>Type:</string>
          </property>
         </widget>
        </item>
        <item row="11" column="2">
         <widget class="KComboBox" name="cbErrorBarsType"/>
        </item>
        <item row="12" column="0">
         <widget class="QLabel" name="lErrorBarsStyle">
          <property name="text">
           <string>Style:</string>
          </property>
         </widget>
        </item>
        <item row="12" column="2">
         <widget class="KComboBox" name="cbErrorBarsStyle"/>
        </item>
        <item row="13" column="0">
         <widget class="QLabel" name="lErrorBarsCapSize">
          <property name="text">
           <string>Cap size:</string>
          </property>
         </widget>
        </item>
        <item row="13" column="2">
         <widget class="QDoubleSpinBox" name="sbErrorBarsCapSize">
          <property name="suffix">
           <string> pt</string>
          </property>
          <property name="singleStep">
           <double>0.500000000000000</double>
          </property>
         </widget>
        </item>
        <item row="14" column="0">
         <widget class="QLabel" name="lErrorBarsColor">
          <property name="text">
           <string>Color:</string>
          </property>
         </widget>
        </item>
        <item row="14" column="2">
         <widget class="KColorButton" name="kcbErrorBarsColor">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
        <item row="15" column="0">
         <widget class="QLabel" name="lErrorBarsWidth">
          <property name="text">
           <string>Width:</string>
          </property>
         </widget>
        </item>
        <item row="15" column="2">
         <widget class="QDoubleSpinBox" name="sbErrorBarsWidth">
          <property name="suffix">
           <string> pt</string>
          </property>
          <property name="singleStep">
           <double>0.500000000000000</double>
          </property>
         </widget>
        </item>
        <item row="16" column="0">
         <widget class="QLabel" name="lErrorBarsOpacity">
          <property name="text">
           <string>Opacity:</string>
          </property>
         </widget>
        </item>
        <item row="16" column="2">
         <widget class="QSpinBox" name="sbErrorBarsOpacity">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="toolTip">
           <string>The opacity ranges from 0 to 100, where 0 is fully transparent and 100 is fully opaque.</string>
          </property>
          <property name="suffix">
           <string> %</string>
          </property>
          <property name="minimum">
           <number>0</number>
          </property>
          <property name="maximum">
           <number>100</number>
          </property>
          <property name="singleStep">
           <number>10</number>
          </property>
          <property name="value">
           <number>100</number>
          </property>
         </widget>
        </item>
        <item row="17" column="0">
         <spacer name="verticalSpacer_12">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>104</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KColorButton</class>
    <extends>QPushButton</extends>
    <header>kcolorbutton.h</header>
   </customwidget>
   <customwidget>
    <class>KFontRequester</class>
    <extends>QWidget</extends>
    <header>kfontrequester.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/kdefrontend/widgets/FitParametersWidget.cpp b/src/kdefrontend/widgets/FitParametersWidget.cpp
index 0c95dcbd6..aebcada3d 100644
--- a/src/kdefrontend/widgets/FitParametersWidget.cpp
+++ b/src/kdefrontend/widgets/FitParametersWidget.cpp
@@ -1,427 +1,437 @@
 /***************************************************************************
     File                 : FitParametersWidget.cc
     Project              : LabPlot
     Description          : widget for editing fit parameters
     --------------------------------------------------------------------
     Copyright            : (C) 2014-2016 Alexander Semke (alexander.semke@web.de)
     Copyright            : (C) 2016-2018 Stefan Gerlach (stefan.gerlach@uni.kn)
 
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
  *  it under the terms of the GNU General Public License as published by   *
  *  the Free Software Foundation; either version 2 of the License, or      *
  *  (at your option) any later version.                                    *
  *                                                                         *
  *  This program is distributed in the hope that it will be useful,        *
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
  *  GNU General Public License for more details.                           *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the Free Software           *
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor,                    *
  *   Boston, MA  02110-1301  USA                                           *
  *                                                                         *
  ***************************************************************************/
 #include "FitParametersWidget.h"
 #include <QLineEdit>
 #include <QCheckBox>
 #include <QKeyEvent>
 #include <QScrollBar>
 #include <KLocalizedString>
 
 /*!
 	\class FitParametersWidget
 	\brief Widget for editing fit parameters. For predefined models the number of parameters,
 	their names and default values are given - the user can change the start values.
 	For custom models the user has to define here the parameter names and their start values.
 
 	\ingroup kdefrontend
  */
 FitParametersWidget::FitParametersWidget(QWidget* parent) : QWidget(parent) {
 	ui.setupUi(this);
 
 	ui.tableWidget->setColumnCount(5);
 
 	auto* headerItem = new QTableWidgetItem();
 	headerItem->setText(i18n("Name"));
 	ui.tableWidget->setHorizontalHeaderItem(0, headerItem);
 
 	headerItem = new QTableWidgetItem();
 	headerItem->setText(i18n("Start value"));
 	ui.tableWidget->setHorizontalHeaderItem(1, headerItem);
 
 	headerItem = new QTableWidgetItem();
 	headerItem->setText(i18n("Fixed"));
 	ui.tableWidget->setHorizontalHeaderItem(2, headerItem);
 
 	headerItem = new QTableWidgetItem();
 	headerItem->setText(i18n("Lower limit"));
 	ui.tableWidget->setHorizontalHeaderItem(3, headerItem);
 
 	headerItem = new QTableWidgetItem();
 	headerItem->setText(i18n("Upper limit"));
 	ui.tableWidget->setHorizontalHeaderItem(4, headerItem);
 
 	ui.tableWidget->horizontalHeader()->resizeSections(QHeaderView::ResizeToContents);
 	ui.tableWidget->horizontalHeader()->setStretchLastSection(true);
 
 	ui.tableWidget->installEventFilter(this);
 
 	connect( ui.tableWidget, SIGNAL(cellChanged(int,int)), this, SLOT(changed()) );
+	updateTableSize();
 }
 
 void FitParametersWidget::setFitData(XYFitCurve::FitData* data) {
 	DEBUG("FitParametersWidget::setFitData()");
 	m_initializing = true;
 	m_fitData = data;
 
 	int np = m_fitData->paramNames.size();
 	DEBUG("# params = " << np);
 	DEBUG("# start values = " << m_fitData->paramStartValues.size());
 	if (m_fitData->modelCategory != nsl_fit_model_custom) {	// pre-defined models
 		ui.tableWidget->setRowCount(np);
 
 		for (int i = 0; i < np; ++i) {
 			// name
 			auto* item = new QTableWidgetItem(m_fitData->paramNamesUtf8.at(i));
 			item->setFlags(item->flags() ^ Qt::ItemIsEditable);
 			item->setBackground(QApplication::palette().color(QPalette::Window));
 			ui.tableWidget->setItem(i, 0, item);
 
 			// start value
 			auto* le = new QLineEdit(ui.tableWidget);
 			le->setValidator(new QDoubleValidator(le));
 			le->setFrame(false);
 			le->insert(QString::number(m_fitData->paramStartValues.at(i), 'g'));
 			ui.tableWidget->setCellWidget(i, 1, le);
 			connect(le, SIGNAL(textChanged(QString)), this, SLOT(startValueChanged()) );
 
 			// fixed
 			QWidget* widget = new QWidget();
 			auto* cb = new QCheckBox();
 			cb->setChecked(m_fitData->paramFixed.at(i));
 			auto* cbl = new QHBoxLayout(widget);
 			cbl->addWidget(cb);
 			cbl->setAlignment(Qt::AlignCenter);
 			cbl->setContentsMargins(0, 0, 0, 0);
 			widget->setLayout(cbl);
 			ui.tableWidget->setCellWidget(i, 2, widget);
 			connect(cb, SIGNAL(stateChanged(int)), this, SLOT(changed()) );
 
 			// limits
 			le = new QLineEdit(ui.tableWidget);
 			le->setValidator(new QDoubleValidator(le));
 			le->setFrame(false);
 			if (m_fitData->paramLowerLimits.at(i) > -std::numeric_limits<double>::max())
 				le->insert(QString::number(m_fitData->paramLowerLimits.at(i), 'g'));
 			ui.tableWidget->setCellWidget(i, 3, le);
 			connect(le, SIGNAL(textChanged(QString)), this, SLOT(lowerLimitChanged()) );
 
 			le = new QLineEdit(ui.tableWidget);
 			le->setValidator(new QDoubleValidator(le));
 			le->setFrame(false);
 			if (m_fitData->paramUpperLimits.at(i) < std::numeric_limits<double>::max())
 				le->insert(QString::number(m_fitData->paramUpperLimits.at(i), 'g'));
 			ui.tableWidget->setCellWidget(i, 4, le);
 			connect(le, SIGNAL(textChanged(QString)), this, SLOT(upperLimitChanged()) );
 		}
 		ui.tableWidget->setCurrentCell(0, 1);
 	} else {	// custom model
 		if (!m_fitData->paramNames.isEmpty()) {	// parameters for the custom model are already available -> show them
 			ui.tableWidget->setRowCount(np);
 
 			for (int i = 0; i < np; ++i) {
 				// name
 				auto* item = new QTableWidgetItem(m_fitData->paramNames.at(i));
 				item->setBackground(QApplication::palette().color(QPalette::Window));
 				ui.tableWidget->setItem(i, 0, item);
 
 				// start value
 				auto* le = new QLineEdit(ui.tableWidget);
 				le->setValidator(new QDoubleValidator(le));
 				le->setFrame(false);
 				le->insert(QString::number(m_fitData->paramStartValues.at(i), 'g'));
 				ui.tableWidget->setCellWidget(i, 1, le);
 				connect(le, SIGNAL(textChanged(QString)), this, SLOT(startValueChanged()) );
 
 				// fixed
 				QWidget* widget = new QWidget();
 				auto* cb = new QCheckBox();
 				cb->setChecked(m_fitData->paramFixed.at(i));
 				auto* cbl = new QHBoxLayout(widget);
 				cbl->addWidget(cb);
 				cbl->setAlignment(Qt::AlignCenter);
 				cbl->setContentsMargins(0, 0, 0, 0);
 				widget->setLayout(cbl);
 				ui.tableWidget->setCellWidget(i, 2, widget);
 				connect(cb, SIGNAL(stateChanged(int)), this, SLOT(changed()) );
 
 				// limits
 				le = new QLineEdit(ui.tableWidget);
 				le->setValidator(new QDoubleValidator(le));
 				le->setFrame(false);
 				if (m_fitData->paramLowerLimits.at(i) > -std::numeric_limits<double>::max())
 					le->insert(QString::number(m_fitData->paramLowerLimits.at(i), 'g'));
 				ui.tableWidget->setCellWidget(i, 3, le);
 				connect(le, SIGNAL(textChanged(QString)), this, SLOT(lowerLimitChanged()) );
 
 				le = new QLineEdit(ui.tableWidget);
 				le->setValidator(new QDoubleValidator(le));
 				le->setFrame(false);
 				if (m_fitData->paramUpperLimits.at(i) < std::numeric_limits<double>::max())
 					le->insert(QString::number(m_fitData->paramUpperLimits.at(i), 'g'));
 				ui.tableWidget->setCellWidget(i, 4, le);
 				connect(le, SIGNAL(textChanged(QString)), this, SLOT(upperLimitChanged()) );
 			}
 		} else {			// no parameters available yet -> create the first row in the table for the first parameter
 			ui.tableWidget->setRowCount(1);
 			// name
 			auto* item = new QTableWidgetItem();
 			item->setBackground(QApplication::palette().color(QPalette::Window));
 			ui.tableWidget->setItem(0, 0, item);
 
 			// start value
 			auto* le = new QLineEdit(ui.tableWidget);
 			le->setValidator(new QDoubleValidator(le));
 			le->setFrame(false);
 			ui.tableWidget->setCellWidget(0, 1, le);
 			connect(le, SIGNAL(textChanged(QString)), this, SLOT(startValueChanged()) );
 
 			// fixed
 			QWidget* widget = new QWidget();
 			auto* cb = new QCheckBox();
 			auto* cbl = new QHBoxLayout(widget);
 			cbl->addWidget(cb);
 			cbl->setAlignment(Qt::AlignCenter);
 			cbl->setContentsMargins(0, 0, 0, 0);
 			widget->setLayout(cbl);
 			ui.tableWidget->setCellWidget(0, 2, widget);
 			connect(cb, SIGNAL(stateChanged(int)), this, SLOT(changed()) );
 
 			// limits
 			le = new QLineEdit(ui.tableWidget);
 			le->setValidator(new QDoubleValidator(le));
 			le->setFrame(false);
 			ui.tableWidget->setCellWidget(0, 3, le);
 			connect(le, SIGNAL(textChanged(QString)), this, SLOT(lowerLimitChanged()) );
 
 			le = new QLineEdit(ui.tableWidget);
 			le->setValidator(new QDoubleValidator(le));
 			le->setFrame(false);
 			ui.tableWidget->setCellWidget(0, 4, le);
 			connect(le, SIGNAL(textChanged(QString)), this, SLOT(upperLimitChanged()) );
 		}
 		ui.tableWidget->setCurrentCell(0, 0);
 	}
 	m_initializing = false;
 
-	//set the size of the table to the minimum possible
-	int h = ui.tableWidget->horizontalHeader()->height();
-	h += ui.tableWidget->verticalHeader()->sectionSize(0) * ui.tableWidget->verticalHeader()->count();
-	if (ui.tableWidget->horizontalScrollBar()->isVisible())
-		h += ui.tableWidget->horizontalScrollBar()->height();
-	setMaximumSize(16777215, h);
+	updateTableSize();
 }
 
 bool FitParametersWidget::eventFilter(QObject* watched, QEvent* event) {
 	if (watched == ui.tableWidget) {
 		if (event->type() == QEvent::KeyPress) {
 			auto* keyEvent = static_cast<QKeyEvent*>(event);
 			if (keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter) {
 				//on the second column with the values is editable.
 				//navigate to the next cell in the second column
 				if (ui.tableWidget->currentRow() == ui.tableWidget->rowCount() - 1)
 					ui.tableWidget->clearSelection();
 				else
 					ui.tableWidget->setCurrentCell(ui.tableWidget->currentRow() + 1, 1);
 
 				return true;
 			}
 		}
 	}
 
 	return QWidget::eventFilter(watched, event);
 }
 
+void FitParametersWidget::resizeEvent(QResizeEvent*) {
+	updateTableSize();
+}
+
+void FitParametersWidget::updateTableSize() {
+	//set the size of the table to the minimum possible
+	int h = ui.tableWidget->horizontalHeader()->height();
+	h += ui.tableWidget->verticalHeader()->sectionSize(0) * ui.tableWidget->verticalHeader()->count();
+	if (ui.tableWidget->horizontalScrollBar()->isVisible())
+		h += ui.tableWidget->horizontalScrollBar()->height();
+	setMaximumSize(16777215, h);
+}
+
+
 void FitParametersWidget::changed() {
 	DEBUG("FitParametersWidget::changed()");
 	if (!m_initializing) {
 		apply();
 		emit parametersChanged(false);
 	}
 }
 
 /*
  * Apply parameter settings by setting m_fitData
  */
 void FitParametersWidget::apply() {
 	DEBUG("FitParametersWidget::apply()");
 	if (m_fitData->modelCategory != nsl_fit_model_custom) {	// pre-defined models
 		for (int i = 0; i < ui.tableWidget->rowCount(); ++i) {
 			m_fitData->paramStartValues[i] = ((QLineEdit *)ui.tableWidget->cellWidget(i, 1))->text().toDouble();
 
 			QWidget *widget = ui.tableWidget->cellWidget(i, 2)->layout()->itemAt(0)->widget();
 			m_fitData->paramFixed[i] = (qobject_cast<QCheckBox *>(widget))->isChecked();
 
 			if ( !((QLineEdit *)ui.tableWidget->cellWidget(i, 3))->text().isEmpty() )
 				m_fitData->paramLowerLimits[i] = ((QLineEdit *)ui.tableWidget->cellWidget(i, 3))->text().toDouble();
 			else
 				m_fitData->paramLowerLimits[i] = -std::numeric_limits<double>::max();
 			if ( !((QLineEdit *)ui.tableWidget->cellWidget(i, 4))->text().isEmpty() )
 				m_fitData->paramUpperLimits[i] = ((QLineEdit *)ui.tableWidget->cellWidget(i, 4))->text().toDouble();
 			else
 				m_fitData->paramUpperLimits[i] = std::numeric_limits<double>::max();
 		}
 	} else {	// custom model
 		m_fitData->paramNames.clear();
 		m_fitData->paramNamesUtf8.clear();
 		m_fitData->paramStartValues.clear();
 		m_fitData->paramFixed.clear();
 		m_fitData->paramLowerLimits.clear();
 		m_fitData->paramUpperLimits.clear();
 		for (int i = 0; i < ui.tableWidget->rowCount(); ++i) {
 			// skip those rows where either the name or the value is empty
 			if ( !ui.tableWidget->item(i, 0)->text().simplified().isEmpty()
 				&& !((QLineEdit *)ui.tableWidget->cellWidget(i, 1))->text().simplified().isEmpty() ) {
 				m_fitData->paramNames.append( ui.tableWidget->item(i, 0)->text() );
 				m_fitData->paramNamesUtf8.append( ui.tableWidget->item(i, 0)->text() );
 				m_fitData->paramStartValues.append( ((QLineEdit *)ui.tableWidget->cellWidget(i, 1))->text().toDouble() );
 
 				QWidget *widget = ui.tableWidget->cellWidget(i, 2)->layout()->itemAt(0)->widget();
 				m_fitData->paramFixed.append( (qobject_cast<QCheckBox *>(widget))->isChecked() );
 
 				if ( !((QLineEdit *)ui.tableWidget->cellWidget(i, 3))->text().isEmpty() )
 					m_fitData->paramLowerLimits.append( ((QLineEdit *)ui.tableWidget->cellWidget(i, 3))->text().toDouble() );
 				else
 					m_fitData->paramLowerLimits.append(-std::numeric_limits<double>::max());
 				if ( !((QLineEdit *)ui.tableWidget->cellWidget(i, 4))->text().isEmpty() )
 					m_fitData->paramUpperLimits.append( ((QLineEdit *)ui.tableWidget->cellWidget(i, 4))->text().toDouble() );
 				else
 					m_fitData->paramUpperLimits.append(std::numeric_limits<double>::max());
 			}
 		}
 	}
 }
 
 /*
  * called when a start value is changed
  */
 void FitParametersWidget::startValueChanged() {
 	DEBUG("FitParametersWidget::startValueChanged()");
 	const int row = ui.tableWidget->currentRow();
 	const double value = ((QLineEdit *)ui.tableWidget->cellWidget(row, 1))->text().toDouble();
 
 	double lowerLimit, upperLimit;
 	if ( !((QLineEdit *)ui.tableWidget->cellWidget(row, 3))->text().isEmpty() )
 		lowerLimit = ((QLineEdit *)ui.tableWidget->cellWidget(row, 3))->text().toDouble();
 	else
 		lowerLimit = -std::numeric_limits<double>::max();
 	if ( !((QLineEdit *)ui.tableWidget->cellWidget(row, 4))->text().isEmpty() )
 		upperLimit = ((QLineEdit *)ui.tableWidget->cellWidget(row, 4))->text().toDouble();
 	else
 		upperLimit = std::numeric_limits<double>::max();
 
 	const bool invalid = (value < lowerLimit || value > upperLimit);
 	highlightInvalid(row, 1, invalid);
 	if (invalid)
 		m_invalidRanges = true;
 
 	if (m_rehighlighting)
 		return;
 
 	//start value was changed -> check whether the lower and upper limits are valid and highlight them if not
 	m_invalidRanges = invalid;
 	m_rehighlighting = true;
 	lowerLimitChanged();
 	upperLimitChanged();
 	m_rehighlighting = false;
 
 	changed();
 }
 
 // check if lower limit fits to start value and upper limit
 void FitParametersWidget::lowerLimitChanged() {
 	DEBUG("FitParametersWidget::lowerLimitChanged()");
 	const int row = ui.tableWidget->currentRow();
 
 	const double value = ((QLineEdit *)ui.tableWidget->cellWidget(row, 1))->text().toDouble();
 
 	double lowerLimit, upperLimit;
 	if ( !((QLineEdit *)ui.tableWidget->cellWidget(row, 3))->text().isEmpty() )
 		lowerLimit = ((QLineEdit *)ui.tableWidget->cellWidget(row, 3))->text().toDouble();
 	else
 		lowerLimit = -std::numeric_limits<double>::max();
 	if ( !((QLineEdit *)ui.tableWidget->cellWidget(row, 4))->text().isEmpty() )
 		upperLimit = ((QLineEdit *)ui.tableWidget->cellWidget(row, 4))->text().toDouble();
 	else
 		upperLimit = std::numeric_limits<double>::max();
 
 	const bool invalid = (lowerLimit > value || lowerLimit > upperLimit);
 	highlightInvalid(row, 3, invalid);
 	if (invalid)
 		m_invalidRanges = true;
 
 	if (m_rehighlighting)
 		return;
 
 	//lower limit was changed -> check whether the start value and the upper limit are valid and highlight them if not
 	m_invalidRanges = invalid;
 	m_rehighlighting = true;
 	startValueChanged();
 	upperLimitChanged();
 	m_rehighlighting = false;
 
 	changed();
 }
 
 // check if upper limit fits to start value and lower limit
 void FitParametersWidget::upperLimitChanged() {
 	DEBUG("FitParametersWidget::upperLimitChanged()");
 	const int row = ui.tableWidget->currentRow();
 
 	const double value = ((QLineEdit *)ui.tableWidget->cellWidget(row, 1))->text().toDouble();
 
 	double lowerLimit, upperLimit;
 	if ( !((QLineEdit *)ui.tableWidget->cellWidget(row, 3))->text().isEmpty() )
 		lowerLimit = ((QLineEdit *)ui.tableWidget->cellWidget(row, 3))->text().toDouble();
 	else
 		lowerLimit = -std::numeric_limits<double>::max();
 	if ( !((QLineEdit *)ui.tableWidget->cellWidget(row, 4))->text().isEmpty() )
 		upperLimit = ((QLineEdit *)ui.tableWidget->cellWidget(row, 4))->text().toDouble();
 	else
 		upperLimit = std::numeric_limits<double>::max();
 
 	const bool invalid = (upperLimit < value || upperLimit < lowerLimit);
 	highlightInvalid(row, 4, invalid);
 	if (invalid)
 		m_invalidRanges = true;
 
 	if (m_rehighlighting)
 		return;
 
 	//upper limit was changed -> check whether the start value and the lower limit are valid and highlight them if not
 	m_invalidRanges = invalid;
 	m_rehighlighting = true;
 	startValueChanged();
 	lowerLimitChanged();
 	m_rehighlighting = false;
 
 	changed();
 }
 
 void FitParametersWidget::highlightInvalid(int row, int col, bool invalid) {
 	QLineEdit* le = ((QLineEdit*)ui.tableWidget->cellWidget(row, col));
 	if (invalid)
 		le->setStyleSheet("QLineEdit{background: red;}");
 	else
 		le->setStyleSheet(QString());
 
 	if (m_invalidRanges)
 		emit parametersValid(false);
 	else
 		emit parametersValid(true);
 }
diff --git a/src/kdefrontend/widgets/FitParametersWidget.h b/src/kdefrontend/widgets/FitParametersWidget.h
index bdcdd2abe..eec6b0422 100644
--- a/src/kdefrontend/widgets/FitParametersWidget.h
+++ b/src/kdefrontend/widgets/FitParametersWidget.h
@@ -1,66 +1,69 @@
 /***************************************************************************
     File                 : FitParametersWidget.h
     Project              : LabPlot
     Description          : widget for editing the fit parameters
     --------------------------------------------------------------------
     Copyright            : (C) 2014-2016 by Alexander Semke (alexander.semke@web.de)
     Copyright            : (C) 2016-2018 by Stefan Gerlach (stefan.gerlach@uni-konstanz.de)
 
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
  *  it under the terms of the GNU General Public License as published by   *
  *  the Free Software Foundation; either version 2 of the License, or      *
  *  (at your option) any later version.                                    *
  *                                                                         *
  *  This program is distributed in the hope that it will be useful,        *
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
  *  GNU General Public License for more details.                           *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the Free Software           *
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor,                    *
  *   Boston, MA  02110-1301  USA                                           *
  *                                                                         *
  ***************************************************************************/
 #ifndef FITPARAMETERSWIDGET_H
 #define FITPARAMETERSWIDGET_H
 
 #include <QWidget>
 
 #include "backend/worksheet/plots/cartesian/XYFitCurve.h"
 #include "ui_fitparameterswidget.h"
 
 class FitParametersWidget : public QWidget {
 	Q_OBJECT
 
 public:
 	explicit FitParametersWidget(QWidget*);
 	void setFitData(XYFitCurve::FitData*);
 
 private:
 	Ui::FitParametersWidget ui;
 	XYFitCurve::FitData* m_fitData{nullptr};
 	bool m_initializing{false};
 	bool m_rehighlighting{false};
 	bool m_invalidRanges{false};
 
 	bool eventFilter(QObject*, QEvent*) override;
+	void resizeEvent(QResizeEvent*) override;
+
 	void highlightInvalid(int row, int col, bool invalid);
+	void updateTableSize();
 
 signals:
 	void parametersChanged(bool);
 	void parametersValid(bool);
 
 private slots:
 	void changed();
 	void apply();
 	void startValueChanged();
 	void lowerLimitChanged();
 	void upperLimitChanged();
 };
 
 #endif //FITPARAMETERSWIDGET_H