X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e04ec8601f3771aa7ce98d9d1de34e332f26c103..ac6de72048fb50bca1823b8001fb012158050c25:/src/dolphintabwidget.cpp diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp index 0408d7ed4..5ef39dac6 100644 --- a/src/dolphintabwidget.cpp +++ b/src/dolphintabwidget.cpp @@ -1,21 +1,8 @@ -/*************************************************************************** - * Copyright (C) 2014 by Emmanuel Pescosta * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2014 Emmanuel Pescosta + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "dolphintabwidget.h" @@ -25,9 +12,10 @@ #include "dolphinviewcontainer.h" #include -#include #include #include +#include +#include #include #include @@ -37,6 +25,8 @@ DolphinTabWidget::DolphinTabWidget(QWidget* parent) : m_placesSelectorVisible(true), m_lastViewedTab(0) { + KAcceleratorManager::setNoAccel(this); + connect(this, &DolphinTabWidget::tabCloseRequested, this, QOverload::of(&DolphinTabWidget::closeTab)); connect(this, &DolphinTabWidget::currentChanged, @@ -203,6 +193,10 @@ void DolphinTabWidget::openDirectories(const QList& dirs, bool splitView) } else { tabPage->secondaryViewContainer()->setActive(true); } + // BUG: 417230 + // Required for updateViewState() call in openFiles() to work as expected + // If there is a selection, updateViewState() calls are effectively a no-op + tabPage->activeViewContainer()->view()->clearSelection(); continue; } if (splitView && (it != dirs.constEnd())) { @@ -222,7 +216,7 @@ void DolphinTabWidget::openFiles(const QList& files, bool splitView) // for each directory. If the "split view" option is enabled, two // directories are shown inside one tab (see openDirectories()). QList dirs; - foreach (const QUrl& url, files) { + for (const QUrl& url : files) { const QUrl dir(url.adjusted(QUrl::RemoveFilename)); if (!dirs.contains(dir)) { dirs.append(dir); @@ -236,10 +230,14 @@ void DolphinTabWidget::openFiles(const QList& files, bool splitView) // Select the files. Although the files can be split between several // tabs, there is no need to split 'files' accordingly, as // the DolphinView will just ignore invalid selections. - for (int i = oldTabCount; i < tabCount; ++i) { + for (int i = 0; i < tabCount; ++i) { DolphinTabPage* tabPage = tabPageAt(i); tabPage->markUrlsAsSelected(files); tabPage->markUrlAsCurrent(files.first()); + if (i < oldTabCount) { + // Force selection of file if directory was already open, BUG: 417230 + tabPage->activeViewContainer()->view()->updateViewState(); + } } } @@ -260,7 +258,7 @@ void DolphinTabWidget::closeTab(const int index) } DolphinTabPage* tabPage = tabPageAt(index); - emit rememberClosedTab(tabPage->activeViewContainer()->url(), tabPage->saveState()); + Q_EMIT rememberClosedTab(tabPage->activeViewContainer()->url(), tabPage->saveState()); removeTab(index); tabPage->deleteLater(); @@ -309,6 +307,40 @@ void DolphinTabWidget::restoreClosedTab(const QByteArray& state) currentTabPage()->restoreState(state); } +void DolphinTabWidget::copyToInactiveSplitView() +{ + const DolphinTabPage* tabPage = tabPageAt(currentIndex()); + DolphinViewContainer* activeViewContainer = currentTabPage()->activeViewContainer(); + if (!tabPage->splitViewEnabled() || activeViewContainer->view()->selectedItems().isEmpty()) { + return; + } + + if (tabPage->primaryViewActive()) { + // copy from left panel to right + activeViewContainer->view()->copySelectedItems(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url()); + } else { + // copy from right panel to left + activeViewContainer->view()->copySelectedItems(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url()); + } +} + +void DolphinTabWidget::moveToInactiveSplitView() +{ + const DolphinTabPage* tabPage = tabPageAt(currentIndex()); + DolphinViewContainer* activeViewContainer = currentTabPage()->activeViewContainer(); + if (!tabPage->splitViewEnabled() || activeViewContainer->view()->selectedItems().isEmpty()) { + return; + } + + if (tabPage->primaryViewActive()) { + // move from left panel to right + activeViewContainer->view()->moveSelectedItems(activeViewContainer->view()->selectedItems(), tabPage->secondaryViewContainer()->url()); + } else { + // move from right panel to left + activeViewContainer->view()->moveSelectedItems(activeViewContainer->view()->selectedItems(), tabPage->primaryViewContainer()->url()); + } +} + void DolphinTabWidget::detachTab(int index) { Q_ASSERT(index >= 0); @@ -323,8 +355,9 @@ void DolphinTabWidget::detachTab(int index) } args << QStringLiteral("--new-window"); - const QString command = QStringLiteral("dolphin %1").arg(KShell::joinArgs(args)); - KRun::runCommand(command, this); + KIO::CommandLauncherJob *job = new KIO::CommandLauncherJob("dolphin", args, this); + job->setDesktopName(QStringLiteral("org.kde.dolphin")); + job->start(); closeTab(index); } @@ -349,6 +382,7 @@ void DolphinTabWidget::tabUrlChanged(const QUrl& url) const int index = indexOf(qobject_cast(sender())); if (index >= 0) { tabBar()->setTabText(index, tabName(tabPageAt(index))); + tabBar()->setTabToolTip(index, url.toDisplayString(QUrl::PreferLocalFile)); if (tabBar()->isVisible()) { tabBar()->setTabIcon(index, QIcon::fromTheme(KIO::iconNameForUrl(url))); } else { @@ -358,7 +392,7 @@ void DolphinTabWidget::tabUrlChanged(const QUrl& url) // Emit the currentUrlChanged signal if the url of the current tab has been changed. if (index == currentIndex()) { - emit currentUrlChanged(url); + Q_EMIT currentUrlChanged(url); } } } @@ -371,8 +405,8 @@ void DolphinTabWidget::currentTabChanged(int index) } DolphinTabPage* tabPage = tabPageAt(index); DolphinViewContainer* viewContainer = tabPage->activeViewContainer(); - emit activeViewChanged(viewContainer); - emit currentUrlChanged(viewContainer->url()); + Q_EMIT activeViewChanged(viewContainer); + Q_EMIT currentUrlChanged(viewContainer->url()); tabPage->setActive(true); m_lastViewedTab = index; } @@ -384,15 +418,19 @@ void DolphinTabWidget::tabInserted(int index) if (count() > 1) { // Resolve all pending tab icons for (int i = 0; i < count(); ++i) { + const QUrl url = tabPageAt(i)->activeViewContainer()->url(); if (tabBar()->tabIcon(i).isNull()) { - tabBar()->setTabIcon(i, QIcon::fromTheme(KIO::iconNameForUrl(tabPageAt(i)->activeViewContainer()->url()))); + tabBar()->setTabIcon(i, QIcon::fromTheme(KIO::iconNameForUrl(url))); + } + if (tabBar()->tabToolTip(i).isEmpty()) { + tabBar()->setTabToolTip(index, url.toDisplayString(QUrl::PreferLocalFile)); } } tabBar()->show(); } - emit tabCountChanged(count()); + Q_EMIT tabCountChanged(count()); } void DolphinTabWidget::tabRemoved(int index) @@ -405,7 +443,7 @@ void DolphinTabWidget::tabRemoved(int index) tabBar()->hide(); } - emit tabCountChanged(count()); + Q_EMIT tabCountChanged(count()); } QString DolphinTabWidget::tabName(DolphinTabPage* tabPage) const