From aabfce16797a321094c7a30c96c11a1a7ae01a9f Mon Sep 17 00:00:00 2001 From: Jackson Reed McNeill Date: Wed, 17 Jul 2019 21:35:51 +0200 Subject: [PATCH 1/2] Fix rubber band not going away after right-click Summary: Fix rubber band not going away after right-click in the folder view Test Plan: Hold left click Drag to make rubber band Right click Reviewers: #dolphin, ngraham, elvisangelaccio Reviewed By: #dolphin, ngraham Subscribers: elvisangelaccio, ngraham, kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D21590 --- src/kitemviews/kitemlistcontroller.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index 4bfd5b4cb2..82553ddda2 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -596,6 +596,16 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const m_selectionManager->endAnchoredSelection(); } + if (event->buttons() & Qt::RightButton) { + // Stop rubber band from persisting after right-clicks + KItemListRubberBand* rubberBand = m_view->rubberBand(); + if (rubberBand->isActive()) { + disconnect(rubberBand, &KItemListRubberBand::endPositionChanged, this, &KItemListController::slotRubberBandChanged); + rubberBand->setActive(false); + m_view->setAutoScroll(false); + } + } + if (m_pressedIndex >= 0) { m_selectionManager->setCurrentItem(m_pressedIndex); From 2f5e83419b9585df13614c36387054bc41bcc551 Mon Sep 17 00:00:00 2001 From: Alexander Potashev Date: Sat, 20 Jul 2019 23:56:35 +0300 Subject: [PATCH 2/2] servicemenuinstaller: Fix placeholders in i18n string Test Plan: it compiles Reviewers: #dolphin, aacid Reviewed By: aacid Subscribers: aacid, ltoscano, kde-i18n-doc, kfm-devel, #localization Tags: #dolphin Differential Revision: https://phabricator.kde.org/D22597 --- .../services/servicemenuinstaller/servicemenuinstaller.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp b/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp index c06a71c237..037874539d 100644 --- a/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp +++ b/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp @@ -205,8 +205,8 @@ bool runInstallerScript(const QString &path, bool hasArgVariants, const QStringL } errorText = i18nc( - "%1 = comma separated list of arguments", - "Installer script %1 failed, tried arguments \"%1\".", path, argVariants.join(i18nc("Separator between arguments", "\", \""))); + "%2 = comma separated list of arguments", + "Installer script %1 failed, tried arguments \"%2\".", path, argVariants.join(i18nc("Separator between arguments", "\", \""))); return false; }