Verified Commit 3a59f94d authored by Alexander Lohnau's avatar Alexander Lohnau 💬
Browse files

Install KCMs in pim/kcms/akregator namespace

parent 57a43a2c
......@@ -20,7 +20,7 @@ target_link_libraries(akregator_config_general
install(FILES akregator_config_general.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
kcoreaddons_desktop_to_json(akregator_config_general akregator_config_general.desktop SERVICE_TYPES kcmodule.desktop)
install(TARGETS akregator_config_general DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS akregator_config_general DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
########### next target ###############
......@@ -38,7 +38,7 @@ target_link_libraries(akregator_config_appearance
kcoreaddons_desktop_to_json(akregator_config_appearance akregator_config_appearance.desktop SERVICE_TYPES kcmodule.desktop)
install(FILES akregator_config_appearance.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS akregator_config_appearance DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS akregator_config_appearance DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
########### next target ###############
......@@ -55,7 +55,7 @@ target_link_libraries(akregator_config_archive
)
#kcoreaddons_desktop_to_json(akregator_config_archive akregator_config_archive.desktop DEFAULT_SERVICE_TYPE)
install(FILES akregator_config_archive.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS akregator_config_archive DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS akregator_config_archive DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
########### next target ###############
......@@ -73,7 +73,7 @@ target_link_libraries(akregator_config_browser
kcoreaddons_desktop_to_json(akregator_config_browser akregator_config_browser.desktop SERVICE_TYPES kcmodule.desktop)
install(FILES akregator_config_browser.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS akregator_config_browser DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS akregator_config_browser DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
########### next target ###############
......@@ -96,7 +96,7 @@ if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
endif()
kcoreaddons_desktop_to_json(akregator_config_advanced akregator_config_advanced.desktop SERVICE_TYPES kcmodule.desktop)
install(FILES akregator_config_advanced.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS akregator_config_advanced DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS akregator_config_advanced DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
########### next target ###############
......@@ -126,7 +126,7 @@ endif()
kcoreaddons_desktop_to_json(akregator_config_plugins akregator_config_plugins.desktop SERVICE_TYPES kcmodule.desktop)
install(FILES akregator_config_plugins.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS akregator_config_plugins DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS akregator_config_plugins DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
########### next target ###############
......@@ -145,7 +145,7 @@ if (TARGET KUserFeedbackWidgets)
install(FILES akregator_config_userfeedback.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
kcoreaddons_desktop_to_json(akregator_config_userfeedback akregator_config_userfeedback.desktop SERVICE_TYPES kcmodule.desktop)
install(TARGETS akregator_config_userfeedback DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS akregator_config_userfeedback DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
endif()
......@@ -170,4 +170,4 @@ endif()
kcoreaddons_desktop_to_json(akregator_config_security akregator_config_security.desktop SERVICE_TYPES kcmodule.desktop)
install(FILES akregator_config_security.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
install(TARGETS akregator_config_security DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(TARGETS akregator_config_security DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim/kcms/akregator)
......@@ -4,7 +4,7 @@ Type=Service
X-KDE-ServiceTypes=KCModule
X-DocPath=akregator/advanced-tab.html
X-KDE-Library=akregator_config_advanced
X-KDE-Library=pim/kcms/akregator/akregator_config_advanced
X-KDE-ParentApp=akregator
X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
......
......@@ -4,7 +4,7 @@ Type=Service
X-KDE-ServiceTypes=KCModule
X-DocPath=akregator/appearance-tab.html
X-KDE-Library=akregator_config_appearance
X-KDE-Library=pim/kcms/akregator/akregator_config_appearance
X-KDE-ParentApp=akregator
X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
......
......@@ -4,7 +4,7 @@ Type=Service
X-KDE-ServiceTypes=KCModule
X-DocPath=akregator/archive-tab.html
X-KDE-Library=akregator_config_archive
X-KDE-Library=pim/kcms/akregator/akregator_config_archive
X-KDE-ParentApp=akregator
X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
......
......@@ -4,7 +4,7 @@ Type=Service
X-KDE-ServiceTypes=KCModule
X-DocPath=akregator/browser-tab.html
X-KDE-Library=akregator_config_browser
X-KDE-Library=pim/kcms/akregator/akregator_config_browser
X-KDE-ParentApp=akregator
X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
......
......@@ -4,7 +4,7 @@ Type=Service
X-KDE-ServiceTypes=KCModule
X-DocPath=akregator/general-tab.html
X-KDE-Library=akregator_config_general
X-KDE-Library=pim/kcms/akregator/akregator_config_general
X-KDE-ParentApp=akregator
X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
......
......@@ -3,7 +3,7 @@ Icon=preferences-plugin
Type=Service
X-KDE-ServiceTypes=KCModule
X-KDE-Library=akregator_config_plugins
X-KDE-Library=pim/kcms/akregator/akregator_config_plugins
X-KDE-ParentApp=akregator
X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
......
......@@ -3,7 +3,7 @@ Icon=security-high
Type=Service
X-KDE-ServiceTypes=KCModule
X-KDE-Library=akregator_config_security
X-KDE-Library=pim/kcms/akregator/akregator_config_security
X-KDE-ParentApp=akregator
X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
......
......@@ -3,7 +3,7 @@ Icon=preferences-other
Type=Service
X-KDE-ServiceTypes=KCModule
X-KDE-Library=akregator_config_userfeedback
X-KDE-Library=pim/kcms/akregator/akregator_config_userfeedback
X-KDE-ParentApp=akregator
X-KDE-ParentComponents=akregator,kontact_akregatorplugin
X-KDE-CfgDlgHierarchy=Akregator
......
  • Why are these installed in /pim/kcms/akregator instead of eg pim/akregator/kcms to have every plugin related to akregator in the same folder? looking at the plugins folder, there's no unified location or naming scheme for plugins. kdevelop chose this solution.

    Also, some use the application name (okular, plasma...), others the desktop file name (org.kde.kdecoration2, org.kde.kwin.scenes). Is there an effort to harmonize things?

  • to have every plugin related to akregator in the same folder?

    The plan is to be able to use KPluginMetaData to load the KCMs in Kontact. The KCMs in akregator are not only for internal consumption, that is why I decided for pim/kcms as the prefix. If they were only internal I would agree with your point.

    I did the same for some other PIM apps and Laurent reviewed the MRs and did some changes with the same pattern.

    Is there an effort to harmonize things?

    Yes, so that we can load the KCMs in Kontact using KPluginMetaData and get rid of KServiceTypeTrader & its plugin loading. This is planned since late 2019.

  • and for the naming scheme?

  • You mean for the individual plugins? That can be freely chosen as long as it is unique. Ideally it should be the same as the filename of the plugin, but that was already the case here.

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