mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 00:11:21 +00:00
Merge branch 'Applications/19.08'
This commit is contained in:
commit
e5c698f295
|
@ -596,6 +596,16 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const
|
||||||
m_selectionManager->endAnchoredSelection();
|
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) {
|
if (m_pressedIndex >= 0) {
|
||||||
m_selectionManager->setCurrentItem(m_pressedIndex);
|
m_selectionManager->setCurrentItem(m_pressedIndex);
|
||||||
|
|
||||||
|
|
|
@ -171,8 +171,8 @@ bool runInstallerScript(const QString &path, bool hasArgVariants, const QStringL
|
||||||
}
|
}
|
||||||
|
|
||||||
errorText = i18nc(
|
errorText = i18nc(
|
||||||
"%1 = comma separated list of arguments",
|
"%2 = comma separated list of arguments",
|
||||||
"Installer script %1 failed, tried arguments \"%1\".", path, argVariants.join(i18nc("Separator between arguments", "\", \"")));
|
"Installer script %1 failed, tried arguments \"%2\".", path, argVariants.join(i18nc("Separator between arguments", "\", \"")));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue