Don't use kcmshell5 for opening the KCM

Summary:
kcmshell5 depends on plasma-workspace. By using our own tiny wrapper for opening the KCM we avoid pulling
in plasma-workspace and everything that comes with it on non-Plasma systems.

Test Plan: kdeconnect-settings shows the KCM

Reviewers: #kde_connect, sredman

Reviewed By: #kde_connect, sredman

Subscribers: sredman, kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D17383
This commit is contained in:
Nicolas Fella 2018-12-06 16:06:06 +01:00
parent 686af65e10
commit d26d2ada78
3 changed files with 54 additions and 1 deletions

View file

@ -9,6 +9,10 @@ set(kcm_SRCS
kcm.cpp kcm.cpp
) )
set(kcm_wrapper_SRCS main.cpp)
add_executable(kdeconnect-settings ${kcm_wrapper_SRCS})
target_link_libraries(kdeconnect-settings KF5::I18n KF5::KCMUtils)
ki18n_wrap_ui(kcm_SRCS kcm.ui) ki18n_wrap_ui(kcm_SRCS kcm.ui)
add_library(kcm_kdeconnect MODULE ${kcm_SRCS}) add_library(kcm_kdeconnect MODULE ${kcm_SRCS})
@ -22,6 +26,7 @@ target_link_libraries(kcm_kdeconnect
) )
install(TARGETS kcm_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS kcm_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR})
install(TARGETS kdeconnect-settings ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES org.kde.kdeconnect.kcm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES org.kde.kdeconnect.kcm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(FILES kcm_kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES kcm_kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR})

48
kcm/main.cpp Normal file
View file

@ -0,0 +1,48 @@
/*
* Copyright 2018 Nicolas Fella <nicolas.fella@gmx.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) version 3 or any later version
* accepted by the membership of KDE e.V. (or its successor approved
* by the membership of KDE e.V.), which shall act as a proxy
* defined in Section 14 of version 3 of the license.
*
* 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, see <http://www.gnu.org/licenses/>.
*/
#include <QApplication>
#include <KCMultiDialog>
#include <KAboutData>
#include <KLocalizedString>
#include "kdeconnect-version.h"
int main(int argc, char** argv)
{
QApplication app(argc, argv);
KAboutData about("kdeconnect-settings",
i18n("KDE Connect Settings"),
QStringLiteral(KDECONNECT_VERSION_STRING),
i18n("KDE Connect Settings"),
KAboutLicense::GPL,
i18n("(C) 2018 Nicolas Fella"));
KAboutData::setApplicationData(about);
KCMultiDialog* dialog = new KCMultiDialog;
dialog->addModule("kcm_kdeconnect");
dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->show();
app.setQuitOnLastWindowClosed(true);
return app.exec();
}

View file

@ -2,7 +2,7 @@
Type=Application Type=Application
Icon=kdeconnect Icon=kdeconnect
Terminal=false Terminal=false
Exec=kcmshell5 kcm_kdeconnect Exec=kdeconnect-settings
Name=KDE Connect Settings Name=KDE Connect Settings
Name[ar]=إعدادات كدي المتّصل Name[ar]=إعدادات كدي المتّصل
Name[ca]=Arranjament del KDE Connect Name[ca]=Arranjament del KDE Connect