[labplot/frameworks] /: merge fixes and QIcon fix

[Stefan Gerlach]

Git commit 0cb68238f6af5e1136708513a387e7f89158b5c1 by Stefan Gerlach.
Committed on 27/09/2016 at 09:23.
Pushed by sgerlach into branch 'frameworks'.

merge fixes and QIcon fix

M  +16   -3    doc/index.docbook
M  +20   -10   src/backend/worksheet/plots/cartesian/XYDifferentiationCurve.cpp
M  +116  -6    src/kdefrontend/dockwidgets/XYDifferentiationCurveDock.cpp

http://commits.kde.org/labplot/0cb68238f6af5e1136708513a387e7f89158b5c1

diff --cc doc/index.docbook
index 712cabf,ecff45e..700ef48
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@@ -96,12 -89,8 +96,12 @@@ Features
  <listitem><para>Cartesian plots, created either from imported or manually created data sets or via mathematical equation</para></listitem>
  <listitem><para>Definition of mathematical formulas is supported by syntax-highlighting and completion and by the list of thematicaly grouped mathematical and physical constants and functions</para></listitem>
  <listitem><para>Investigation of plotted data is supported by many zooming and navigation features</para></listitem>
- <listitem><para>Several analysis functions and methods for interpolation, smoothing, (nonlinear) fitting, Fourier filter and Fourier transform</para></listitem>
+ <listitem><para>Several analysis functions and methods for data reduction, differentiation, interpolation, smoothing, (nonlinear) fitting, Fourier filter and Fourier transform</para></listitem>
  <listitem><para>Linear and non-linear fits to data, several fit-models are predefined and custom models with arbitrary number of parameters can be provided</para></listitem>
 +<listitem><para>Supports many CAS backends like Maxima, Python, KAlgebra, Sage</para></listitem>
 +<listitem><para>Nice Worksheet view for evaluating expressions</para></listitem>
 +<listitem><para>Easy plugin based structure to add different Backends</para></listitem>
 +<listitem><para>Plugin based assistant dialogs for common tasks (like integrating a function or entering a matrix)</para></listitem>
  <listitem><para>Datapicker for manual or (semi-)automatic data extraction from imported images containing plots and curves.</para></listitem>
  </itemizedlist>
  </para>
diff --cc src/backend/worksheet/plots/cartesian/XYDifferentiationCurve.cpp
index 29404c3,4daf196..61c70c6
--- a/src/backend/worksheet/plots/cartesian/XYDifferentiationCurve.cpp
+++ b/src/backend/worksheet/plots/cartesian/XYDifferentiationCurve.cpp
@@@ -87,7 -86,7 +86,7 @@@ void XYDifferentiationCurve::recalculat
  	Returns an icon to be used in the project explorer.
  */
  QIcon XYDifferentiationCurve::icon() const {
--	return KIcon("labplot-xy-differentiation-curve");
++	return QIcon::fromTheme("labplot-xy-differentiation-curve");
  }
  
  //##############################################################################
diff --cc src/kdefrontend/dockwidgets/XYDifferentiationCurveDock.cpp
index 881ce6c,2be323d..528ec08
--- a/src/kdefrontend/dockwidgets/XYDifferentiationCurveDock.cpp
+++ b/src/kdefrontend/dockwidgets/XYDifferentiationCurveDock.cpp
@@@ -81,7 -84,10 +84,10 @@@ void XYDifferentiationCurveDock::setupG
  	cbYDataColumn = new TreeViewComboBox(generalTab);
  	gridLayout->addWidget(cbYDataColumn, 5, 3, 1, 2);
  
+ 	for (int i=0; i < NSL_DIFF_DERIV_ORDER_COUNT; i++)
+ 		uiGeneralTab.cbDerivOrder->addItem(i18n(nsl_diff_deriv_order_name[i]));
+ 
 -	uiGeneralTab.pbRecalculate->setIcon(KIcon("run-build"));
 +	uiGeneralTab.pbRecalculate->setIcon( QIcon::fromTheme("run-build") );
  
  	QHBoxLayout* layout = new QHBoxLayout(ui.tabGeneral);
  	layout->setMargin(0);