11
0
2020-10-11 11:01:10 +00:00
committed by Git OBS Bridge
parent 97373a52bc
commit ddcd3b89d0
8 changed files with 27 additions and 101 deletions

View File

@@ -1,38 +0,0 @@
From eb5a3e846e66adcb049cb0b4ec8d791696cd88a8 Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Sat, 12 Sep 2020 13:35:57 +0200
Subject: [PATCH] Improve handling of lifecycle methods in retain-prior-search
mode
---
lookandfeel/contents/runcommand/RunCommand.qml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/lookandfeel/contents/runcommand/RunCommand.qml b/lookandfeel/contents/runcommand/RunCommand.qml
index 59ff44d87..6cdb2da06 100644
--- a/lookandfeel/contents/runcommand/RunCommand.qml
+++ b/lookandfeel/contents/runcommand/RunCommand.qml
@@ -43,10 +43,19 @@ ColumnLayout {
if (runnerWindow.visible) {
queryField.forceActiveFocus();
listView.currentIndex = -1
+ if (runnerWindow.retainPriorSearch) {
+ // Hack: We want to retain the prior seach, but are in a different match session
+ // This way we ensure that the prior search gets executed as a new query
+ const priorSearch = root.query
+ queryField.text = ""
+ queryField.text = priorSearch
+ }
+ queryField.select(root.query.length, 0)
} else {
root.runner = ""
if (runnerWindow.retainPriorSearch) {
- queryField.select(root.query.length, 0)
+ // Same effect as setting empty string, but we want to retain this string for the next session
+ results.model.clear()
} else {
root.query = ""
}
--
2.25.1

View File

@@ -1,46 +0,0 @@
From 8b89b8d6d4525f313e7fd31a347381dc27dd7710 Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Fri, 2 Oct 2020 15:37:59 -0600
Subject: [PATCH] [applets/devicenotifier] Don't open popup for
already-connected devices
The old applet only opened the popup when a new device was attached
after the applet was loaded, not if there was already a device attached
when the applet was loaded. This commit brings back the old behavior by
re-using the approach taken in the old applet.
BUG: 426990
FIXED-IN: 5.20
---
.../devicenotifier/package/contents/ui/devicenotifier.qml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/applets/devicenotifier/package/contents/ui/devicenotifier.qml b/applets/devicenotifier/package/contents/ui/devicenotifier.qml
index d720dfe21..cc531c949 100644
--- a/applets/devicenotifier/package/contents/ui/devicenotifier.qml
+++ b/applets/devicenotifier/package/contents/ui/devicenotifier.qml
@@ -122,9 +122,6 @@ Item {
if (data[source].Removable) {
devicenotifier.connectedRemovables.push(source);
devicenotifier.connectedRemovables = devicenotifier.connectedRemovables;
- devicenotifier.popupIcon = "preferences-desktop-notification";
- expandTimer.restart();
- popupIconTimer.restart()
}
}
@@ -171,7 +168,10 @@ Item {
function processLastDevice(expand) {
if (last) {
- if (isViableDevice(last)) {
+ if (isViableDevice(last) && hpSource.data[last].added) {
+ devicenotifier.popupIcon = "preferences-desktop-notification";
+ expandTimer.restart();
+ popupIconTimer.restart()
last = "";
}
}
--
2.25.1

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8443749557af2f6288a144d3df46d3c0c271e7a9068fc46334faf7c3b6e2ab76
size 9037212

View File

@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAl9jTU0ACgkQEZaMRJKM
rvw18QgAkrhSilxKqGaXdYmBV8O++4gNy8IstOLz4cBNzqjWE5469mUPgMbV78a9
wAvl5XhXlV1wEb6o0FpBYYrncQSUA3tWgH/oow1Q1VZ9SDtyyzgiDVveAUlEHuW6
/Ewg+JeRnvN/33WY6HFwgGuJPbZ0tdZzJrd96iBh71p0aQ58vKwC08rkuWXTPqwP
GmV/dqvA4Z+SYnE/jDxe3oRfCkoR3AuoGJsKOwGleWZmbsz0QIAI0w2YnGWl1Dhd
lluOKMDCCgMk74OCemjGrIphL7ojryG7IwxX6p/mDFS2OuK0mhx+iFtQZAtnAjI1
zIbU2DPfTS9R1CtFwRZ23aD6akK+ZA==
=y6WV
-----END PGP SIGNATURE-----

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4ee63dadf6ea1b3781c3869336349549abd8a8289e471154249ea40e913eda4b
size 8991968

View File

@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl9/PgEACgkQ7JTRj38F
mX7Q/wf/Q+Ol8jLXlGoXiRSF44icGcZwjLr8nCF2qEWKh939G7R3MpJWA3LhEap1
gGkGkScpbxEwmlkYlf37fIWBNMVQwvypKAdfuYyEPSMH94+mwJ6pe2QDuL86ckUx
pRhojUQdZn8gnraf4ns/oSLeTUgeJOIqy4e2prvEt59oyKmTrqS5dNt9qeFRUqpK
oI4CyJgAyDCPNSu0ArAjtceLapmvaSR0jG/0dZ6CBIgNTeQz+OP6XXMBxHU9Vyyb
b+P0naZ9x8MeUWekl+FOEuzI6iqTm3RlSL+t0HJHGPg7EaKLoamS172yAEbEBnx2
Rn8DiXF1NLOIypnvRa9drS2ppCgL5g==
=cpwj
-----END PGP SIGNATURE-----

View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Oct 8 16:55:25 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.20.0
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma-5.20.0
- Too many changes to list here
- Drop patches, now upstream:
* 0001-applets-devicenotifier-Don-t-open-popup-for-already-.patch
* 0001-Improve-handling-of-lifecycle-methods-in-retain-prio.patch
-------------------------------------------------------------------
Sat Oct 3 10:21:26 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@@ -27,7 +27,7 @@ Name: plasma5-workspace
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
# Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
Version: 5.19.90
Version: 5.20.0
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0-or-later
@@ -41,8 +41,6 @@ Source2: plasma.keyring
Source3: baselibs.conf
Source4: plasmafullwayland.desktop
# PATCH-FIX-UPSTREAM
Patch1: 0001-Improve-handling-of-lifecycle-methods-in-retain-prio.patch
Patch2: 0001-applets-devicenotifier-Don-t-open-popup-for-already-.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch