Merge branch 'master' into kf6

[dolphin.git] / src / dolphintabwidget.cpp

diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index 9ee80160a695cd819db476328e985eeec3566c0e..edc1cb7d84f87f12f1d2c03998db3a51c6a119fd 100644 (file)
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -15,6 +15,7 @@
 #include <KIO/CommandLauncherJob>
 #include <KLocalizedString>
 #include <KShell>
+#include <KStringHandler>
 #include <kio/global.h>
 
 #include <QApplication>
@@ -335,12 +336,7 @@ void DolphinTabWidget::copyToInactiveSplitView()
         return;
     }
 
-    DolphinView *inactiveView;
-    if (tabPage->primaryViewActive()) {
-        inactiveView = tabPage->secondaryViewContainer()->view();
-    } else {
-        inactiveView = tabPage->primaryViewContainer()->view();
-    }
+    DolphinView *const inactiveView = tabPage->inactiveViewContainer()->view();
     inactiveView->copySelectedItems(selectedItems, inactiveView->url());
 }
 
@@ -356,12 +352,7 @@ void DolphinTabWidget::moveToInactiveSplitView()
         return;
     }
 
-    DolphinView *inactiveView;
-    if (tabPage->primaryViewActive()) {
-        inactiveView = tabPage->secondaryViewContainer()->view();
-    } else {
-        inactiveView = tabPage->primaryViewContainer()->view();
-    }
+    DolphinView *const inactiveView = tabPage->inactiveViewContainer()->view();
     inactiveView->moveSelectedItems(selectedItems, inactiveView->url());
 }
 
@@ -402,7 +393,7 @@ void DolphinTabWidget::tabDropEvent(int index, QDropEvent *event)
         const auto urls = event->mimeData()->urls();
 
         for (const QUrl &url : urls) {
-            auto *job = KIO::statDetails(url, KIO::StatJob::SourceSide, KIO::StatDetail::StatBasic, KIO::JobFlag::HideProgressInfo);
+            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);
@@ -517,7 +508,7 @@ QString DolphinTabWidget::tabName(DolphinTabPage *tabPage) const
 
     // 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
@@ -605,3 +596,5 @@ const std::optional<const DolphinTabWidget::ViewIndex> DolphinTabWidget::viewSho
 
     return std::nullopt;
 }
+
+#include "moc_dolphintabwidget.cpp"