GitLab

BUG: 421426
FIXED-IN: 5.20

BUG: 360359
FIXED-IN: 5.20

CCBUG: 395376

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"

We have to pass the m_runner parameter to the runner manager,
otherwise it defaults to an empty string.

The m_runner is already correctly when we
activate the single runner mode using dbus.

BUG: 417070

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"

GIT_SILENT

GIT_SILENT

Fixes regression introduced in 7a6b1a03

BUG: 418109
FIXED-IN: 5.18.5

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

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

Reviewers: broulik

Reviewed By: broulik

Subscribers: meven, broulik, plasma-devel

Tags: #plasma

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

Summary:
This is a fix for D25043.

Using `disabledTextColor` results in bad text legibility with Plasma themes that use filled-style highlight effects.

If colors are prefered over opacity as means of achieving text shading then we need to mix `disabledTextColor` with `textColor` on selection.

This creates an effect that is comparable to the `opacity: isCurrent? 0.8 : 0.6` code that is used throughout Plasma for subtitles.

Test Plan:
Only test with master.

Arc Color (before):
{F7770216}

Arc Color (after):
{F7770217}

McMojave (before):
{F7770218}

McMojave (after):
{F7770219}

Breeze (before):
{F7770215}

Breeze (after):
{F7770221}

Breeze Dark (before):
{F7770222}

Breeze Dark (after):
{F7770223}

Reviewers: #plasma, #vdg, ngraham, broulik

Reviewed By: #plasma, #vdg, ngraham, broulik

Subscribers: ngraham, broulik, plasma-devel

Tags: #plasma

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

Reviewers: davidedmundson

Reviewed By: davidedmundson

Subscribers: plasma-devel

Tags: #plasma

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

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"

The applet was using an the "nepomuk" icon which got deleted from Breeze recently.

This patch replaces it with the generic and widespread "search" icon, which restores the same look for Breeze before the "nepomuk" deletion.

GIT_SILENT

GIT_SILENT

Summary:
This allows devs to run: "make clang-format" and format all files easily
using the preset KDE clang format style

This patch adds support so devs can easily test the intended formatting
now, it doesn't change the code yet.

Doing an initial run to commit everything will happen later.

Test Plan:
Ran script
git diff was full of amazingly cleaned code

See D25134

GIT_SILENT

Makes text more readable on dark backgrounds by not changing the text opacity.
Subtext and category now have the same intensity, though.

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

Lets the user of the view decide how many items they want

Differential Revision: >https://phabricator.kde.org/D24926