From 6ae9e38a5500defa53bcb9277bb4b136ba3494d8 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Tue, 18 Jul 2023 16:05:18 +0300 Subject: Add contribute link to AppStream metadata Pointing to the readme file is reasonable enough. --- src/org.kde.dolphin.appdata.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src') 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 @@ https://bugs.kde.org/enter_bug.cgi?format=guided&product=dolphin https://docs.kde.org/?application=dolphin https://www.kde.org/community/donations/?app=dolphin&source=appdata + https://invent.kde.org/system/dolphin/-/blob/master/README.md File management in Dolphin -- cgit v1.3 From 3123c086a77c28730866e848178c7e2d9a9006cb Mon Sep 17 00:00:00 2001 From: Steffen Hartleib Date: Thu, 27 Jul 2023 09:23:07 +0000 Subject: Avoid unwanted drag and drop action Use the screen position for a touch event to calculate the start drag distance. BUG: 464594 --- src/kitemviews/kitemlistcontroller.cpp | 49 ++++++++++++++++++---------------- src/kitemviews/kitemlistcontroller.h | 2 +- 2 files changed, 27 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index 5598e77bd..592917677 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 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,9 +1093,8 @@ 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); - + const QPointF pressedMousePos = transform.map(event->mapToGraphicsScene(tap->position())); + m_pressedIndex = m_view->itemAt(pressedMousePos); if (m_pressedIndex.has_value() && !m_selectionManager->isSelected(m_pressedIndex.value())) { m_selectionManager->clearSelection(); m_selectionManager->setSelected(m_pressedIndex.value()); @@ -1108,7 +1108,7 @@ void KItemListController::tapAndHoldTriggered(QGestureEvent *event, const QTrans 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 +1183,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 +1533,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 +1608,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 +1710,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 +1795,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 +1804,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 m_pressedIndex; - QPointF m_pressedMousePos; + QPointF m_pressedMouseGlobalPos; QTimer *m_autoActivationTimer; -- cgit v1.3 From 2f0369b333ac5c714d59b74665e76a41a5936042 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 28 Jul 2023 01:43:52 +0000 Subject: SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/dolphinpart.json.in | 1 - src/settings/kcm/kcmdolphingeneral.json | 1 - src/settings/kcm/kcmdolphinnavigation.json | 1 - src/settings/kcm/kcmdolphinviewmodes.json | 1 - 4 files changed, 4 deletions(-) (limited to 'src') 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/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", -- cgit v1.3 From 567f2858acc260023c3e64112097f0dc1a39ea55 Mon Sep 17 00:00:00 2001 From: Amol Godbole Date: Tue, 1 Aug 2023 09:59:57 +0000 Subject: Fix incorrect file selection after file rename forceUrlsSelection() needs to be called only when new name of renamed file does not exist. BUG: 417930 --- src/views/dolphinview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 9666ca2ab..fba7e6419 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -2063,9 +2063,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); -- cgit v1.3 From 89dcef3af497fb43ce612df45b1aa968a6a2ccb0 Mon Sep 17 00:00:00 2001 From: Steffen Hartleib Date: Tue, 1 Aug 2023 10:10:28 +0000 Subject: Enter selection mode by tap-and-holding an already selected item Allow entering selection mode by touching an already selected item. BUG: 462778 --- src/kitemviews/kitemlistcontroller.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index 592917677..0f3c5bc8c 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -1095,13 +1095,15 @@ void KItemListController::tapAndHoldTriggered(QGestureEvent *event, const QTrans } const QPointF pressedMousePos = transform.map(event->mapToGraphicsScene(tap->position())); m_pressedIndex = m_view->itemAt(pressedMousePos); - if (m_pressedIndex.has_value() && !m_selectionManager->isSelected(m_pressedIndex.value())) { - m_selectionManager->clearSelection(); - m_selectionManager->setSelected(m_pressedIndex.value()); + 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(); } -- cgit v1.3 From c1b260524381c4ac19d8055a4f716723ab7fb649 Mon Sep 17 00:00:00 2001 From: Amol Godbole Date: Thu, 3 Aug 2023 10:44:20 +0000 Subject: DolphinView: initialize m_controlWheelAccumulatedDelta Ctrl + scroll wheel zoom was not working as designed after Dolphin is launched. Initialize m_controlWheelAccumulatedDelta in DolphinView's constructor. BUG: 469354 --- src/views/dolphinview.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index fba7e6419..13c8b4df2 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -92,6 +92,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) -- cgit v1.3 From 0dac2ea9e94fc4c3843476f6c4da44a6596619d9 Mon Sep 17 00:00:00 2001 From: Amol Godbole Date: Thu, 3 Aug 2023 11:00:51 +0000 Subject: Add alternate shortcut for replaceLocation action Alt + D is a common shortcut for replacing location. Add this as an alternate shortcut. BUG: 468445 --- src/dolphinmainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 2baaa1198..e6a025ed6 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1800,7 +1800,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 -- cgit v1.3 From fc6fa9ba982f73dd2da5e3016006ce74eebb1bac Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Thu, 10 Aug 2023 14:13:13 +0200 Subject: Set Notify flag on close running terminal app prompt Ensures the warning sound is played. --- src/dolphinmainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index e6a025ed6..68704b89a 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -629,7 +629,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent *event) QStringList(), i18n("Do not ask again"), &doNotAskAgainCheckboxResult, - KMessageBox::Dangerous); + KMessageBox::Notify | KMessageBox::Dangerous); if (doNotAskAgainCheckboxResult) { GeneralSettings::setConfirmClosingTerminalRunningProgram(false); -- cgit v1.3