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 af217eab4651b9e77c77dbc5a846ac8f01523965..ccd80151b5500af66ba8901311721423aa51bf05 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -119,6 +119,7 @@ DolphinMainWindow::DolphinMainWindow()
     , m_sessionSaveWatcher(nullptr)
     , m_sessionSaveScheduled(false)
     , m_splitViewAction(nullptr)
     , m_sessionSaveWatcher(nullptr)
     , m_sessionSaveScheduled(false)
     , m_splitViewAction(nullptr)

+    , m_splitViewMenuAction(nullptr)

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


@@ -1832,14 +1833,21 @@ void DolphinMainWindow::setupActions()
     // (note that most of it is set up in DolphinViewActionHandler)
 
     m_splitViewAction = actionCollection()->add<KActionMenu>(QStringLiteral("split_view"));
     // (note that most of it is set up in DolphinViewActionHandler)
 
     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_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);
     m_splitViewAction->setPopupMode(QToolButton::MenuButtonPopup);

-    actionCollection()->setDefaultShortcut(m_splitViewAction, Qt::Key_F3);

     connect(m_splitViewAction, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);
     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",


@@ -1847,7 +1855,6 @@ void DolphinMainWindow::setupActions()
                                      "view out into a new window."));
     popoutSplit->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));
     actionCollection()->setDefaultShortcut(popoutSplit, Qt::SHIFT | Qt::Key_F3);
                                      "view out into a new window."));
     popoutSplit->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));
     actionCollection()->setDefaultShortcut(popoutSplit, Qt::SHIFT | Qt::Key_F3);

-    m_splitViewAction->addAction(popoutSplit);

     connect(popoutSplit, &QAction::triggered, this, &DolphinMainWindow::popoutSplitView);
 
     QAction *stashSplit = actionCollection()->addAction(QStringLiteral("split_stash"));
     connect(popoutSplit, &QAction::triggered, this, &DolphinMainWindow::popoutSplitView);
 
     QAction *stashSplit = actionCollection()->addAction(QStringLiteral("split_stash"));


@@ -2545,13 +2552,26 @@ void DolphinMainWindow::updateSplitActions()
             popoutSplitAction->setToolTip(i18nc("@info", "Move right split view to a new window"));
         }
         popoutSplitAction->setEnabled(true);
             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);
+        }

     } else {
         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);
     } else {
         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()