SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / dolphintabwidget.cpp

diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index ec0c783bc34a491426dadda1d5ce4656dbbf4f01..b2f838a40ab7e44b4a4241fd893407c344d8cf56 100644 (file)
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -1,112 +1,102 @@
-/***************************************************************************
- * Copyright (C) 2014 by Emmanuel Pescosta <emmanuelpescosta099@gmail.com> *
- *                                                                         *
- *   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 <emmanuelpescosta099@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */

 
 #include "dolphintabwidget.h"
 
 #include "dolphin_generalsettings.h"
 #include "dolphintabbar.h"
 
 #include "dolphintabwidget.h"
 
 #include "dolphin_generalsettings.h"
 #include "dolphintabbar.h"

-#include "dolphintabpage.h"

 #include "dolphinviewcontainer.h"
 #include "dolphinviewcontainer.h"

+#include "views/draganddrophelper.h"

 
 

+#include <KAcceleratorManager>

 #include <KConfigGroup>
 #include <KConfigGroup>

-#include <KRun>
+#include <KIO/CommandLauncherJob>
+#include <KLocalizedString>

 #include <KShell>
 #include <KShell>

+#include <KStringHandler>

 #include <kio/global.h>
 
 #include <QApplication>
 #include <QDropEvent>
 #include <kio/global.h>
 
 #include <QApplication>
 #include <QDropEvent>

+#include <QStackedWidget>

 
 

-DolphinTabWidget::DolphinTabWidget(QWidget* parent) :
-    QTabWidget(parent),
-    m_placesSelectorVisible(true),
-    m_lastViewedTab(0)
-{
-    connect(this, &DolphinTabWidget::tabCloseRequested,
-            this, QOverload<int>::of(&DolphinTabWidget::closeTab));
-    connect(this, &DolphinTabWidget::currentChanged,
-            this, &DolphinTabWidget::currentTabChanged);
-
-    DolphinTabBar* tabBar = new DolphinTabBar(this);
-    connect(tabBar, &DolphinTabBar::openNewActivatedTab,
-            this, QOverload<int>::of(&DolphinTabWidget::openNewActivatedTab));
-    connect(tabBar, &DolphinTabBar::tabDropEvent,
-            this, &DolphinTabWidget::tabDropEvent);
-    connect(tabBar, &DolphinTabBar::tabDetachRequested,
-            this, &DolphinTabWidget::detachTab);
-    tabBar->hide();
+DolphinTabWidget::DolphinTabWidget(DolphinNavigatorsWidgetAction *navigatorsWidget, QWidget *parent)
+    : QTabWidget(parent)
+    , m_lastViewedTab(nullptr)
+    , m_navigatorsWidget{navigatorsWidget}
+{
+    KAcceleratorManager::setNoAccel(this);
+
+    connect(this, &DolphinTabWidget::tabCloseRequested, this, QOverload<int>::of(&DolphinTabWidget::closeTab));
+    connect(this, &DolphinTabWidget::currentChanged, this, &DolphinTabWidget::currentTabChanged);
+
+    DolphinTabBar *tabBar = new DolphinTabBar(this);
+    connect(tabBar, &DolphinTabBar::openNewActivatedTab, this, QOverload<int>::of(&DolphinTabWidget::openNewActivatedTab));
+    connect(tabBar, &DolphinTabBar::tabDragMoveEvent, this, &DolphinTabWidget::tabDragMoveEvent);
+    connect(tabBar, &DolphinTabBar::tabDropEvent, this, &DolphinTabWidget::tabDropEvent);
+    connect(tabBar, &DolphinTabBar::tabDetachRequested, this, &DolphinTabWidget::detachTab);
+    connect(tabBar, &DolphinTabBar::tabRenamed, this, &DolphinTabWidget::renameTab);

 
     setTabBar(tabBar);
     setDocumentMode(true);
     setElideMode(Qt::ElideRight);
     setUsesScrollButtons(true);
 
     setTabBar(tabBar);
     setDocumentMode(true);
     setElideMode(Qt::ElideRight);
     setUsesScrollButtons(true);

+    setTabBarAutoHide(true);
+
+    auto stackWidget{findChild<QStackedWidget *>()};
+    // i18n: This accessible name will be announced any time the user moves keyboard focus e.g. from the toolbar or the places panel towards the main working
+    // area of Dolphin. It gives structure. This container does not only contain the main view but also the status bar, the search panel, filter, and selection
+    // mode bars, so calling it just a "View" is a bit wrong, but hopefully still gets the point across.
+    stackWidget->setAccessibleName(i18nc("accessible name of Dolphin's view container", "Location View")); // Without this call, the non-descript Qt provided
+                                                                                                           // "Layered Pane" role is announced.

 }
 
 }
 

-DolphinTabPage* DolphinTabWidget::currentTabPage() const
+DolphinTabPage *DolphinTabWidget::currentTabPage() const

 {
     return tabPageAt(currentIndex());
 }
 
 {
     return tabPageAt(currentIndex());
 }
 

-DolphinTabPage* DolphinTabWidget::nextTabPage() const
+DolphinTabPage *DolphinTabWidget::nextTabPage() const

 {
     const int index = currentIndex() + 1;
     return tabPageAt(index < count() ? index : 0);
 }
 
 {
     const int index = currentIndex() + 1;
     return tabPageAt(index < count() ? index : 0);
 }
 

-DolphinTabPage* DolphinTabWidget::prevTabPage() const
+DolphinTabPage *DolphinTabWidget::prevTabPage() const

 {
     const int index = currentIndex() - 1;
     return tabPageAt(index >= 0 ? index : (count() - 1));
 }
 
 {
     const int index = currentIndex() - 1;
     return tabPageAt(index >= 0 ? index : (count() - 1));
 }
 

-DolphinTabPage* DolphinTabWidget::tabPageAt(const int index) const
+DolphinTabPage *DolphinTabWidget::tabPageAt(const int index) const

 {
 {

-    return static_cast<DolphinTabPage*>(widget(index));
+    return static_cast<DolphinTabPage *>(widget(index));

 }
 
 }
 

-void DolphinTabWidget::saveProperties(KConfigGroup& group) const
+void DolphinTabWidget::saveProperties(KConfigGroup &group) const

 {
     const int tabCount = count();
     group.writeEntry("Tab Count", tabCount);
     group.writeEntry("Active Tab Index", currentIndex());
 
     for (int i = 0; i < tabCount; ++i) {
 {
     const int tabCount = count();
     group.writeEntry("Tab Count", tabCount);
     group.writeEntry("Active Tab Index", currentIndex());
 
     for (int i = 0; i < tabCount; ++i) {

-        const DolphinTabPage* tabPage = tabPageAt(i);
+        const DolphinTabPage *tabPage = tabPageAt(i);

         group.writeEntry("Tab Data " % QString::number(i), tabPage->saveState());
     }
 }
 
         group.writeEntry("Tab Data " % QString::number(i), tabPage->saveState());
     }
 }
 

-void DolphinTabWidget::readProperties(const KConfigGroup& group)
+void DolphinTabWidget::readProperties(const KConfigGroup &group)

 {
     const int tabCount = group.readEntry("Tab Count", 0);
     for (int i = 0; i < tabCount; ++i) {
         if (i >= count()) {
             openNewActivatedTab();
         }
 {
     const int tabCount = group.readEntry("Tab Count", 0);
     for (int i = 0; i < tabCount; ++i) {
         if (i >= count()) {
             openNewActivatedTab();
         }

-        if (group.hasKey("Tab Data " % QString::number(i))) {
-            // Tab state created with Dolphin > 4.14.x
-            const QByteArray state = group.readEntry("Tab Data " % QString::number(i), QByteArray());
-            tabPageAt(i)->restoreState(state);
-        } else {
-            // Tab state created with Dolphin <= 4.14.x
-            const QByteArray state = group.readEntry("Tab " % QString::number(i), QByteArray());
-            tabPageAt(i)->restoreStateV1(state);
-        }
+        const QByteArray state = group.readEntry("Tab Data " % QString::number(i), QByteArray());
+        tabPageAt(i)->restoreState(state);

     }
 
     const int index = group.readEntry("Active Tab Index", 0);
     }
 
     const int index = group.readEntry("Active Tab Index", 0);


@@ -125,57 +115,94 @@ void DolphinTabWidget::refreshViews()
 
     const int tabCount = count();
     for (int i = 0; i < tabCount; ++i) {
 
     const int tabCount = count();
     for (int i = 0; i < tabCount; ++i) {

-        tabBar()->setTabText(i, tabName(tabPageAt(i)));
+        updateTabName(i);

         tabPageAt(i)->refreshViews();
     }
 }
 
         tabPageAt(i)->refreshViews();
     }
 }
 

+void DolphinTabWidget::updateTabName(int index)
+{
+    Q_ASSERT(index >= 0);
+
+    if (!tabPageAt(index)->customLabel().isEmpty()) {
+        QString name = tabPageAt(index)->customLabel();
+        tabBar()->setTabText(index, name);
+        return;
+    }
+
+    tabBar()->setTabText(index, tabName(tabPageAt(index)));
+}
+

 bool DolphinTabWidget::isUrlOpen(const QUrl &url) const
 {
 bool DolphinTabWidget::isUrlOpen(const QUrl &url) const
 {

-    return indexByUrl(url).first >= 0;
+    return viewOpenAtDirectory(url).has_value();
+}
+
+bool DolphinTabWidget::isItemVisibleInAnyView(const QUrl &urlOfItem) const
+{
+    return viewShowingItem(urlOfItem).has_value();

 }
 
 void DolphinTabWidget::openNewActivatedTab()
 {
 }
 
 void DolphinTabWidget::openNewActivatedTab()
 {

-    const DolphinViewContainer* oldActiveViewContainer = currentTabPage()->activeViewContainer();
-    Q_ASSERT(oldActiveViewContainer);
+    std::unique_ptr<DolphinUrlNavigator::VisualState> oldNavigatorState;
+    if (currentTabPage()->primaryViewActive() || !m_navigatorsWidget->secondaryUrlNavigator()) {
+        oldNavigatorState = m_navigatorsWidget->primaryUrlNavigator()->visualState();
+    } else {
+        oldNavigatorState = m_navigatorsWidget->secondaryUrlNavigator()->visualState();
+    }

 
 

-    const bool isUrlEditable = oldActiveViewContainer->urlNavigator()->isUrlEditable();
+    const DolphinViewContainer *oldActiveViewContainer = currentTabPage()->activeViewContainer();
+    Q_ASSERT(oldActiveViewContainer);

 
     openNewActivatedTab(oldActiveViewContainer->url());
 
 
     openNewActivatedTab(oldActiveViewContainer->url());
 

-    DolphinViewContainer* newActiveViewContainer = currentTabPage()->activeViewContainer();
+    DolphinViewContainer *newActiveViewContainer = currentTabPage()->activeViewContainer();

     Q_ASSERT(newActiveViewContainer);
 
     // The URL navigator of the new tab should have the same editable state
     // as the current tab
     Q_ASSERT(newActiveViewContainer);
 
     // The URL navigator of the new tab should have the same editable state
     // as the current tab

-    newActiveViewContainer->urlNavigator()->setUrlEditable(isUrlEditable);
+    newActiveViewContainer->urlNavigator()->setVisualState(*oldNavigatorState.get());

 
     // Always focus the new tab's view
     newActiveViewContainer->view()->setFocus();
 }
 
 
     // Always focus the new tab's view
     newActiveViewContainer->view()->setFocus();
 }
 

-void DolphinTabWidget::openNewActivatedTab(const QUrl& primaryUrl, const QUrl& secondaryUrl)
+void DolphinTabWidget::openNewActivatedTab(const QUrl &primaryUrl, const QUrl &secondaryUrl)

 {
     openNewTab(primaryUrl, secondaryUrl);
 {
     openNewTab(primaryUrl, secondaryUrl);

-    setCurrentIndex(count() - 1);
+    if (GeneralSettings::openNewTabAfterLastTab()) {
+        setCurrentIndex(count() - 1);
+    } else {
+        setCurrentIndex(currentIndex() + 1);
+    }

 }
 
 }
 

-void DolphinTabWidget::openNewTab(const QUrl& primaryUrl, const QUrl& secondaryUrl, TabPlacement tabPlacement)
+DolphinTabPage *DolphinTabWidget::openNewTab(const QUrl &primaryUrl, const QUrl &secondaryUrl, DolphinTabWidget::NewTabPosition position)

 {
 {

-    QWidget* focusWidget = QApplication::focusWidget();
+    QWidget *focusWidget = QApplication::focusWidget();

 
 

-    DolphinTabPage* tabPage = new DolphinTabPage(primaryUrl, secondaryUrl, this);
+    DolphinTabPage *tabPage = new DolphinTabPage(primaryUrl, secondaryUrl, this);

     tabPage->setActive(false);
     tabPage->setActive(false);

-    tabPage->setPlacesSelectorVisible(m_placesSelectorVisible);
-    connect(tabPage, &DolphinTabPage::activeViewChanged,
-            this, &DolphinTabWidget::activeViewChanged);
-    connect(tabPage, &DolphinTabPage::activeViewUrlChanged,
-            this, &DolphinTabWidget::tabUrlChanged);
+    connect(tabPage, &DolphinTabPage::activeViewChanged, this, &DolphinTabWidget::activeViewChanged);
+    connect(tabPage, &DolphinTabPage::activeViewUrlChanged, this, &DolphinTabWidget::tabUrlChanged);
+    connect(tabPage->activeViewContainer(), &DolphinViewContainer::captionChanged, this, [this, tabPage]() {
+        updateTabName(indexOf(tabPage));
+    });
+
+    if (position == NewTabPosition::FollowSetting) {
+        if (GeneralSettings::openNewTabAfterLastTab()) {
+            position = NewTabPosition::AtEnd;
+        } else {
+            position = NewTabPosition::AfterCurrent;
+        }
+    }
+

     int newTabIndex = -1;
     int newTabIndex = -1;

-    if (tabPlacement == AfterCurrentTab) {
+    if (position == NewTabPosition::AfterCurrent || (position == NewTabPosition::FollowSetting && !GeneralSettings::openNewTabAfterLastTab())) {

         newTabIndex = currentIndex() + 1;
     }
         newTabIndex = currentIndex() + 1;
     }

+

     insertTab(newTabIndex, tabPage, QIcon() /* loaded in tabInserted */, tabName(tabPage));
 
     if (focusWidget) {
     insertTab(newTabIndex, tabPage, QIcon() /* loaded in tabInserted */, tabName(tabPage));
 
     if (focusWidget) {


@@ -183,63 +210,87 @@ void DolphinTabWidget::openNewTab(const QUrl& primaryUrl, const QUrl& secondaryU
         // in background, assure that the previous focused widget gets the focus back.
         focusWidget->setFocus();
     }
         // in background, assure that the previous focused widget gets the focus back.
         focusWidget->setFocus();
     }

+    return tabPage;

 }
 
 }
 

-void DolphinTabWidget::openDirectories(const QList<QUrl>& dirs, bool splitView)
+void DolphinTabWidget::openDirectories(const QList<QUrl> &dirs, bool splitView)

 {
     Q_ASSERT(dirs.size() > 0);
 
 {
     Q_ASSERT(dirs.size() > 0);
 

+    bool somethingWasAlreadyOpen = false;
+

     QList<QUrl>::const_iterator it = dirs.constBegin();
     while (it != dirs.constEnd()) {
     QList<QUrl>::const_iterator it = dirs.constBegin();
     while (it != dirs.constEnd()) {

-        const QUrl& primaryUrl = *(it++);
-        const QPair<int, bool> indexInfo = indexByUrl(primaryUrl);
-        const int index = indexInfo.first;
-        const bool isInPrimaryView = indexInfo.second;
-        if (index >= 0) {
-            setCurrentIndex(index);
-            const auto tabPage = tabPageAt(index);
-            if (isInPrimaryView) {
-                tabPage->primaryViewContainer()->setActive(true);
+        const QUrl &primaryUrl = *(it++);
+        const std::optional<ViewIndex> viewIndexAtDirectory = viewOpenAtDirectory(primaryUrl);
+
+        // When the user asks for a URL that's already open,
+        // activate it instead of opening a new tab
+        if (viewIndexAtDirectory.has_value()) {
+            somethingWasAlreadyOpen = true;
+            activateViewContainerAt(viewIndexAtDirectory.value());
+        } else if (splitView && (it != dirs.constEnd())) {
+            const QUrl &secondaryUrl = *(it++);
+            if (somethingWasAlreadyOpen) {
+                openNewTab(primaryUrl, secondaryUrl);

             } else {
             } else {

-                tabPage->secondaryViewContainer()->setActive(true);
+                openNewActivatedTab(primaryUrl, secondaryUrl);

             }
             }

-            continue;
-        }
-        if (splitView && (it != dirs.constEnd())) {
-            const QUrl& secondaryUrl = *(it++);
-            openNewActivatedTab(primaryUrl, secondaryUrl);

         } else {
         } else {

-            openNewActivatedTab(primaryUrl);
+            if (somethingWasAlreadyOpen) {
+                openNewTab(primaryUrl);
+            } else {
+                openNewActivatedTab(primaryUrl);
+            }

         }
     }
 }
 
         }
     }
 }
 

-void DolphinTabWidget::openFiles(const QList<QUrl>& files, bool splitView)
+void DolphinTabWidget::openFiles(const QList<QUrl> &files, bool splitView)

 {
     Q_ASSERT(files.size() > 0);
 
 {
     Q_ASSERT(files.size() > 0);
 

-    // Get all distinct directories from 'files' and open a tab
-    // for each directory. If the "split view" option is enabled, two
-    // directories are shown inside one tab (see openDirectories()).
-    QList<QUrl> dirs;
-    foreach (const QUrl& url, files) {
-        const QUrl dir(url.adjusted(QUrl::RemoveFilename));
-        if (!dirs.contains(dir)) {
-            dirs.append(dir);
+    // Get all distinct directories from 'files'.
+    QList<QUrl> dirsThatNeedToBeOpened;
+    QList<QUrl> dirsThatWereAlreadyOpen;
+    for (const QUrl &file : files) {
+        const QUrl dir(file.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash));
+        if (dirsThatNeedToBeOpened.contains(dir) || dirsThatWereAlreadyOpen.contains(dir)) {
+            continue;
+        }
+
+        // The selecting of files that we do later will not work in views that already have items selected.
+        // So we check if dir is already open and clear the selection if it is. BUG: 417230
+        // We also make sure the view will be activated.
+        auto viewIndex = viewShowingItem(file);
+        if (viewIndex.has_value()) {
+            viewContainerAt(viewIndex.value())->view()->clearSelection();
+            activateViewContainerAt(viewIndex.value());
+            dirsThatWereAlreadyOpen.append(dir);
+        } else {
+            dirsThatNeedToBeOpened.append(dir);

         }
     }
 
     const int oldTabCount = count();
         }
     }
 
     const int oldTabCount = count();

-    openDirectories(dirs, splitView);
+    // Open a tab for each directory. If the "split view" option is enabled,
+    // two directories are shown inside one tab (see openDirectories()).
+    if (dirsThatNeedToBeOpened.size() > 0) {
+        openDirectories(dirsThatNeedToBeOpened, splitView);
+    }

     const int tabCount = count();
 
     // 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.
     const int tabCount = count();
 
     // 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) {
-        DolphinTabPage* tabPage = tabPageAt(i);
+    for (int i = 0; i < tabCount; ++i) {
+        DolphinTabPage *tabPage = tabPageAt(i);

         tabPage->markUrlsAsSelected(files);
         tabPage->markUrlAsCurrent(files.first());
         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();
+        }

     }
 }
 
     }
 }
 


@@ -259,13 +310,25 @@ void DolphinTabWidget::closeTab(const int index)
         return;
     }
 
         return;
     }
 

-    DolphinTabPage* tabPage = tabPageAt(index);
-    emit rememberClosedTab(tabPage->activeViewContainer()->url(), tabPage->saveState());
+    DolphinTabPage *tabPage = tabPageAt(index);
+    Q_EMIT rememberClosedTab(tabPage->activeViewContainer()->url(), tabPage->saveState());

 
     removeTab(index);
     tabPage->deleteLater();
 }
 
 
     removeTab(index);
     tabPage->deleteLater();
 }
 

+void DolphinTabWidget::activateTab(const int index)
+{
+    if (index < count()) {
+        setCurrentIndex(index);
+    }
+}
+
+void DolphinTabWidget::activateLastTab()
+{
+    setCurrentIndex(count() - 1);
+}
+

 void DolphinTabWidget::activateNextTab()
 {
     const int index = currentIndex() + 1;
 void DolphinTabWidget::activateNextTab()
 {
     const int index = currentIndex() + 1;


@@ -278,23 +341,42 @@ void DolphinTabWidget::activatePrevTab()
     setCurrentIndex(index >= 0 ? index : (count() - 1));
 }
 
     setCurrentIndex(index >= 0 ? index : (count() - 1));
 }
 

-void DolphinTabWidget::slotPlacesPanelVisibilityChanged(bool visible)
+void DolphinTabWidget::restoreClosedTab(const QByteArray &state)

 {
 {

-    // The places-selector from the URL navigator should only be shown
-    // if the places dock is invisible
-    m_placesSelectorVisible = !visible;
+    openNewActivatedTab();
+    currentTabPage()->restoreState(state);
+}

 
 

-    const int tabCount = count();
-    for (int i = 0; i < tabCount; ++i) {
-        DolphinTabPage* tabPage = tabPageAt(i);
-        tabPage->setPlacesSelectorVisible(m_placesSelectorVisible);
+void DolphinTabWidget::copyToInactiveSplitView()
+{
+    const DolphinTabPage *tabPage = currentTabPage();
+    if (!tabPage->splitViewEnabled()) {
+        return;

     }
     }

+
+    const KFileItemList selectedItems = tabPage->activeViewContainer()->view()->selectedItems();
+    if (selectedItems.isEmpty()) {
+        return;
+    }
+
+    DolphinView *const inactiveView = tabPage->inactiveViewContainer()->view();
+    inactiveView->copySelectedItems(selectedItems, inactiveView->url());

 }
 
 }
 

-void DolphinTabWidget::restoreClosedTab(const QByteArray& state)
+void DolphinTabWidget::moveToInactiveSplitView()

 {
 {

-    openNewActivatedTab();
-    currentTabPage()->restoreState(state);
+    const DolphinTabPage *tabPage = currentTabPage();
+    if (!tabPage->splitViewEnabled()) {
+        return;
+    }
+
+    const KFileItemList selectedItems = tabPage->activeViewContainer()->view()->selectedItems();
+    if (selectedItems.isEmpty()) {
+        return;
+    }
+
+    DolphinView *const inactiveView = tabPage->inactiveViewContainer()->view();
+    inactiveView->moveSelectedItems(selectedItems, inactiveView->url());

 }
 
 void DolphinTabWidget::detachTab(int index)
 }
 
 void DolphinTabWidget::detachTab(int index)


@@ -303,7 +385,7 @@ void DolphinTabWidget::detachTab(int index)
 
     QStringList args;
 
 
     QStringList args;
 

-    const DolphinTabPage* tabPage = tabPageAt(index);
+    const DolphinTabPage *tabPage = tabPageAt(index);

     args << tabPage->primaryViewContainer()->url().url();
     if (tabPage->splitViewEnabled()) {
         args << tabPage->secondaryViewContainer()->url().url();
     args << tabPage->primaryViewContainer()->url().url();
     if (tabPage->splitViewEnabled()) {
         args << tabPage->secondaryViewContainer()->url().url();


@@ -311,8 +393,9 @@ void DolphinTabWidget::detachTab(int index)
     }
     args << QStringLiteral("--new-window");
 
     }
     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);
 }
 
     closeTab(index);
 }


@@ -320,25 +403,47 @@ void DolphinTabWidget::detachTab(int index)
 void DolphinTabWidget::openNewActivatedTab(int index)
 {
     Q_ASSERT(index >= 0);
 void DolphinTabWidget::openNewActivatedTab(int index)
 {
     Q_ASSERT(index >= 0);

-    const DolphinTabPage* tabPage = tabPageAt(index);
+    const DolphinTabPage *tabPage = tabPageAt(index);

     openNewActivatedTab(tabPage->activeViewContainer()->url());
 }
 
     openNewActivatedTab(tabPage->activeViewContainer()->url());
 }
 

-void DolphinTabWidget::tabDropEvent(int index, QDropEvent* event)
+void DolphinTabWidget::tabDragMoveEvent(int index, QDragMoveEvent *event)

 {
     if (index >= 0) {
 {
     if (index >= 0) {

-        DolphinView* view = tabPageAt(index)->activeViewContainer()->view();
+        DolphinView *view = tabPageAt(index)->activeViewContainer()->view();
+        DragAndDropHelper::updateDropAction(event, view->url());
+    }
+}
+
+void DolphinTabWidget::tabDropEvent(int index, QDropEvent *event)
+{
+    if (index >= 0) {
+        DolphinView *view = tabPageAt(index)->activeViewContainer()->view();

         view->dropUrls(view->url(), event, view);
         view->dropUrls(view->url(), event, view);

+    } else {
+        const auto urls = event->mimeData()->urls();
+
+        for (const QUrl &url : urls) {
+            auto *job = KIO::stat(url, KIO::StatJob::SourceSide, KIO::StatDetail::StatBasic, KIO::JobFlag::HideProgressInfo);
+            connect(job, &KJob::result, this, [this, job]() {
+                if (!job->error() && job->statResult().isDir()) {
+                    openNewTab(job->url(), QUrl(), NewTabPosition::AtEnd);
+                }
+            });
+        }

     }
 }
 
     }
 }
 

-void DolphinTabWidget::tabUrlChanged(const QUrl& url)
+void DolphinTabWidget::tabUrlChanged(const QUrl &url)

 {
 {

-    const int index = indexOf(qobject_cast<QWidget*>(sender()));
+    const int index = indexOf(qobject_cast<QWidget *>(sender()));

     if (index >= 0) {
     if (index >= 0) {

-        tabBar()->setTabText(index, tabName(tabPageAt(index)));
+        updateTabName(index);
+        tabBar()->setTabToolTip(index, url.toDisplayString(QUrl::PreferLocalFile));

         if (tabBar()->isVisible()) {
         if (tabBar()->isVisible()) {

-            tabBar()->setTabIcon(index, QIcon::fromTheme(KIO::iconNameForUrl(url)));
+            // ensure the path url ends with a slash to have proper folder icon for remote folders
+            const QUrl pathUrl = QUrl(url.adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/"));
+            tabBar()->setTabIcon(index, QIcon::fromTheme(KIO::iconNameForUrl(pathUrl)));

         } else {
             // Mark as dirty, actually load once the tab bar actually gets shown
             tabBar()->setTabIcon(index, QIcon());
         } else {
             // Mark as dirty, actually load once the tab bar actually gets shown
             tabBar()->setTabIcon(index, QIcon());


@@ -346,78 +451,181 @@ void DolphinTabWidget::tabUrlChanged(const QUrl& url)
 
         // Emit the currentUrlChanged signal if the url of the current tab has been changed.
         if (index == currentIndex()) {
 
         // Emit the currentUrlChanged signal if the url of the current tab has been changed.
         if (index == currentIndex()) {

-            emit currentUrlChanged(url);
+            Q_EMIT currentUrlChanged(url);

         }
         }

+
+        Q_EMIT urlChanged(url);

     }
 }
 
 void DolphinTabWidget::currentTabChanged(int index)
 {
     }
 }
 
 void DolphinTabWidget::currentTabChanged(int index)
 {

-    // last-viewed tab deactivation
-    if (DolphinTabPage* tabPage = tabPageAt(m_lastViewedTab)) {
-        tabPage->setActive(false);
+    DolphinTabPage *tabPage = tabPageAt(index);
+    if (tabPage == m_lastViewedTab) {
+        return;
+    }
+    if (m_lastViewedTab) {
+        m_lastViewedTab->disconnectNavigators();
+        m_lastViewedTab->setActive(false);

     }
     }

-    DolphinTabPage* tabPage = tabPageAt(index);
-    DolphinViewContainer* viewContainer = tabPage->activeViewContainer();
-    emit activeViewChanged(viewContainer);
-    emit currentUrlChanged(viewContainer->url());
+    if (tabPage->splitViewEnabled() && !m_navigatorsWidget->secondaryUrlNavigator()) {
+        m_navigatorsWidget->createSecondaryUrlNavigator();
+    }
+    DolphinViewContainer *viewContainer = tabPage->activeViewContainer();
+    Q_EMIT activeViewChanged(viewContainer);
+    Q_EMIT currentUrlChanged(viewContainer->url());

     tabPage->setActive(true);
     tabPage->setActive(true);

-    m_lastViewedTab = index;
+    tabPage->connectNavigators(m_navigatorsWidget);
+    m_navigatorsWidget->setSecondaryNavigatorVisible(tabPage->splitViewEnabled());
+    m_lastViewedTab = tabPage;
+}
+
+void DolphinTabWidget::renameTab(int index, const QString &name)
+{
+    tabPageAt(index)->setCustomLabel(name);
+    updateTabName(index);

 }
 
 void DolphinTabWidget::tabInserted(int index)
 {
     QTabWidget::tabInserted(index);
 
 }
 
 void DolphinTabWidget::tabInserted(int index)
 {
     QTabWidget::tabInserted(index);
 

-    if (count() > 1) {
+    if (tabBar()->isVisible()) {

         // Resolve all pending tab icons
         for (int i = 0; i < count(); ++i) {
         // Resolve all pending tab icons
         for (int i = 0; i < count(); ++i) {

+            const QUrl url = tabPageAt(i)->activeViewContainer()->url();

             if (tabBar()->tabIcon(i).isNull()) {
             if (tabBar()->tabIcon(i).isNull()) {

-                tabBar()->setTabIcon(i, QIcon::fromTheme(KIO::iconNameForUrl(tabPageAt(i)->activeViewContainer()->url())));
+                // ensure the path url ends with a slash to have proper folder icon for remote folders
+                const QUrl pathUrl = QUrl(url.adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/"));
+                tabBar()->setTabIcon(i, QIcon::fromTheme(KIO::iconNameForUrl(pathUrl)));
+            }
+            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)
 {
     QTabWidget::tabRemoved(index);
 
 }
 
 void DolphinTabWidget::tabRemoved(int index)
 {
     QTabWidget::tabRemoved(index);
 

-    // If only one tab is left, then remove the tab entry so that
-    // closing the last tab is not possible.
-    if (count() < 2) {
-        tabBar()->hide();
-    }
-
-    emit tabCountChanged(count());
+    Q_EMIT tabCountChanged(count());

 }
 
 }
 

-QString DolphinTabWidget::tabName(DolphinTabPage* tabPage) const
+QString DolphinTabWidget::tabName(DolphinTabPage *tabPage) const

 {
     if (!tabPage) {
         return QString();
     }
 {
     if (!tabPage) {
         return QString();
     }

-    QString name = tabPage->activeViewContainer()->caption();
+    // clang-format off
+    QString name;
+    if (tabPage->splitViewEnabled()) {
+        if (tabPage->primaryViewActive()) {
+            // i18n: %1 is the primary view and %2 the secondary view. For left to right languages the primary view is on the left so we also want it to be on the
+            // left in the tab name. In right to left languages the primary view would be on the right so the tab name should match.
+            name = i18nc("@title:tab Active primary view | (Inactive secondary view)", "%1 | (%2)", tabPage->primaryViewContainer()->caption(), tabPage->secondaryViewContainer()->caption());
+        } else {
+            // i18n: %1 is the primary view and %2 the secondary view. For left to right languages the primary view is on the left so we also want it to be on the
+            // left in the tab name. In right to left languages the primary view would be on the right so the tab name should match.
+            name = i18nc("@title:tab (Inactive primary view) | Active secondary view", "(%1) | %2", tabPage->primaryViewContainer()->caption(), tabPage->secondaryViewContainer()->caption());
+        }
+    } else {
+        name = tabPage->activeViewContainer()->caption();
+    }
+    // clang-format on
+

     // Make sure that a '&' inside the directory name is displayed correctly
     // and not misinterpreted as a keyboard shortcut in QTabBar::setTabText()
     // Make sure that a '&' inside the directory name is displayed correctly
     // and not misinterpreted as a keyboard shortcut in QTabBar::setTabText()

-    return name.replace('&', QLatin1String("&&"));
+    return KStringHandler::rsqueeze(name.replace('&', QLatin1String("&&")), 40 /* default maximum visible folder name visible */);
+}
+
+DolphinViewContainer *DolphinTabWidget::viewContainerAt(DolphinTabWidget::ViewIndex viewIndex) const
+{
+    const auto tabPage = tabPageAt(viewIndex.tabIndex);
+    if (!tabPage) {
+        return nullptr;
+    }
+    return viewIndex.isInPrimaryView ? tabPage->primaryViewContainer() : tabPage->secondaryViewContainer();

 }
 
 }
 

-QPair<int, bool> DolphinTabWidget::indexByUrl(const QUrl& url) const
+DolphinViewContainer *DolphinTabWidget::activateViewContainerAt(DolphinTabWidget::ViewIndex viewIndex)

 {
 {

-    for (int i = 0; i < count(); i++) {
+    activateTab(viewIndex.tabIndex);
+    auto viewContainer = viewContainerAt(viewIndex);
+    if (!viewContainer) {
+        return nullptr;
+    }
+    viewContainer->setActive(true);
+    return viewContainer;
+}
+
+const std::optional<const DolphinTabWidget::ViewIndex> DolphinTabWidget::viewOpenAtDirectory(const QUrl &directory) const
+{
+    int i = currentIndex();
+    if (i < 0) {
+        return std::nullopt;
+    }
+    // loop over the tabs starting from the current one
+    do {

         const auto tabPage = tabPageAt(i);
         const auto tabPage = tabPageAt(i);

-        if (url == tabPage->primaryViewContainer()->url()) {
-            return qMakePair(i, true);
+        if (tabPage->primaryViewContainer()->url() == directory) {
+            return std::optional(ViewIndex{i, true});

         }
 
         }
 

-        if (tabPage->splitViewEnabled() && url == tabPage->secondaryViewContainer()->url()) {
-            return qMakePair(i, false);
+        if (tabPage->splitViewEnabled() && tabPage->secondaryViewContainer()->url() == directory) {
+            return std::optional(ViewIndex{i, false});

         }
         }

+
+        i = (i + 1) % count();
+    } while (i != currentIndex());
+
+    return std::nullopt;
+}
+
+const std::optional<const DolphinTabWidget::ViewIndex> DolphinTabWidget::viewShowingItem(const QUrl &item) const
+{
+    // The item might not be loaded yet even though it exists. So instead
+    // we check if the folder containing the item is showing its contents.
+    const QUrl dirContainingItem(item.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash));
+
+    // The dirContainingItem is either open directly or expanded in a tree-style view mode.
+    // Is dirContainingitem the base url of a view?
+    auto viewOpenAtContainingDirectory = viewOpenAtDirectory(dirContainingItem);
+    if (viewOpenAtContainingDirectory.has_value()) {
+        return viewOpenAtContainingDirectory;

     }
     }

-    return qMakePair(-1, false);
+
+    // Is dirContainingItem expanded in some tree-style view?
+    // The rest of this method is about figuring this out.
+
+    int i = currentIndex();
+    if (i < 0) {
+        return std::nullopt;
+    }
+    // loop over the tabs starting from the current one
+    do {
+        const auto tabPage = tabPageAt(i);
+        if (tabPage->primaryViewContainer()->url().isParentOf(item)) {
+            const KFileItem fileItemContainingItem = tabPage->primaryViewContainer()->view()->items().findByUrl(dirContainingItem);
+            if (!fileItemContainingItem.isNull() && tabPage->primaryViewContainer()->view()->isExpanded(fileItemContainingItem)) {
+                return std::optional(ViewIndex{i, true});
+            }
+        }
+
+        if (tabPage->splitViewEnabled() && tabPage->secondaryViewContainer()->url().isParentOf(item)) {
+            const KFileItem fileItemContainingItem = tabPage->secondaryViewContainer()->view()->items().findByUrl(dirContainingItem);
+            if (!fileItemContainingItem.isNull() && tabPage->secondaryViewContainer()->view()->isExpanded(fileItemContainingItem)) {
+                return std::optional(ViewIndex{i, false});
+            }
+        }
+
+        i = (i + 1) % count();
+    } while (i != currentIndex());
+
+    return std::nullopt;

 }
 }

+
+#include "moc_dolphintabwidget.cpp"