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

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index f351cc992f65e241cc37f8ce2d986b8125ae521c..46515cc8bee4000411f58e7b9fb70fbf5b286eb8 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -11,8 +11,8 @@
 
 #include "dolphintabwidget.h"
 #include <config-baloo.h>
+#include <KFileItemActions>
 #include <kio/fileundomanager.h>
-#include <KSortableList>
 #include <kxmlguiwindow.h>
 
 #ifdef HAVE_BALOO
@@ -105,12 +105,6 @@ public:
      */
     void setViewsToHomeIfMountPathOpen(const QString& mountPath);
 
-    /**
-     * Sets any of the window's view containers which are currently displaying
-     * invalid locations to the home path
-     */
-    void setViewsWithInvalidPathsToHome();
-
     bool isFoldersPanelEnabled() const;
     bool isInformationPanelEnabled() const;
 
@@ -177,6 +171,9 @@ public Q_SLOTS:
      */
     void openNewTab(const QUrl& url);
 
+    /** @see GeneralSettings::splitViewChanged() */
+    void slotSplitViewChanged();
+
 Q_SIGNALS:
     /**
      * Is sent if the selection of the currently active view has
@@ -225,6 +222,9 @@ protected:
     /** Handles QWhatsThisClickedEvent and passes all others on. */
     bool eventFilter(QObject*, QEvent*) override;
 
+    /** Sets a sane initial window size **/
+    QSize sizeHint() const override;
+
 protected Q_SLOTS:
     /**
      * Calls the base method KXmlGuiWindow::saveNewToolbarConfig().
@@ -468,9 +468,15 @@ private Q_SLOTS:
                          const QUrl& url,
                          const QList<QAction*>& customActions);
 
-    void updateControlMenu();
-    void updateToolBar();
-    void slotControlButtonDeleted();
+    /**
+     * Updates the menu that is by default at the right end of the toolbar.
+     *
+     * In true "simple by default" fashion, the menu only contains the most important
+     * and necessary actions to be able to use Dolphin. This is supposed to hold true even
+     * if the user does not know how to open a context menu. More advanced actions can be
+     * discovered through a sub-menu (@see KConfigWidgets::KHamburgerMenu::setMenuBarAdvertised()).
+     */
+    void updateHamburgerMenu();
 
     /**
      * Is called if the user clicked an item in the Places Panel.
@@ -575,16 +581,6 @@ private:
     void updateViewActions();
     void updateGoActions();
 
-    void createControlButton();
-    void deleteControlButton();
-
-    /**
-     * Adds the action \p action to the menu \p menu in
-     * case if it has not added already to the toolbar.
-     * @return True if the action has been added to the menu.
-     */
-    bool addActionToMenu(QAction* action, QMenu* menu);
-
     /**
      * Connects the signals from the created DolphinView with
      * the DolphinViewContainer \a container with the corresponding slots of
@@ -625,6 +621,16 @@ private:
     /** Returns preferred search tool as configured in "More Search Tools" menu. */
     QPointer<QAction> preferredSearchTool();
 
+    /**
+     * Adds this action to the mainWindow's toolbar and saves the change
+     * in the users ui configuration file.
+     * This method is only needed for migration and should be removed once we can expect
+     * that pretty much all users have been migrated. Remove in 2026 because that's when
+     * even the most risk-averse distros will already have been forced to upgrade.
+     * @return true if successful. Otherwise false.
+     */
+    bool addHamburgerMenuToToolbar();
+
 private:
     /**
      * Implements a custom error handling for the undo manager. This
@@ -662,10 +668,9 @@ private:
     KToolBarPopupAction* m_backAction;
     KToolBarPopupAction* m_forwardAction;
 
-    /** Makes sure that only one object is ever connected to the history. */
-    QMetaObject::Connection m_updateHistoryConnection;
-
     QMenu m_searchTools;
+    KFileItemActions m_fileItemActions;
+
 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const