diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2b5c0a389..2710efaae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -294,6 +294,11 @@ kconfig_add_kcfg_files(kmailprivate_LIB_SRCS editor/custommimeheader/custommimeheader.kcfgc ) +set(kmail_userfeedback_LIB) +if (TARGET KUserFeedbackWidgets) + set(kmail_userfeedback_LIB KUserFeedbackWidgets) +endif() + add_library(kmailprivate ${kmailprivate_LIB_SRCS}) generate_export_header(kmailprivate BASE_NAME kmail) @@ -337,6 +342,7 @@ target_link_libraries(kmailprivate KF5::AkonadiSearchPIM KF5::WebEngineViewer KF5::SyntaxHighlighting + ${kmail_userfeedback_LIB} ) target_include_directories(kmailprivate PUBLIC $) target_include_directories(kmailprivate PUBLIC $) diff --git a/src/configuredialog/configuremiscpage.cpp b/src/configuredialog/configuremiscpage.cpp index e314ff199..470c9a674 100644 --- a/src/configuredialog/configuremiscpage.cpp +++ b/src/configuredialog/configuremiscpage.cpp @@ -33,6 +33,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils; #include #ifdef WITH_KUSERFEEDBACK +#include #endif using namespace MailCommon; @@ -52,6 +53,10 @@ MiscPage::MiscPage(QWidget *parent) MiscPagePrintingTab *printingTab = new MiscPagePrintingTab(); addTab(printingTab, i18n("Printing")); +#ifdef WITH_KUSERFEEDBACK + KuserFeedBackPagePrintingTab *userFeedBackTab = new KuserFeedBackPagePrintingTab(); + addTab(userFeedBackTab, i18n("User Feedback")); +#endif } QString MiscPageFolderTab::helpAnchor() const @@ -180,7 +185,10 @@ void MiscPagePrintingTab::save() KuserFeedBackPagePrintingTab::KuserFeedBackPagePrintingTab(QWidget *parent) : ConfigModuleTab(parent) { - + mUserFeedbackWidget = new KUserFeedback::FeedbackConfigWidget(this); + QHBoxLayout *l = new QHBoxLayout(this); + l->setContentsMargins(0, 0, 0, 0); + l->addWidget(mUserFeedbackWidget); } void KuserFeedBackPagePrintingTab::save() diff --git a/src/configuredialog/configuremiscpage.h b/src/configuredialog/configuremiscpage.h index 4b69a51ad..0d56247b9 100644 --- a/src/configuredialog/configuremiscpage.h +++ b/src/configuredialog/configuremiscpage.h @@ -90,6 +90,9 @@ private: }; #ifdef WITH_KUSERFEEDBACK +namespace KUserFeedback { +class FeedbackConfigWidget; +} class KuserFeedBackPagePrintingTab : public ConfigModuleTab { Q_OBJECT @@ -100,6 +103,8 @@ public: private: void doLoadFromGlobalSettings() override; + KUserFeedback::FeedbackConfigWidget *mUserFeedbackWidget = nullptr; + }; #endif