GitLab

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"

The default value for active in the kcfg file inside kwin for colour
correction is false.

As we have a bridge that mirrors the config contents over DBus and
defaults hardcoded in a second format this has got out of sync.

This both leads to the default button being enabled/disabled incorrectly
on a fresh system and not working properly.

More important as geo-location is on by default this leads to http
requests being made without the user's explicit consent. A major bug.

BUG: 442253

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"

A `QSize(0,0)` is still valid... Fixes sometimes preview not showing
and other problems with the thumbnailer.

CCBUG: 430862


(cherry picked from commit 5d81c41e)

This reverts commit 13057013.

That commit set the cursorVisible: propety to true. However that
property only exists in the QtQuickControls 2 TextField, not the QQC1
version. We ported the lock screen to PlasmaComponents3 (which
internally uses QQC2) after Plasma 5.18, meaning that in the LTS
version, we still have a QQC1 TextField so this property does not exist.
Trying to set it causes a runtime error and breaks the lock screen.

BUG: 435233
FIXED-IN: 5.18.7.1

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"

When computing the delta between the visible and the last saved launcher
order state, following the reordering of launchers, the code was incorrectly
comparing resolved and unresolved (i.e., for config storage) launcher URLs.
This lead to an incorrect result and therefore pinned tasks jumping around
in the Task Manager applet.

BUG:426880


(cherry picked from commit fa00ca6a)

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"

When this was ported to C++, it missed the actual variable assignments.


(cherry picked from commit 76088e21)

In commit 45e0a722 we changed the focus
on the textfield with the intention of fixing the cusor blinking.

This had the unfortunate side effect of breaking waking out of the
screensaver mode with just the keyboard.

That screensaver mode was bound to:
```
property bool blockUI: mainBlock.mainPasswordBox.text.length > 0
```
for that to change, we need to have focus.

Instead this patches cursor blinking more explicity.

Doing it only in the lock screen (as opposed to the toolkit) makes sense
as this only happens due to somewhat unusual usage inside the
lockscreen.

BUG: 431286


(cherry picked from commit 2cbd7e4c)

An opacity of 0 but still visible still results in nodes in the
scenegraph, which is wasteful.  This is shown in gammaray with some
warnings.

Enabled is also bound to visible as if a text field has focus it still
animates the cursor icon even if inivisble, producing wakeups.

BUG: 347772
FIXED-IN: 5.21


(cherry picked from commit 45e0a722)

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"

(cherry picked from commit a36ffb69)

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"

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"

I noticed that on the first time I bring up the calendar by clicking the clock on my Plasma panel, it always shows 'No event for today'. If I click another day on the calendar and then click back on today, it shows today's events fine. It should display it correctly the first time. To fix this bug, we need to compare the date without time. This patch is the same as the one that fixes BUG 395956, but only for Plasma/5.18 branch.

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"

For SNI icons menu is imported from DBus. If during import it is
changed, for example some actions added or replaced, new actions are
added, but old one are only marked for removal in next event loop run.
As a result menu size is too big until delereLater takes effect.
Queue connection, so that Qt will have a chance to delete menu entires
before menu is used.

BUG: 421275
FIXED-IN: 5.18.6

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"

Notification spec says, when replacing a notification:

> The server must atomically (ie with no flicker or other visual cues) replace the given notification with this one.

Notifications shifting about is a "visual cue".

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

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:
Even when the vendor logo is turned off it can be briefly seen when the login screen changes from the fadeout state back into normal.

Comments in other code say that "OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)" so this patch replaces it with NumberAnimation.

There's also a minor fix included - placing the drop shadow sooner in the hierarchy because it should be drawn underneath an object, not in front of it.

Test Plan:
Reduce the fadeout time to something small and then:

`sddm-greeter --test-mode --theme /usr/share/sddm/themes/breeze`

Reviewers: ngraham, cblack, #plasma, mart

Reviewed By: ngraham, #plasma, mart

Subscribers: mart, plasma-devel

Tags: #plasma

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

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

When setting "until turned off" it effectively sets it to today in a year. Now with leap year this appears to have broken.
Instead, just use 100 days, which is plenty, even if we come up with a "for 1 month" option maybe.

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

Summary:
In some rare situations SNI icons are not rendered. It happens randomly, only some users are affected. It does not happen on every login.
Only SNI icons are not rendered, Plasmoids are fine. Restarting plasmashell or re-adding systemtray applet helps.

In QML all roles need to be defined before model is used. When data engines is used a a source for a data model, all roles has to be defined and proper value assigned (not a null QVariant). StatusNotifierItemSource does this properly, but in some situations it sets null QVariant for Icon. Setting empty/null QVariant removes key/role from the date set (DataConteiner implementation). If data model was loaded earlier or later when Icon has proper value it will work properly. In some rare situation it is possible that data model is loaded when Icon has null value assigned (in other words - removed), role is removed from the data model and not avaiable to system tray applet.

This fix makes sure that there is always a value for Icon role. To check if icon is null native method has to be used - QML does not understand that QIcon can be null.

BUG: 419305
FIXED-IN: 5.18.5

Test Plan: I don't have any reliable method to reproduce this issue.

Reviewers: #plasma_workspaces, #plasma, davidedmundson, broulik, ngraham

Reviewed By: ngraham

Subscribers: plasma-devel

Tags: #plasma

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