Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Workspace
Commits
ca2765cc
Commit
ca2765cc
authored
Sep 28, 2020
by
Benjamin Port
Committed by
Benjamin Port
Oct 15, 2020
Browse files
KCM User feedback: Setup module data
parent
dec9a10e
Changes
3
Hide whitespace changes
Inline
Side-by-side
kcms/feedback/CMakeLists.txt
View file @
ca2765cc
...
...
@@ -2,6 +2,14 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcm_feedback\")
set
(
kcm_feedback_PART_SRCS feedback.cpp
)
kcmutils_generate_module_data
(
kcm_feedback_PART_SRCS
MODULE_DATA_HEADER feedbackdata.h
MODULE_DATA_CLASS_NAME FeedbackData
SETTINGS_HEADERS feedbacksettings.h
SETTINGS_CLASSES FeedbackSettings
)
kconfig_add_kcfg_files
(
kcm_feedback_PART_SRCS feedbacksettings.kcfgc GENERATE_MOC
)
add_library
(
kcm_feedback MODULE
${
kcm_feedback_PART_SRCS
}
)
...
...
kcms/feedback/feedback.cpp
View file @
ca2765cc
...
...
@@ -30,9 +30,10 @@
#include
<KUserFeedback/Provider>
#include
<KUserFeedback/FeedbackConfigUiController>
#include
"feedbackdata.h"
#include
"feedbacksettings.h"
K_PLUGIN_
CLASS
_WITH_JSON
(
Feedback
,
"kcm_feedback.json"
)
;
K_PLUGIN_
FACTORY
_WITH_JSON
(
Feedback
Factory
,
"kcm_feedback.json"
,
registerPlugin
<
Feedback
>
();
registerPlugin
<
FeedbackData
>
();
)
//Program to icon hash
static
QHash
<
QString
,
QString
>
s_programs
=
{
...
...
@@ -50,7 +51,7 @@ inline void swap(QJsonValueRef v1, QJsonValueRef v2)
Feedback
::
Feedback
(
QObject
*
parent
,
const
QVariantList
&
args
)
:
KQuickAddons
::
ManagedConfigModule
(
parent
)
//UserFeedback.conf is used by KUserFeedback which uses QSettings and won't go through globals
,
m_
feedbackSettings
(
new
Feedback
Settings
(
this
))
,
m_
data
(
new
Feedback
Data
(
this
))
{
Q_UNUSED
(
args
)
...
...
@@ -134,7 +135,7 @@ bool Feedback::feedbackEnabled() const
FeedbackSettings
*
Feedback
::
feedbackSettings
()
const
{
return
m_
feedbackS
ettings
;
return
m_
data
->
s
ettings
()
;
}
#include
"feedback.moc"
kcms/feedback/feedback.h
View file @
ca2765cc
...
...
@@ -25,6 +25,7 @@
#include
<KSharedConfig>
class
FeedbackSettings
;
class
FeedbackData
;
class
Feedback
:
public
KQuickAddons
::
ManagedConfigModule
{
...
...
@@ -49,5 +50,5 @@ class Feedback : public KQuickAddons::ManagedConfigModule
private:
QHash
<
int
,
QHash
<
QString
,
QJsonArray
>>
m_uses
;
QJsonArray
m_feedbackSources
;
Feedback
Settings
*
m_feedbackSettings
;
Feedback
Data
*
m_data
;
};
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment