diff --git a/print-manager-kded/CMakeLists.txt b/print-manager-kded/CMakeLists.txt --- a/print-manager-kded/CMakeLists.txt +++ b/print-manager-kded/CMakeLists.txt @@ -11,14 +11,14 @@ ) add_library(kded_printmanager MODULE ${printmanagerkded_SRCS}) +set_target_properties(kded_printmanager PROPERTIES OUTPUT_NAME printmanager) target_link_libraries(kded_printmanager Qt5::Core KF5::DBusAddons KF5::Notifications kcupslib ) -install(TARGETS kded_printmanager DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES printmanager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded) +install(TARGETS kded_printmanager DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kded) install(FILES printmanager.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR}) diff --git a/print-manager-kded/PrintManagerKded.h b/print-manager-kded/PrintManagerKded.h --- a/print-manager-kded/PrintManagerKded.h +++ b/print-manager-kded/PrintManagerKded.h @@ -34,6 +34,4 @@ ~PrintManagerKded(); }; -K_PLUGIN_FACTORY(PrintDFactory, registerPlugin();) - #endif // PRINTMANAGERKDED_H diff --git a/print-manager-kded/PrintManagerKded.cpp b/print-manager-kded/PrintManagerKded.cpp --- a/print-manager-kded/PrintManagerKded.cpp +++ b/print-manager-kded/PrintManagerKded.cpp @@ -20,8 +20,12 @@ #include "PrintManagerKded.h" +#include + #include "NewPrinterNotification.h" +K_PLUGIN_CLASS_WITH_JSON(PrintManagerKded, "printmanager.json") + PrintManagerKded::PrintManagerKded(QObject *parent, const QVariantList &args) : KDEDModule(parent) { @@ -34,4 +38,4 @@ { } -#include "moc_PrintManagerKded.cpp" +#include "PrintManagerKded.moc" diff --git a/print-manager-kded/printmanager.json b/print-manager-kded/printmanager.json new file mode 100644 --- /dev/null +++ b/print-manager-kded/printmanager.json @@ -0,0 +1,13 @@ +{ + "KPlugin": { + "Description": "Inform when a new printer is detected, and print problems", + "Name": "Print Manager", + "ServiceTypes": [ + "KDEDModule" + ] + }, + "OnlyShowIn": "KDE;", + "X-KDE-Kded-autoload": true, + "X-KDE-Kded-phase": 1, + "X-KDE-ModuleType": "Library" +}