Hello community,
here is the log from the commit of package dolphin for openSUSE:Factory checked
in at 2016-09-25 14:28:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dolphin (Old)
and /work/SRC/openSUSE:Factory/.dolphin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dolphin"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dolphin/dolphin.changes 2016-09-14
23:01:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dolphin.new/dolphin.changes 2016-09-25
14:28:48.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Sep 21 17:03:38 UTC 2016 - wba...@tmo.at
+
+- Add properly-check-Shift-toggling.patch to fix toggling the
+ "Move to Trash"/"Delete" actions in the context menu when
+ pressing Shift (kde#354301)
+
+-------------------------------------------------------------------
New:
----
properly-check-Shift-toggling.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dolphin.spec ++++++
--- /var/tmp/diff_new_pack.RXso5H/_old 2016-09-25 14:28:49.000000000 +0200
+++ /var/tmp/diff_new_pack.RXso5H/_new 2016-09-25 14:28:49.000000000 +0200
@@ -26,6 +26,8 @@
Source: dolphin-%{version}.tar.xz
Source1: dolphinsu.desktop
Patch0: dolphin-go_up.diff
+# PATCH-FIX-UPSTREAM properly-check-Shift-toggling.patch kde#354301 -- fixes
toggling the "Move to Trash"/"Delete" actions in the context menu when pressing
Shift
+Patch1: properly-check-Shift-toggling.patch
BuildRequires: baloo5-devel
BuildRequires: baloo5-widgets-devel
BuildRequires: extra-cmake-modules >= 1.6.0
@@ -95,6 +97,7 @@
%prep
%setup -q -n dolphin-%{version}
%patch0 -p1
+%patch1 -p1
%build
%cmake_kf5 -d build
++++++ properly-check-Shift-toggling.patch ++++++
From: Elvis Angelaccio <elvis.angelac...@kde.org>
Date: Wed, 21 Sep 2016 16:13:29 +0000
Subject: Properly check Shift toggling in DolphinRemoveAction
X-Git-Url:
http://quickgit.kde.org/?p=dolphin.git&a=commitdiff&h=3775ef19eaca057985b92cfa3716d3c3a1d22f0f
---
Properly check Shift toggling in DolphinRemoveAction
Documentation of QGuiApplication::keyboardModifiers() says that "It should
be noted this may not reflect the actual keys held on the input device at
the time of calling but rather the modifiers as last reported in one of
the above events".
Since this method is called in DolphinContextMenu's keyPressEvent()
and keyReleaseEvent(), the first time that keyboardModifiers() is
called it doesn't report that shift has been pressed.
Replacing this method with queryKeyboardModifiers() does the job
because the latter doesn't care about the event queue.
BUG: 354301
FIXED-IN: 16.08.2
REVIEW: 128972
---
--- a/src/dolphinremoveaction.cpp
+++ b/src/dolphinremoveaction.cpp
@@ -45,7 +45,7 @@
// Using setText(action->text()) does not apply the &-shortcut.
// This is only done until the original action has been shown at least
once. To
// bypass this issue, the text and &-shortcut is applied manually.
- if (qApp->keyboardModifiers() & Qt::ShiftModifier) {
+ if (qApp->queryKeyboardModifiers() & Qt::ShiftModifier) {
m_action = m_collection ?
m_collection->action(QStringLiteral("delete")) : 0;
setText(i18nc("@action:inmenu", "&Delete"));
} else {
