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"

This code has been commented out for 6 years and was not missed.

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"

Currently when we invoke KRunner and it is already running we will start binary,
KDBusService will check if it is already registered and then call
org.freedesktop.Application.Activate. Cutting the middle out should improve the
time that it takes to show KRunner and make it less likely that key strokes are
lost. If KRunner is not running we, can rely on dbus activiation to start KRunner.
Unfortunately we cannnot call Activate with dbus-send because it doesn't support
it's argument type. Instead we can just use the existing display method.
CCBUG: 416145

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"

Piotr Henryk Dabrowski authored Mar 02, 2020 and Nate Graham committed Sep 09, 2020

Aggregate text for KRunner in DesktopView to prevent eating fast-typed characters.

CCBUG: 416145
partial solution: resolved for DesktopView, not resolved for running KRunner from shortcut

Test Plan:
When DesktopView is focused, typed characters show KRunner query.
All fast-typed characters should now appear correctly in KRunner window,
instead of only first typed character.

Simplifies the logic of the busy indicator since now it will already
fade out when it's not running.
Also addresses the logic of the timer which was off.

This made krunner freak out on Wayland for some reason to investigate,
both opacity animations were triggering a repaint and we tried to render
too often making the process block. With this change it works fine
again.

Otherwise we have to reevaluate a bunch of expressions to update with
the new value. Fixes several warnings too.

BUG: 421589

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"

The HIG specifies that actions and menu items should start with action
verbs, and that ellipses should only be used for actions that open a
separate window to complete the action. This commit applies that to the
"Activities..." menu item.

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"

Eike Hein authored Jul 17, 2020 and David Edmundson committed Sep 03, 2020

This patch adds a new enabled role to kicker items instead of creating
and deleting them if they're not available due to configuration.

It ports to the new session code in libkworkspace dropping our need for
KDE4Support.

From: D20237

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"

This came up in today's VDG meeting. A user who right-clicks on the
desktop is highly likely to want to change the wallpaper, but the menu
item that does this is the last item in the menu, not the first. We can
move it up to the top.

The "Open with Dolphin" item is likewise moved up too so that we don't
have two single-item sections in a row.

ksmserver starts in plasma-session. It currently sets the
SESSION_MANAGER env back to just kinit and plasma-session which is then
used for anything else that plasma-session starts.

This is after start-plasma has synced the environment to DBus/systemd.

By using the shared UpdateLaunchEnvJob we can sync all these places.

BUG: 425982

Nicolas Fella authored Sep 01, 2020 and Aleix Pol Gonzalez committed Sep 01, 2020

The whole concept is almost unused and there's no point in having it there but empty

See also https://phabricator.kde.org/T13553

This was the last occurrence that didn't get ported/detected.
Because of that the updating did not work and uninstalling
an entry using the "Widget Explorer" did not work.

BUG: 423055
BUG: 424429
FIXED-IN: 5.20

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"

Putting every item on its own line makes the ordering clear and will make
future changes simpler to review.

BUG: 406388
FIXED-IN: 5.20

This allows us to use a comma as a decimal separator, even if we have a
dot configured.
Especially when there is a difference between the official and
implemented decimal separator (see bug report) or if the user switches
between settings with a different separator.
By making sure that no [ or ] character(used for vectors) is contained
before replacing the string we make sure that we still provide all the
features Qalculate does.

BUG: 376666
FIXED-IN: 5.20

FEATURE: 397092
FIXED-IN: 5.20

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"

Alexander Lohnau authored Aug 27, 2020 and Nate Graham committed Aug 28, 2020

CCBUG: 416255