continue to implement user feedback

wilder
Laurent Montel 6 years ago
parent 8f37080554
commit 983185504f
  1. 6
      src/CMakeLists.txt
  2. 10
      src/configuredialog/configuremiscpage.cpp
  3. 5
      src/configuredialog/configuremiscpage.h

@ -294,6 +294,11 @@ kconfig_add_kcfg_files(kmailprivate_LIB_SRCS
editor/custommimeheader/custommimeheader.kcfgc editor/custommimeheader/custommimeheader.kcfgc
) )
set(kmail_userfeedback_LIB)
if (TARGET KUserFeedbackWidgets)
set(kmail_userfeedback_LIB KUserFeedbackWidgets)
endif()
add_library(kmailprivate ${kmailprivate_LIB_SRCS}) add_library(kmailprivate ${kmailprivate_LIB_SRCS})
generate_export_header(kmailprivate BASE_NAME kmail) generate_export_header(kmailprivate BASE_NAME kmail)
@ -337,6 +342,7 @@ target_link_libraries(kmailprivate
KF5::AkonadiSearchPIM KF5::AkonadiSearchPIM
KF5::WebEngineViewer KF5::WebEngineViewer
KF5::SyntaxHighlighting KF5::SyntaxHighlighting
${kmail_userfeedback_LIB}
) )
target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KF5::MessageList,INTERFACE_INCLUDE_DIRECTORIES>) target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KF5::MessageList,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KF5::MessageViewer,INTERFACE_INCLUDE_DIRECTORIES>) target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KF5::MessageViewer,INTERFACE_INCLUDE_DIRECTORIES>)

@ -33,6 +33,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include <WebEngineViewer/NetworkPluginUrlInterceptor> #include <WebEngineViewer/NetworkPluginUrlInterceptor>
#ifdef WITH_KUSERFEEDBACK #ifdef WITH_KUSERFEEDBACK
#include <KUserFeedback/FeedbackConfigWidget>
#endif #endif
using namespace MailCommon; using namespace MailCommon;
@ -52,6 +53,10 @@ MiscPage::MiscPage(QWidget *parent)
MiscPagePrintingTab *printingTab = new MiscPagePrintingTab(); MiscPagePrintingTab *printingTab = new MiscPagePrintingTab();
addTab(printingTab, i18n("Printing")); addTab(printingTab, i18n("Printing"));
#ifdef WITH_KUSERFEEDBACK
KuserFeedBackPagePrintingTab *userFeedBackTab = new KuserFeedBackPagePrintingTab();
addTab(userFeedBackTab, i18n("User Feedback"));
#endif
} }
QString MiscPageFolderTab::helpAnchor() const QString MiscPageFolderTab::helpAnchor() const
@ -180,7 +185,10 @@ void MiscPagePrintingTab::save()
KuserFeedBackPagePrintingTab::KuserFeedBackPagePrintingTab(QWidget *parent) KuserFeedBackPagePrintingTab::KuserFeedBackPagePrintingTab(QWidget *parent)
: ConfigModuleTab(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() void KuserFeedBackPagePrintingTab::save()

@ -90,6 +90,9 @@ private:
}; };
#ifdef WITH_KUSERFEEDBACK #ifdef WITH_KUSERFEEDBACK
namespace KUserFeedback {
class FeedbackConfigWidget;
}
class KuserFeedBackPagePrintingTab : public ConfigModuleTab class KuserFeedBackPagePrintingTab : public ConfigModuleTab
{ {
Q_OBJECT Q_OBJECT
@ -100,6 +103,8 @@ public:
private: private:
void doLoadFromGlobalSettings() override; void doLoadFromGlobalSettings() override;
KUserFeedback::FeedbackConfigWidget *mUserFeedbackWidget = nullptr;
}; };
#endif #endif

Loading…
Cancel
Save