Follow the setting for which view to close

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 308cd166f8c4228598ba7fb66609a2e0a7750e62..4a327182e9eb6fe4ac38574289043b50046868b6 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -989,8 +989,9 @@ void DolphinMainWindow::popoutSplitView()
     DolphinTabPage *tabPage = m_tabWidget->currentTabPage();
     if (!tabPage->splitViewEnabled())
         return;
-    openNewWindow(tabPage->activeViewContainer()->url());
+    openNewWindow((GeneralSettings::closeActiveSplitView() ? tabPage->activeViewContainer() : tabPage->inactiveViewContainer())->url());
     tabPage->setSplitViewEnabled(false, WithAnimation);
+    updateSplitActions();
 }
 
 void DolphinMainWindow::toggleSplitStash()
@@ -2532,14 +2533,14 @@ void DolphinMainWindow::updateSplitActions()
             splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
             splitAction->setToolTip(i18nc("@info", "Close left view"));
             splitAction->setIcon(QIcon::fromTheme(QStringLiteral("view-left-close")));
-            popoutSplitAction->setText(i18nc("@action:intoolbar Pop out left view", "Pop out"));
-            popoutSplitAction->setToolTip(i18nc("@info", "Pop out left view"));
+            popoutSplitAction->setText(i18nc("@action:intoolbar Move left split view to a new window", "Pop out"));
+            popoutSplitAction->setToolTip(i18nc("@info", "Move left split view to a new window"));
         } else {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
             splitAction->setToolTip(i18nc("@info", "Close right view"));
             splitAction->setIcon(QIcon::fromTheme(QStringLiteral("view-right-close")));
-            popoutSplitAction->setText(i18nc("@action:intoolbar Pop out right view", "Pop out"));
-            popoutSplitAction->setToolTip(i18nc("@info", "Pop out right view"));
+            popoutSplitAction->setText(i18nc("@action:intoolbar Move right split view to a new window", "Pop out"));
+            popoutSplitAction->setToolTip(i18nc("@info", "Move right split view to a new window"));
         }
         popoutSplitAction->setVisible(true);
     } else {