kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/19.08'

Browse source
This commit is contained in:
Alexander Potashev 2019-07-21 17:53:36 +03:00
parent 0e16dbc78b 2f5e83419b
commit e5c698f295
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/kitemviews/kitemlistcontroller.cpp
View file

@ -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);

4
src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
View file

@ -171,8 +171,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;
}