Remove the menu from the split button when splitscreen is closed

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 308cd166f8c4228598ba7fb66609a2e0a7750e62..ccd80151b5500af66ba8901311721423aa51bf05 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -118,6 +118,8 @@ DolphinMainWindow::DolphinMainWindow()
     , m_sessionSaveTimer(nullptr)
     , m_sessionSaveWatcher(nullptr)
     , m_sessionSaveScheduled(false)
     , m_sessionSaveTimer(nullptr)
     , m_sessionSaveWatcher(nullptr)
     , m_sessionSaveScheduled(false)

+    , m_splitViewAction(nullptr)
+    , m_splitViewMenuAction(nullptr)

 {
     Q_INIT_RESOURCE(dolphin);
 
 {
     Q_INIT_RESOURCE(dolphin);
 


@@ -989,8 +991,9 @@ void DolphinMainWindow::popoutSplitView()
     DolphinTabPage *tabPage = m_tabWidget->currentTabPage();
     if (!tabPage->splitViewEnabled())
         return;
     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);
     tabPage->setSplitViewEnabled(false, WithAnimation);

+    updateSplitActions();

 }
 
 void DolphinMainWindow::toggleSplitStash()
 }
 
 void DolphinMainWindow::toggleSplitStash()


@@ -1829,14 +1832,22 @@ void DolphinMainWindow::setupActions()
     // setup 'View' menu
     // (note that most of it is set up in DolphinViewActionHandler)
 
     // setup 'View' menu
     // (note that most of it is set up in DolphinViewActionHandler)
 

-    QAction *split = actionCollection()->addAction(QStringLiteral("split_view"));
-    split->setWhatsThis(xi18nc("@info:whatsthis find",
-                               "<para>This splits "
-                               "the folder view below into two autonomous views.</para><para>This "
-                               "way you can see two locations at once and move items between them "
-                               "quickly.</para>Click this again afterwards to recombine the views."));
-    actionCollection()->setDefaultShortcut(split, Qt::Key_F3);
-    connect(split, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);
+    m_splitViewAction = actionCollection()->add<KActionMenu>(QStringLiteral("split_view"));
+    m_splitViewMenuAction = actionCollection()->addAction(QStringLiteral("split_view_menu"));
+
+    m_splitViewAction->setWhatsThis(xi18nc("@info:whatsthis find",
+                                           "<para>This splits "
+                                           "the folder view below into two autonomous views.</para><para>This "
+                                           "way you can see two locations at once and move items between them "
+                                           "quickly.</para>Click this again afterwards to recombine the views."));
+    m_splitViewMenuAction->setWhatsThis(m_splitViewAction->whatsThis());
+
+    // only set it for the menu version
+    actionCollection()->setDefaultShortcut(m_splitViewMenuAction, Qt::Key_F3);
+
+    m_splitViewAction->setPopupMode(QToolButton::MenuButtonPopup);
+    connect(m_splitViewAction, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);
+    connect(m_splitViewMenuAction, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);

 
     QAction *popoutSplit = actionCollection()->addAction(QStringLiteral("popout_split_view"));
     popoutSplit->setWhatsThis(xi18nc("@info:whatsthis",
 
     QAction *popoutSplit = actionCollection()->addAction(QStringLiteral("popout_split_view"));
     popoutSplit->setWhatsThis(xi18nc("@info:whatsthis",


@@ -2524,30 +2535,43 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer *container)
 
 void DolphinMainWindow::updateSplitActions()
 {
 
 void DolphinMainWindow::updateSplitActions()
 {

-    QAction *splitAction = actionCollection()->action(QStringLiteral("split_view"));

     QAction *popoutSplitAction = actionCollection()->action(QStringLiteral("popout_split_view"));
     const DolphinTabPage *tabPage = m_tabWidget->currentTabPage();
     if (tabPage->splitViewEnabled()) {
         if (GeneralSettings::closeActiveSplitView() ? tabPage->primaryViewActive() : !tabPage->primaryViewActive()) {
     QAction *popoutSplitAction = actionCollection()->action(QStringLiteral("popout_split_view"));
     const DolphinTabPage *tabPage = m_tabWidget->currentTabPage();
     if (tabPage->splitViewEnabled()) {
         if (GeneralSettings::closeActiveSplitView() ? tabPage->primaryViewActive() : !tabPage->primaryViewActive()) {

-            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"));
+            m_splitViewAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
+            m_splitViewAction->setToolTip(i18nc("@info", "Close left view"));
+            m_splitViewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-left-close")));
+            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 {
         } 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"));
+            m_splitViewAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
+            m_splitViewAction->setToolTip(i18nc("@info", "Close right view"));
+            m_splitViewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-right-close")));
+            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->setEnabled(true);
+        if (!m_splitViewAction->menu()) {
+            m_splitViewAction->setMenu(new QMenu);
+            m_splitViewAction->addAction(popoutSplitAction);

         }
         }

-        popoutSplitAction->setVisible(true);

     } else {
     } else {

-        splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
-        splitAction->setToolTip(i18nc("@info", "Split view"));
-        splitAction->setIcon(QIcon::fromTheme(QStringLiteral("view-right-new")));
-        popoutSplitAction->setVisible(false);
+        m_splitViewAction->setText(i18nc("@action:intoolbar Split view", "Split"));
+        m_splitViewAction->setToolTip(i18nc("@info", "Split view"));
+        m_splitViewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-right-new")));
+        popoutSplitAction->setText(i18nc("@action:intoolbar Move active split view to a new window", "Pop out"));
+        popoutSplitAction->setEnabled(false);
+        if (m_splitViewAction->menu()) {
+            m_splitViewAction->removeAction(popoutSplitAction);
+            m_splitViewAction->setMenu(nullptr);
+        }

     }
     }

+
+    // Update state from toolbar action
+    m_splitViewMenuAction->setText(m_splitViewAction->text());
+    m_splitViewMenuAction->setToolTip(m_splitViewAction->toolTip());
+    m_splitViewMenuAction->setIcon(m_splitViewAction->icon());

 }
 
 void DolphinMainWindow::updateAllowedToolbarAreas()
 }
 
 void DolphinMainWindow::updateAllowedToolbarAreas()