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

konqhtml kcms: Install in namespace and embed json metadata

parent 03ae7a5e
......@@ -27,13 +27,27 @@ ki18n_wrap_ui(kcm_konqhtml_PART_SRCS
css/cssconfig.ui
)
add_library(kcm_konqhtml MODULE ${kcm_konqhtml_PART_SRCS})
add_library(kcm_konqhtml_static STATIC ${kcm_konqhtml_PART_SRCS})
target_link_libraries(kcm_konqhtml_static KF5::I18n KF5::ConfigWidgets KF5::TextWidgets KF5::Parts KF5::ItemViews)
target_link_libraries(kcm_konqhtml KF5::I18n KF5::ConfigWidgets KF5::TextWidgets KF5::Parts KF5::ItemViews)
kcoreaddons_add_plugin(khtml_general SOURCES plugins/khtml_general.cpp INSTALL_NAMESPACE konqueror_kcms)
kcoreaddons_desktop_to_json(khtml_general khtml_general.desktop)
target_link_libraries(khtml_general kcm_konqhtml_static)
install(TARGETS kcm_konqhtml DESTINATION ${KDE_INSTALL_PLUGINDIR})
kcoreaddons_add_plugin(khtml_behavior SOURCES plugins/khtml_behavior.cpp INSTALL_NAMESPACE konqueror_kcms)
kcoreaddons_desktop_to_json(khtml_behavior khtml_behavior.desktop)
target_link_libraries(khtml_behavior kcm_konqhtml_static)
########### install files ###############
kcoreaddons_add_plugin(khtml_java_js SOURCES plugins/khtml_java_js.cpp INSTALL_NAMESPACE konqueror_kcms)
kcoreaddons_desktop_to_json(khtml_java_js khtml_java_js.desktop)
target_link_libraries(khtml_java_js kcm_konqhtml_static)
kcoreaddons_add_plugin(khtml_appearance SOURCES plugins/khtml_appearance.cpp INSTALL_NAMESPACE konqueror_kcms)
kcoreaddons_desktop_to_json(khtml_appearance khtml_appearance.desktop)
target_link_libraries(khtml_appearance kcm_konqhtml_static)
kcoreaddons_add_plugin(khtml_filter SOURCES plugins/khtml_filter.cpp INSTALL_NAMESPACE konqueror_kcms)
kcoreaddons_desktop_to_json(khtml_filter khtml_filter.desktop)
target_link_libraries(khtml_filter kcm_konqhtml_static)
install( FILES khtml_general.desktop khtml_behavior.desktop khtml_java_js.desktop khtml_appearance.desktop khtml_filter.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( FILES css/template.css DESTINATION ${KDE_INSTALL_DATADIR}/kcmcss )
......@@ -6,7 +6,6 @@ X-DocPath=kcontrol/kcmcss/index.html
Icon=preferences-desktop-theme
X-KDE-Library=kcm_konqhtml
X-KDE-PluginKeyword=khtml_appearance
Name=Appearance
Name[af]=Voorkoms
......
......@@ -5,7 +5,6 @@ X-DocPath=kcontrol5/khtml-behavior/index.html
Icon=konqueror
X-KDE-Library=kcm_konqhtml
X-KDE-PluginKeyword=khtml_behavior
Name=Web Behavior
Name[af]=Web Gedrag
......
......@@ -6,7 +6,6 @@ X-DocPath=kcontrol5/khtml-adblock/index.html
Icon=preferences-web-browser-adblock
X-KDE-Library=kcm_konqhtml
X-KDE-PluginKeyword=khtml_filter
Name=AdBlocK Filters
Name[af]=Advertensie blok filters
......
......@@ -5,7 +5,6 @@ X-DocPath=kcontrol5/khtml-general/index.html
Icon=konqueror
X-KDE-Library=kcm_konqhtml
X-KDE-PluginKeyword=khtml_general
# ctxt: Konqeuror settings relevant to both web browsing and file management.
Name=General
......
......@@ -4,7 +4,6 @@ X-KDE-ServiceTypes=KCModule
X-DocPath=kcontrol5/khtml-java-js/index.html
Icon=java
X-KDE-Library=kcm_konqhtml
X-KDE-PluginKeyword=khtml_java_js
Name=Java & JavaScript
Name[af]=Java & Javaskrip
......
......@@ -35,14 +35,6 @@
#include "filteropts.h"
#include "generalopts.h"
K_PLUGIN_FACTORY(KcmKonqHtmlFactory,
registerPlugin<KJSParts>("khtml_java_js");
registerPlugin<KMiscHTMLOptions>("khtml_behavior");
registerPlugin<KKonqGeneralOptions>("khtml_general");
registerPlugin<KCMFilter>("khtml_filter");
registerPlugin<KAppearanceOptions>("khtml_appearance");
)
KJSParts::KJSParts(QWidget *parent, const QVariantList &)
: KCModule(parent)
{
......@@ -127,6 +119,3 @@ QString KJSParts::quickHelp() const
"fine-grained from which hosts you want to execute Java and/or "
"JavaScript programs.");
}
#include "main.moc"
#include "appearance.h"
#include <KPluginFactory>
K_PLUGIN_CLASS_WITH_JSON(KAppearanceOptions, "khtml_appearance.json")
#include "khtml_appearance.moc"
#include "htmlopts.h"
#include <KPluginFactory>
K_PLUGIN_CLASS_WITH_JSON(KMiscHTMLOptions, "khtml_behavior.json")
#include "khtml_behavior.moc"
#include "filteropts.h"
#include <KPluginFactory>
K_PLUGIN_CLASS_WITH_JSON(KCMFilter, "khtml_filter.json")
#include "khtml_filter.moc"
#include "htmlopts.h"
#include <KPluginFactory>
K_PLUGIN_CLASS_WITH_JSON(KMiscHTMLOptions, "khtml_general.json")
#include "khtml_general.moc"
#include "main.h"
#include <KPluginFactory>
K_PLUGIN_CLASS_WITH_JSON(KJSParts, "khtml_java_js.json")
#include "khtml_java_js.moc"
......@@ -5,18 +5,9 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcmperformance\")
set(kcm_performance_PART_SRCS kcmperformance.cpp konqueror.cpp system.cpp )
ki18n_wrap_ui(kcm_performance_PART_SRCS konqueror_ui.ui system_ui.ui )
add_library(kcm_performance MODULE ${kcm_performance_PART_SRCS})
kcoreaddons_add_plugin(kcm_performance SOURCES ${kcm_performance_PART_SRCS} INSTALL_NAMESPACE "konqueror_kcms")
kcoreaddons_desktop_to_json(kcm_performance kcmperformance.desktop)
target_link_libraries(kcm_performance KF5::ConfigWidgets KF5::KIOWidgets KF5::I18n Qt5::DBus )
install(TARGETS kcm_performance DESTINATION ${KDE_INSTALL_PLUGINDIR} )
########### install files ###############
install( FILES kcmkonqyperformance.desktop kcmperformance.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
......@@ -16,10 +16,8 @@
#include "konqueror.h"
#include "system.h"
#include <KPluginFactory>
K_PLUGIN_FACTORY(KCMPerformanceConfigFactory,
registerPlugin<KCMPerformance::Config>("performance");
registerPlugin<KCMPerformance::KonquerorConfig>("konqueror");
)
K_PLUGIN_FACTORY_WITH_JSON(KCMPerformanceConfigFactory, "kcmperformance.json", registerPlugin<KCMPerformance::KonquerorConfig>();)
namespace KCMPerformance
{
......
......@@ -3,7 +3,6 @@ Icon=preferences-system-performance
Type=Service
X-KDE-ServiceTypes=KCModule
X-KDE-Library=kcm_performance
X-KDE-PluginKeyword=performance
Name=KDE Performance
Name[af]=KDE Werkverrigting
......
Supports Markdown
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