Commit c8459f51 authored by Nikita Sirgienko's avatar Nikita Sirgienko
Browse files

Remove Cantor Plugin Path from settings and update some infor in Readme

parent 1fa50a4e
Pipeline #33068 passed with stage
in 27 minutes and 27 seconds
......@@ -34,6 +34,10 @@ make install or su -c 'make install'
If `-DCMAKE_INSTALL_PREFIX` is not used, Cantor will be installed in
default cmake install directory (`/usr/local/` usually).
Also, setting `CMAKE_INSTALL_PREFIX` to some unstandart location may happens different problems
with searching Cantor files. So there is a need for passing proper paths for KDE install cmake variables.
For example, if no one Cantor's backends found after installation, KDE_INSTALL_PLUGINDIR path should
be specified on cmake configuration step to some location.
To uninstall the project:
......
......@@ -88,7 +88,7 @@ ki18n_wrap_ui(cantor_PART_SRCS imagesettings.ui)
ki18n_wrap_ui(cantor_PART_SRCS standardsearchbar.ui)
ki18n_wrap_ui(cantor_PART_SRCS extendedsearchbar.ui)
string(CONCAT PATH_TO_CANTOR_BACKENDS ${CMAKE_INSTALL_PREFIX} "/${PLUGIN_INSTALL_DIR}")
set(PATH_TO_CANTOR_BACKENDS "${KDE_INSTALL_FULL_PLUGINDIR}")
configure_file (config-cantor.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-cantor.h )
......
......@@ -4,7 +4,6 @@
xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0
https://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<include>cantor_export.h</include>
<include>config-cantor.h</include>
<include>QUrl</include>
<include>QApplication</include>
<kcfgfile/>
......@@ -61,10 +60,6 @@
<label>Limit of visible lines for text result</label>
<default>0</default>
</entry>
<entry name="PathToCantorPluginsDir" type="Url">
<label>Path to directory, which contains Cantor plugins (cantorpart and all backends)</label>
<default code="true">QUrl::fromLocalFile(QString::fromLocal8Bit(PATH_TO_CANTOR_PLUGINS))</default>
</entry>
<entry name="ChapterFontFamily" type="Font">
<label>Hierarchy font for chapter</label>
<default code="true">QApplication::font()</default>
......
......@@ -33,8 +33,6 @@
#include <QDir>
#include <QDebug>
#include "settings.h"
static const char description[] =
I18N_NOOP("KDE Frontend to mathematical applications");
......@@ -43,8 +41,8 @@ int main(int argc, char **argv)
QApplication app(argc, argv);
// Add our custom plugins path, where we install our plugins, if it isn't default path
const QString& path = Settings::pathToCantorPluginsDir().toLocalFile();
qDebug() << "Adding additional application library path" << path;
const QString& path = QString::fromLocal8Bit(PATH_TO_CANTOR_PLUGINS);
qDebug() << "Adding additional application library path for Cantor plugins loading" << path;
if (!QCoreApplication::libraryPaths().contains(path))
QCoreApplication::addLibraryPath(path);
......
......@@ -188,33 +188,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox2">
<property name="title">
<string>Paths (advance settings)</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<layout class="QHBoxLayout" name="horizontalLayout2">
<item>
<widget class="QLabel" name="label2">
<property name="text">
<string>Path to Cantor plugin directory:</string>
</property>
</widget>
</item>
<item>
<widget class="KUrlRequester" name="kcfg_PathToCantorPluginsDir" native="true">
<property name="toolTip">
<string>Path to directory, which contains Cantor backend plugins. This is important setting - with wrong path Cantor can't create any worksheets.</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment