┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/dolphinmainwindow.cpp4
-rw-r--r--src/dolphinpart.json.in1
-rw-r--r--src/kitemviews/kitemlistcontroller.cpp59
-rw-r--r--src/kitemviews/kitemlistcontroller.h2
-rw-r--r--src/org.kde.dolphin.appdata.xml1
-rw-r--r--src/settings/kcm/kcmdolphingeneral.json1
-rw-r--r--src/settings/kcm/kcmdolphinnavigation.json1
-rw-r--r--src/settings/kcm/kcmdolphinviewmodes.json1
-rw-r--r--src/views/dolphinview.cpp5
9 files changed, 39 insertions, 36 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index d47eac4b4..7064c63c9 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -631,7 +631,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent *event)
QStringList(),
i18n("Do not ask again"),
&doNotAskAgainCheckboxResult,
- KMessageBox::Dangerous);
+ KMessageBox::Notify | KMessageBox::Dangerous);
if (doNotAskAgainCheckboxResult) {
GeneralSettings::setConfirmClosingTerminalRunningProgram(false);
@@ -1792,7 +1792,7 @@ void DolphinMainWindow::setupActions()
replaceLocation->setWhatsThis(xi18nc("@info:whatsthis",
"This switches to editing the location and selects it "
"so you can quickly enter a different location."));
- actionCollection()->setDefaultShortcut(replaceLocation, Qt::CTRL | Qt::Key_L);
+ actionCollection()->setDefaultShortcuts(replaceLocation, {Qt::CTRL | Qt::Key_L, Qt::ALT | Qt::Key_D});
connect(replaceLocation, &QAction::triggered, this, &DolphinMainWindow::replaceLocation);
// setup 'Go' menu
diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index 59be51716..e8c87b8f2 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -17,7 +17,6 @@
"Name[cs]": "Pohled Dolphin",
"Name[da]": "Dolphin-visning",
"Name[de]": "Dolphin-Ansicht",
- "Name[el]": "Dolphin View",
"Name[en_GB]": "Dolphin View",
"Name[eo]": "Dolfin-Vido",
"Name[es]": "Vista de Dolphin",
diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 5598e77bd..0f3c5bc8c 100644
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -50,7 +50,7 @@ KItemListController::KItemListController(KItemModelBase *model, KItemListView *v
, m_selectionManager(new KItemListSelectionManager(this))
, m_keyboardManager(new KItemListKeyboardSearchManager(this))
, m_pressedIndex(std::nullopt)
- , m_pressedMousePos()
+ , m_pressedMouseGlobalPos()
, m_autoActivationTimer(nullptr)
, m_swipeGesture(Qt::CustomGesture)
, m_twoFingerTapGesture(Qt::CustomGesture)
@@ -186,11 +186,13 @@ KItemListController::MouseDoubleClickAction KItemListController::mouseDoubleClic
int KItemListController::indexCloseToMousePressedPosition() const
{
+ const QPointF pressedMousePos = m_view->transform().map(m_view->scene()->views().first()->mapFromGlobal(m_pressedMouseGlobalPos.toPoint()));
+
QHashIterator<KItemListWidget *, KItemListGroupHeader *> it(m_view->m_visibleGroups);
while (it.hasNext()) {
it.next();
KItemListGroupHeader *groupHeader = it.value();
- const QPointF mappedToGroup = groupHeader->mapFromItem(nullptr, m_pressedMousePos);
+ const QPointF mappedToGroup = groupHeader->mapFromItem(nullptr, pressedMousePos);
if (groupHeader->contains(mappedToGroup)) {
return it.key()->index();
}
@@ -580,6 +582,7 @@ bool KItemListController::inputMethodEvent(QInputMethodEvent *event)
bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent *event, const QTransform &transform)
{
m_mousePress = true;
+ m_pressedMouseGlobalPos = event->screenPos();
if (event->source() == Qt::MouseEventSynthesizedByQt && m_isTouchEvent) {
return false;
@@ -589,8 +592,8 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent *event, const
return false;
}
- m_pressedMousePos = transform.map(event->pos());
- m_pressedIndex = m_view->itemAt(m_pressedMousePos);
+ const QPointF pressedMousePos = transform.map(event->pos());
+ m_pressedIndex = m_view->itemAt(pressedMousePos);
const Qt::MouseButtons buttons = event->buttons();
@@ -616,12 +619,11 @@ bool KItemListController::mouseMoveEvent(QGraphicsSceneMouseEvent *event, const
return false;
}
- const QPointF pos = transform.map(event->pos());
-
if (m_pressedIndex.has_value() && !m_view->rubberBand()->isActive()) {
// Check whether a dragging should be started
if (event->buttons() & Qt::LeftButton) {
- if ((pos - m_pressedMousePos).manhattanLength() >= QApplication::startDragDistance()) {
+ const auto distance = (event->screenPos() - m_pressedMouseGlobalPos).manhattanLength();
+ if (distance >= QApplication::startDragDistance()) {
if (!m_selectionManager->isSelected(m_pressedIndex.value())) {
// Always assure that the dragged item gets selected. Usually this is already
// done on the mouse-press event, but when using the selection-toggle on a
@@ -1066,13 +1068,12 @@ void KItemListController::tapTriggered(QTapGesture *tap, const QTransform &trans
m_view->m_tapAndHoldIndicator->setActive(false);
}
- m_pressedMousePos = transform.map(tap->position());
- m_pressedIndex = m_view->itemAt(m_pressedMousePos);
-
+ const QPointF pressedMousePos = transform.map(tap->position());
+ m_pressedIndex = m_view->itemAt(pressedMousePos);
if (m_dragActionOrRightClick) {
m_dragActionOrRightClick = false;
} else {
- onPress(tap->hotSpot().toPoint(), tap->position().toPoint(), Qt::NoModifier, Qt::LeftButton);
+ onPress(m_pressedMouseGlobalPos.toPoint(), tap->position().toPoint(), Qt::NoModifier, Qt::LeftButton);
onRelease(transform.map(tap->position()), Qt::NoModifier, Qt::LeftButton, true);
}
m_isTouchEvent = false;
@@ -1092,23 +1093,24 @@ void KItemListController::tapAndHoldTriggered(QGestureEvent *event, const QTrans
if (m_pinchGestureInProgress) {
return;
}
- m_pressedMousePos = transform.map(event->mapToGraphicsScene(tap->position()));
- m_pressedIndex = m_view->itemAt(m_pressedMousePos);
-
- if (m_pressedIndex.has_value() && !m_selectionManager->isSelected(m_pressedIndex.value())) {
- m_selectionManager->clearSelection();
- m_selectionManager->setSelected(m_pressedIndex.value());
+ const QPointF pressedMousePos = transform.map(event->mapToGraphicsScene(tap->position()));
+ m_pressedIndex = m_view->itemAt(pressedMousePos);
+ if (m_pressedIndex.has_value()) {
+ if (!m_selectionManager->isSelected(m_pressedIndex.value())) {
+ m_selectionManager->clearSelection();
+ m_selectionManager->setSelected(m_pressedIndex.value());
+ }
if (!m_selectionMode) {
Q_EMIT selectionModeChangeRequested(true);
}
- } else if (!m_pressedIndex.has_value()) {
+ } else {
m_selectionManager->clearSelection();
startRubberBand();
}
Q_EMIT scrollerStop();
- m_view->m_tapAndHoldIndicator->setStartPosition(m_pressedMousePos);
+ m_view->m_tapAndHoldIndicator->setStartPosition(pressedMousePos);
m_view->m_tapAndHoldIndicator->setActive(true);
m_dragActionOrRightClick = true;
@@ -1183,8 +1185,8 @@ void KItemListController::twoFingerTapTriggered(QGestureEvent *event, const QTra
}
if (twoTap->state() == Qt::GestureStarted) {
- m_pressedMousePos = transform.map(twoTap->pos());
- m_pressedIndex = m_view->itemAt(m_pressedMousePos);
+ const QPointF pressedMousePos = transform.map(twoTap->pos());
+ m_pressedIndex = m_view->itemAt(pressedMousePos);
if (m_pressedIndex.has_value()) {
onPress(twoTap->screenPos().toPoint(), twoTap->pos().toPoint(), Qt::ControlModifier, Qt::LeftButton);
onRelease(transform.map(twoTap->pos()), Qt::ControlModifier, Qt::LeftButton, false);
@@ -1533,14 +1535,16 @@ bool KItemListController::onPress(const QPoint &screenPos, const QPointF &pos, c
return true;
}
- if (m_view->isAboveExpansionToggle(m_pressedIndex.value_or(-1), m_pressedMousePos)) {
+ const QPointF pressedMousePos = m_view->transform().map(pos);
+
+ if (m_view->isAboveExpansionToggle(m_pressedIndex.value_or(-1), pressedMousePos)) {
m_selectionManager->endAnchoredSelection();
m_selectionManager->setCurrentItem(m_pressedIndex.value());
m_selectionManager->beginAnchoredSelection(m_pressedIndex.value());
return true;
}
- m_selectionTogglePressed = m_view->isAboveSelectionToggle(m_pressedIndex.value_or(-1), m_pressedMousePos);
+ m_selectionTogglePressed = m_view->isAboveSelectionToggle(m_pressedIndex.value_or(-1), pressedMousePos);
if (m_selectionTogglePressed) {
m_selectionManager->setSelected(m_pressedIndex.value(), 1, KItemListSelectionManager::Toggle);
// The previous anchored selection has been finished already in
@@ -1606,7 +1610,7 @@ bool KItemListController::onPress(const QPoint &screenPos, const QPointF &pos, c
// clear the selection in mouseReleaseEvent(), unless the items are dragged.
m_clearSelectionIfItemsAreNotDragged = true;
- if (m_selectionManager->selectedItems().count() == 1 && m_view->isAboveText(m_pressedIndex.value_or(-1), m_pressedMousePos)) {
+ if (m_selectionManager->selectedItems().count() == 1 && m_view->isAboveText(m_pressedIndex.value_or(-1), pressedMousePos)) {
Q_EMIT selectedItemTextPressed(m_pressedIndex.value_or(-1));
}
}
@@ -1708,7 +1712,8 @@ bool KItemListController::onPress(const QPoint &screenPos, const QPointF &pos, c
bool KItemListController::onRelease(const QPointF &pos, const Qt::KeyboardModifiers modifiers, const Qt::MouseButtons buttons, bool touch)
{
- const bool isAboveSelectionToggle = m_view->isAboveSelectionToggle(m_pressedIndex.value_or(-1), m_pressedMousePos);
+ const QPointF pressedMousePos = pos;
+ const bool isAboveSelectionToggle = m_view->isAboveSelectionToggle(m_pressedIndex.value_or(-1), pressedMousePos);
if (isAboveSelectionToggle) {
m_selectionTogglePressed = false;
return true;
@@ -1792,7 +1797,7 @@ bool KItemListController::onRelease(const QPointF &pos, const Qt::KeyboardModifi
}
}
- m_pressedMousePos = QPointF();
+ m_pressedMouseGlobalPos = QPointF();
m_pressedIndex = std::nullopt;
m_clearSelectionIfItemsAreNotDragged = false;
return false;
@@ -1801,7 +1806,7 @@ bool KItemListController::onRelease(const QPointF &pos, const Qt::KeyboardModifi
void KItemListController::startRubberBand()
{
if (m_selectionBehavior == MultiSelection) {
- QPointF startPos = m_pressedMousePos;
+ QPoint startPos = m_view->transform().map(m_view->scene()->views().first()->mapFromGlobal(m_pressedMouseGlobalPos.toPoint()));
if (m_view->scrollOrientation() == Qt::Vertical) {
startPos.ry() += m_view->scrollOffset();
if (m_view->itemSize().width() < 0) {
diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h
index 0969ed21a..122ef836d 100644
--- a/src/kitemviews/kitemlistcontroller.h
+++ b/src/kitemviews/kitemlistcontroller.h
@@ -355,7 +355,7 @@ private:
KItemListSelectionManager *m_selectionManager;
KItemListKeyboardSearchManager *m_keyboardManager;
std::optional<int> m_pressedIndex;
- QPointF m_pressedMousePos;
+ QPointF m_pressedMouseGlobalPos;
QTimer *m_autoActivationTimer;
diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml
index 383b65fc9..57a1e4a89 100644
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@ -336,6 +336,7 @@
<url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=dolphin</url>
<url type="help">https://docs.kde.org/?application=dolphin</url>
<url type="donation">https://www.kde.org/community/donations/?app=dolphin&amp;source=appdata</url>
+ <url type="contribute">https://invent.kde.org/system/dolphin/-/blob/master/README.md</url>
<screenshots>
<screenshot type="default">
<caption>File management in Dolphin</caption>
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 584aed1f0..57fcaa3da 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -11,7 +11,6 @@
"Name[cs]": "Obecné",
"Name[da]": "Generelt",
"Name[de]": "Allgemein",
- "Name[el]": "Γενικά",
"Name[en_GB]": "General",
"Name[eo]": "Ĝenerala",
"Name[es]": "General",
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index d9250e3d8..8bf2cbfd8 100644
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -11,7 +11,6 @@
"Name[cs]": "Navigace",
"Name[da]": "Navigation",
"Name[de]": "Navigation",
- "Name[el]": "Πλοήγηση",
"Name[en_GB]": "Navigation",
"Name[eo]": "Navigado",
"Name[es]": "Navegación",
diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 80477a832..3ba03c5fa 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -11,7 +11,6 @@
"Name[cs]": "Režimy pohledu",
"Name[da]": "Visningstilstande",
"Name[de]": "Ansichts-Modi",
- "Name[el]": "Λειτουργίες Προβολής",
"Name[en_GB]": "View Modes",
"Name[eo]": "Vidreĝimoj",
"Name[es]": "Modos de vistas",
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index ebbf324b0..3db81ec18 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -87,6 +87,7 @@ DolphinView::DolphinView(const QUrl &url, QWidget *parent)
, m_currentItemUrl()
, m_scrollToCurrentItem(false)
, m_restoredContentsPosition()
+ , m_controlWheelAccumulatedDelta(0)
, m_selectedUrls()
, m_clearSelectionBeforeSelectingNewItems(false)
, m_markFirstNewlySelectedItemAsCurrent(false)
@@ -2037,9 +2038,9 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray &role, con
KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);
job->uiDelegate()->setAutoErrorHandlingEnabled(true);
- forceUrlsSelection(newUrl, {newUrl});
-
if (!newNameExistsAlready) {
+ forceUrlsSelection(newUrl, {newUrl});
+
// Only connect the result signal if there is no item with the new name
// in the model yet, see bug 328262.
connect(job, &KJob::result, this, &DolphinView::slotRenamingResult);
generated by cgit v1.3 (git 2.53.0) at 2026-04-18 05:33:43 +0000