From 2f5e4cb02933e3317098bdf090b3f6103061d4ae Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Thu, 2 Sep 2021 20:11:11 +0200 Subject: [PATCH] Install KCMs in dolphin/kcms namespace This will allow consumers to load the plugin from this namespace without KServiceTypeTrader being involved. --- src/CMakeLists.txt | 15 +++++++++------ src/settings/kcm/kcmdolphingeneral.cpp | 2 +- src/settings/kcm/kcmdolphingeneral.desktop | 2 +- src/settings/kcm/kcmdolphinnavigation.cpp | 2 +- src/settings/kcm/kcmdolphinnavigation.desktop | 2 +- src/settings/kcm/kcmdolphinviewmodes.cpp | 2 +- src/settings/kcm/kcmdolphinviewmodes.desktop | 2 +- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 147f18c00..b97a5d7c0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -370,9 +370,12 @@ install(TARGETS dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) if(NOT WIN32) # The settings are still accessible from the hamburger menu - add_library(kcm_dolphinviewmodes MODULE) - add_library(kcm_dolphinnavigation MODULE) - add_library(kcm_dolphingeneral MODULE) + add_library(kcm_dolphinviewmodes) + kcoreaddons_desktop_to_json(kcm_dolphinviewmodes settings/kcm/kcmdolphinviewmodes.desktop) + add_library(kcm_dolphinnavigation) + kcoreaddons_desktop_to_json(kcm_dolphinnavigation settings/kcm/kcmdolphinnavigation.desktop) + add_library(kcm_dolphingeneral) + kcoreaddons_desktop_to_json(kcm_dolphingeneral settings/kcm/kcmdolphingeneral.desktop) target_sources(kcm_dolphinviewmodes PRIVATE settings/kcm/kcmdolphinviewmodes.cpp @@ -420,9 +423,9 @@ if(NOT WIN32) install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) - install(TARGETS kcm_dolphinviewmodes DESTINATION ${KDE_INSTALL_PLUGINDIR} ) - install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR} ) - install(TARGETS kcm_dolphingeneral DESTINATION ${KDE_INSTALL_PLUGINDIR} ) + install(TARGETS kcm_dolphinviewmodes DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms ) + install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms ) + install(TARGETS kcm_dolphingeneral DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms ) endif() if(NOT WIN32) diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index fd0044325..15419b234 100644 --- a/src/settings/kcm/kcmdolphingeneral.cpp +++ b/src/settings/kcm/kcmdolphingeneral.cpp @@ -17,7 +17,7 @@ #include #include -K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin();) +K_PLUGIN_CLASS_WITH_JSON(DolphinGeneralConfigModule, "kcmdolphingeneral.json") DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget *parent, const QVariantList &args) : KCModule(parent, args), diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index a1cb745bd..2695d49ce 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -111,7 +111,7 @@ Icon=system-file-manager Type=Service X-KDE-ServiceTypes=KCModule -X-KDE-Library=kcm_dolphingeneral +X-KDE-Library=dolphin/kcms/kcm_dolphingeneral X-DocPath=dolphin/configuring-dolphin.html#preferences-dialog # ctxt: Random file browsing settings. Name=General diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp index f749628ab..c8a011ab7 100644 --- a/src/settings/kcm/kcmdolphinnavigation.cpp +++ b/src/settings/kcm/kcmdolphinnavigation.cpp @@ -13,7 +13,7 @@ #include -K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin();) +K_PLUGIN_CLASS_WITH_JSON(DolphinNavigationConfigModule, "kcmdolphinnavigation.json") DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget *parent, const QVariantList &args) : KCModule(parent, args), diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index f532647c5..161e5b612 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -111,7 +111,7 @@ Icon=preferences-desktop-navigation Type=Service X-KDE-ServiceTypes=KCModule -X-KDE-Library=kcm_dolphinnavigation +X-KDE-Library=dolphin/kcms/kcm_dolphinnavigation X-DocPath=dolphin/configuring-dolphin.html#preferences-dialog-navigation Name=Navigation Name[ar]=التّنقّل diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp index 0c287ed22..57698e0a9 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.cpp +++ b/src/settings/kcm/kcmdolphinviewmodes.cpp @@ -17,7 +17,7 @@ #include #include -K_PLUGIN_FACTORY(KCMDolphinViewModesConfigFactory, registerPlugin();) +K_PLUGIN_CLASS_WITH_JSON(DolphinViewModesConfigModule, "kcmdolphinviewmodes.json") DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget *parent, const QVariantList &args) : KCModule(parent, args), diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 65b170dbc..1e8cc1043 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -109,7 +109,7 @@ Icon=preferences-desktop-icons Type=Service X-KDE-ServiceTypes=KCModule -X-KDE-Library=kcm_dolphinviewmodes +X-KDE-Library=dolphin/kcms/kcm_dolphinviewmodes X-DocPath=dolphin/configuring-dolphin.html#preferences-dialog-viewmodes Name=View Modes Name[ar]=أوضاع المنظور -- 2.47.3