Commit 7db0d041 authored by Alexander Semke's avatar Alexander Semke
Browse files

Removed the setting "local documentation".

This was not implemented for all backends, is a rarely used feature
and is also very heavily colliding now  with the new embedded documentation.
The already available implementations in Backend::helpUrl() return theURL
 to the official online documentation will be used a fallback solution in case
no embedded documentation is installed for the backend.
parent 60b7739f
......@@ -75,10 +75,6 @@ KConfigSkeleton* RBackend::config() const
QUrl RBackend::helpUrl() const
{
const QUrl& localDoc = RServerSettings::self()->localDoc();
if (!localDoc.isEmpty())
return localDoc;
else
return QUrl(i18nc("the url to the documentation of R, please check if there is a translated version and use the correct url",
"https://cran.r-project.org/manuals.html"));
}
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>435</width>
<height>302</height>
<width>408</width>
<height>296</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
......@@ -21,31 +21,7 @@
<string>General</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label2">
<property name="toolTip">
<string/>
</property>
<property name="text">
<string>Documentation:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="KUrlRequester" name="kcfg_localDoc">
<property name="toolTip">
<string>If empty, the &quot;Show help&quot; action will show the default online documentation. Otherwise, the specified URL will be opened.</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lPlotIntegration">
<property name="text">
<string>Plot Integration:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="kcfg_integratePlots">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
......@@ -61,14 +37,7 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lVariableManagement">
<property name="text">
<string>Variable Management:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="1" column="1">
<widget class="QCheckBox" name="kcfg_variableManagement">
<property name="toolTip">
<string>Monitor the creation and destruction of variables and show the existing variables in the variable panel.</string>
......@@ -78,7 +47,14 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="0" column="0">
<widget class="QLabel" name="lPlotIntegration">
<property name="text">
<string>Plot Integration:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
......@@ -94,6 +70,13 @@
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lVariableManagement">
<property name="text">
<string>Variable Management:</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tabAutorun">
......@@ -126,12 +109,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KUrlRequester</class>
<extends>QWidget</extends>
<header>kurlrequester.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>KEditListWidget</class>
<extends>QWidget</extends>
......
......@@ -66,11 +66,7 @@ bool MaximaBackend::requirementsFullfilled(QString* const reason) const
QUrl MaximaBackend::helpUrl() const
{
const QUrl& localDoc = MaximaSettings::self()->localDoc();
if (!localDoc.isEmpty())
return localDoc;
else
return QUrl(i18nc("the url to the documentation of Maxima, please check if there is a translated version and use the correct url",
return QUrl(i18nc("the url to the documentation of Maxima, please check if there is a translated version and use the correct url",
"http://maxima.sourceforge.net/docs/manual/en/maxima.html"));
}
......
......@@ -18,9 +18,6 @@
} ()
</default>
</entry>
<entry name="localDoc" type="Url">
<label>Url to the local Maxima documentation</label>
</entry>
<entry name="integratePlots" type="Bool">
<label>Integrate Plots into the Worksheet</label>
<default>true</default>
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>420</width>
<height>355</height>
<width>408</width>
<height>296</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
......@@ -21,21 +21,24 @@
<string>General</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<item row="1" column="1">
<widget class="QCheckBox" name="kcfg_integratePlots">
<property name="toolTip">
<string>If enabled, plots will be shown inside of the worksheet. Otherwise, plots will be shown in an external window.</string>
</property>
<property name="text">
<string>Executable:</string>
<string>Enabled</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lVariableManagement">
<item row="1" column="0">
<widget class="QLabel" name="lPlotIntegration">
<property name="text">
<string>Variable Management:</string>
<string>Plot Integration:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="2" column="1">
<widget class="QCheckBox" name="kcfg_variableManagement">
<property name="toolTip">
<string>Monitor the creation and destruction of variables and show the existing variables in the variable panel.</string>
......@@ -45,41 +48,21 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="KUrlRequester" name="kcfg_localDoc">
<property name="toolTip">
<string>If empty, the &quot;Show help&quot; action will show the default online documentation. Otherwise, the specified URL will be opened.</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="KUrlRequester" name="kcfg_Path"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lPlotIntegration">
<property name="text">
<string>Plot Integration:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="kcfg_integratePlots">
<property name="toolTip">
<string>If enabled, plots will be shown inside of the worksheet. Otherwise, plots will be shown in an external window.</string>
</property>
<widget class="QLabel" name="lVariableManagement">
<property name="text">
<string>Enabled</string>
<string>Variable Management:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label2">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Documentation:</string>
<string>Executable:</string>
</property>
</widget>
</item>
<item row="4" column="0">
<item row="3" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
......@@ -92,6 +75,9 @@
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="KUrlRequester" name="kcfg_Path"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="tabAutorun">
......
......@@ -56,11 +56,7 @@ bool OctaveBackend::requirementsFullfilled(QString* const reason) const
QUrl OctaveBackend::helpUrl() const
{
const QUrl& localDoc = OctaveSettings::self()->localDoc();
if (!localDoc.isEmpty())
return localDoc;
else
return QUrl(i18nc("the url to the documentation of Octave, please check if there is a translated version (currently Czech and Japanese) and use the correct url",
return QUrl(i18nc("the url to the documentation of Octave, please check if there is a translated version and use the correct url",
"https://octave.org/doc/interpreter/"));
}
......
......@@ -18,9 +18,6 @@
} ()
</default>
</entry>
<entry name="localDoc" type="Url">
<label>Url to the local Octave documentation</label>
</entry>
<entry name="integratePlots" type="Bool">
<label>Integrate Plots into the Worksheet</label>
<default>true</default>
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>420</width>
<height>302</height>
<width>408</width>
<height>296</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
......@@ -21,72 +21,14 @@
<string>General</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Executable:</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="KUrlRequester" name="kcfg_Path"/>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label2">
<property name="text">
<string>Documentation:</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="KUrlRequester" name="kcfg_localDoc">
<property name="toolTip">
<string>If empty, the &quot;Show help&quot; action will show the default online documentation. Otherwise, the specified URL will be opened.</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="lPlotIntegration">
<property name="text">
<string>Plot Integration:</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QCheckBox" name="kcfg_integratePlots">
<property name="toolTip">
<string>If enabled, plots will be shown inside of the worksheet. Otherwise, plots will be shown in an external window.</string>
</property>
<property name="text">
<string>Enabled</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="lVariableManagement">
<property name="text">
<string>Variable Management:</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QCheckBox" name="kcfg_variableManagement">
<property name="toolTip">
<string>Monitor the creation and destruction of variables and show the existing variables in the variable panel.</string>
</property>
<property name="text">
<string>Enabled</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Internal Plot Format:</string>
</property>
</widget>
</item>
<item row="4" column="2">
<item row="3" column="2">
<widget class="QComboBox" name="kcfg_inlinePlotFormat">
<item>
<property name="text">
......@@ -105,7 +47,34 @@
</item>
</widget>
</item>
<item row="5" column="1">
<item row="2" column="2">
<widget class="QCheckBox" name="kcfg_variableManagement">
<property name="toolTip">
<string>Monitor the creation and destruction of variables and show the existing variables in the variable panel.</string>
</property>
<property name="text">
<string>Enabled</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="KUrlRequester" name="kcfg_Path"/>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="lVariableManagement">
<property name="text">
<string>Variable Management:</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="lPlotIntegration">
<property name="text">
<string>Plot Integration:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
......@@ -121,6 +90,23 @@
</property>
</spacer>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="kcfg_integratePlots">
<property name="toolTip">
<string>If enabled, plots will be shown inside of the worksheet. Otherwise, plots will be shown in an external window.</string>
</property>
<property name="text">
<string>Enabled</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Executable:</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tabAutorun">
......
......@@ -62,11 +62,7 @@ Cantor::Backend::Capabilities PythonBackend::capabilities() const
QUrl PythonBackend::helpUrl() const
{
const QUrl& localDoc = PythonSettings::self()->localDoc();
if (!localDoc.isEmpty())
return localDoc;
else
return QUrl(i18nc("The url to the documentation Python", "https://docs.python.org/3/"));
return QUrl(i18nc("The url to the documentation Python", "https://docs.python.org/3/"));
}
QString PythonBackend::description() const
......
......@@ -6,9 +6,6 @@
<include>QStandardPaths</include>
<kcfgfile name="cantorrc"/>
<group name="PythonBackend">
<entry name="localDoc" type="Url">
<label>Url to the local Python documentation</label>
</entry>
<entry name="integratePlots" type="Bool">
<label>Integrate Plots into the Worksheet</label>
<default>false</default>
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>641</width>
<height>326</height>
<width>566</width>
<height>296</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
......@@ -21,69 +21,8 @@
<string>General</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label2">
<property name="toolTip">
<string/>
</property>
<property name="text">
<string>Documentation:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="KUrlRequester" name="kcfg_localDoc">
<property name="toolTip">
<string>If empty, the &quot;Show help&quot; action will show the default online documentation. Otherwise, the specified URL will be opened.</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lPlotIntegration">
<property name="text">
<string>Plot Integration:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="kcfg_integratePlots">
<property name="toolTip">
<string>If enabled, plots will be shown inside of the worksheet. Otherwise, plots will be shown in an external window.</string>
</property>
<property name="text">
<string>Enabled</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lVariableManagement">
<property name="text">
<string>Variable Management:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="kcfg_variableManagement">
<property name="toolTip">
<string>Monitor the creation and destruction of variables and show the existing variables in the variable panel.</string>
</property>
<property name="text">
<string>Enabled</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="toolTip">
<string>Graphic package, used for plotting. When integrated plots option is enabled, then plots from the package will be integrated to worksheet</string>
</property>
<property name="text">
<string>Graphic Package: </string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="KComboBox" name="kcfg_choosenGraphicPackage">
<widget class="KComboBox" name="kcfg_plotExtenstionGraphicPackage">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -92,33 +31,43 @@
</property>
<item>
<property name="text">
<string>Matplotlib (with seaborn, ggplot support too)</string>
<string>matplotlib</string>
</property>
</item>
<item>
<property name="text">
<string>Plot.ly</string>
<string>pylab</string>
</property>
</item>
<item>
<property name="text">
<string>All supported</string>
<string>plot.ly</string>
</property>
</item>
<item>
<property name="text">
<string>GR</string>
</property>
</item>
<item>
<property name="text">
<string>bokeh</string>
</property>
</item>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label4">
<item row="1" column="1">
<widget class="QCheckBox" name="kcfg_variableManagement">
<property name="toolTip">
<string>Graphic package, which code will be used for plotting via &quot;Plot&quot; Cantor menu.</string>
<string>Monitor the creation and destruction of variables and show the existing variables in the variable panel.</string>
</property>
<property name="text">
<string>Graphic Package for &quot;Plot&quot;-assistant</string>
<string>Enabled</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="KComboBox" name="kcfg_plotExtenstionGraphicPackage">
<item row="2" column="1">
<widget class="KComboBox" name="kcfg_choosenGraphicPackage">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -127,32 +76,56 @@
</property>
<item>
<property name="text">
<string>matplotlib</string>
</property>
</item>
<item>
<property name="text">
<string>pylab</string>
</property>
</item>
<item>
<property name="text">
<string>plot.ly</string>
<string>Matplotlib (with seaborn, ggplot support too)</string>
</property>
</item>
<item>
<property name="text">
<string>GR</string>
<string>Plot.ly</string>
</property>
</item>
<item>
<property name="text">
<string>bokeh</string>
<string>All supported</string>
</property>
</item>
</widget>
</item>
<item row="5" column="0">
<item row="0" column="1">
<widget class="QCheckBox" name="kcfg_integratePlots">
<property name="toolTip">
<string>If enabled, plots will be shown inside of the worksheet. Otherwise, plots will be shown in an external window.</string>
</property>
<property name="text">
<string>Enabled</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lPlotIntegration">
<property name="text">
<string>Plot Integration:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lVariableManagement">
<property name="text">