In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

GIT_SILENT

GIT_SILENT

This makes it consistent with regular headers without authentication required.
It was still using bold for the header and italic for the sub text.

BUG: 388515
FIXED-IN: 5.12.0

Differential Revision: https://phabricator.kde.org/D9649

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Summary: BUG: 384900

Test Plan:
Tested in KDE Neon. Before:
{F5475292}

After:
{F5475293}

Reviewers: #kde_applications, davidedmundson, broulik, apol

Reviewed By: apol

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D8659

before comparing new and old row, map the new one to the source model

BUG:386454

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Instead of duplicating the name and icon work, just bind it to the QAction itself.
Also respect visibility of actions for KIOSK restriction.

Differential Revision: https://phabricator.kde.org/D8358

Summary:
In "Fix colours not updating in systemsettings", the application name
got changed from "systemsettings5" (inferred from the binary name) to
"systemsettings", which results in a change from "org.kde.systemsettings5"
as DBus path to "org.kde.systemsettings". KLauncher uses org.kde.<binary name>
by default, so that needs to be overwritten.

Fixes the "KDEInit count not launch /usr/bin/systemsettings5" message after
closing systemsettings and likely also launching it while it's running.

Test Plan:
Opened it from dolphin and closed the window again. Only after
this patch the KDEInit error message disappeared.

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: ngraham, broulik, rikmills, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D8455

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Summary:
(after a lot of looking, it turns it's out not a bug in the QQC desktop
style)

KSharedConfig::openConfig() opens the config based on the app name.

The app name comes from the exec name, or
KAboutData::setApplicationData.
setApplicationData only works on an existing qApp.

This means the QPT loaded in the QApp uses the wrong config.
The effect is minimal because most stuff is in kdeglobals, but it means
the KSharedConfigPtr is not shared with the one used elsewhere in the
app. This is wasteful, but also means the QPT calling
reparseConfiguration doesn't take effect, leading to colours not being
dynamically updated

Reviewers: #plasma, mart

Reviewed By: #plasma, mart

Subscribers: ngraham, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D8399

Summary:
kcm modules have backgroundColor as main background color.
The new systemsettings sidebar design has viewBackgroundColor as main background color.
Through this, the kcm modules look a little misplaced to me.

With this patch, the sidebar's headers have backgroundColor as their background color, matching the background
color of kcm modules. Thus, kcm modules look a little better embedded.

This might conflict other's tastes or even conflict VDG guidelines I am not aware of. So let me know what you
think.

Reviewers: #plasma_workspaces, mart

Reviewed By: #plasma_workspaces, mart

Subscribers: broulik, ngraham, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D8277

Summary:
correct keyboard navigation in systemsettings, since there is a mix
of qwidgets and QQuickWidgets, when a QQW takes focus, then the
focus chain in the keyboard navigation should traverse it, then go
put of it and focus the next widget, being a normal qwidget or another
qqw in which case the same hack applies

Test Plan:
navigating in and out the sidebar and the intro page works

QML based kcms are still not managed, they will need a similar thing

Reviewers: #plasma

Subscribers: davidedmundson, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D8221

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Test Plan: Opened it.

Reviewers: #plasma, apol

Reviewed By: apol

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D8143