From 9991eb0f5eaf38aa7f0c61206937d4cd013e24c8 Mon Sep 17 00:00:00 2001 From: Jaime Torres Amate Date: Mon, 10 Sep 2018 16:45:45 +0200 Subject: Don't assign twice the same key to the action New Tab Summary: QKeySequence::AddTab = Qt::CTRL + Qt::Key_T. Leaving only the first avoids the warning window "There are two actions (New Tab, New Tab) that want to use the same shortcut (Ctrl+T)" BUG: 398324 Test Plan: su - test unset KDE_FULL_SESSION dolphin After: No more the warning window. Reviewers: #dolphin, elvisangelaccio Reviewed By: #dolphin, elvisangelaccio Subscribers: elvisangelaccio, kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D15371 --- 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 f8b35d4a7..a862ae803 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1079,7 +1079,7 @@ void DolphinMainWindow::setupActions() QAction* newTab = actionCollection()->addAction(QStringLiteral("new_tab")); newTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-new"))); newTab->setText(i18nc("@action:inmenu File", "New Tab")); - actionCollection()->setDefaultShortcuts(newTab, {Qt::CTRL + Qt::Key_T, QKeySequence::AddTab}); + actionCollection()->setDefaultShortcuts(newTab, {QKeySequence::AddTab}); connect(newTab, &QAction::triggered, this, static_cast(&DolphinMainWindow::openNewActivatedTab)); QAction* closeTab = KStandardAction::close( -- cgit v1.3 From ddfc86ab8c207b81ec9ac83167d081b8d01c2750 Mon Sep 17 00:00:00 2001 From: Andreas Krutzler Date: Tue, 2 Oct 2018 20:25:57 +0200 Subject: Fix that dragging a file can trigger inline rename. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Inline renaming is aborted as soon as an item is dragged. Previously, ’m_dragging' was used to determine if an item was being dragged. However, inline renaming is triggered after a certain amount of time, during which time the user may have stopped dragging items. BUG: 398375 FIXED-IN: 18.08.2 Test Plan: When dragging an selected item, inline renaming should never be started, regardless of where you drag it (Places panel, other split-view window, out of the Dolphin window, ...). Reviewers: wbauer, elvisangelaccio, #dolphin, ngraham Reviewed By: wbauer, elvisangelaccio, #dolphin, ngraham Subscribers: kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D15904 --- src/views/dolphinview.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 342c22638..1db62b800 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -755,6 +755,7 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event) case QEvent::GraphicsSceneDragEnter: if (watched == m_view) { m_dragging = true; + abortTwoClicksRenaming(); } break; @@ -1432,8 +1433,8 @@ void DolphinView::slotTwoClicksRenamingTimerTimeout() { const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); - // verify that only one item is selected and that no item is dragged - if (selectionManager->selectedItems().count() == 1 && !m_dragging) { + // verify that only one item is selected + if (selectionManager->selectedItems().count() == 1) { const int index = selectionManager->currentItem(); const QUrl fileItemUrl = m_model->fileItem(index).url(); -- cgit v1.3