From a4be53fb997ea2f844f2ca4a590c073a50fcbbf6 Mon Sep 17 00:00:00 2001 From: Felix Ernst Date: Thu, 29 Apr 2021 13:22:10 +0000 Subject: Replace custom hamburger/control menu with KHamburgerMenu --- src/dolphinmainwindow.h | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'src/dolphinmainwindow.h') diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index f351cc992..40101852b 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -468,9 +468,10 @@ private Q_SLOTS: const QUrl& url, const QList& customActions); - void updateControlMenu(); - void updateToolBar(); - void slotControlButtonDeleted(); + /** + * Updates the menu that is by default at the right end of the toolbar. + */ + void updateHamburgerMenu(); /** * Is called if the user clicked an item in the Places Panel. @@ -575,16 +576,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 +616,16 @@ private: /** Returns preferred search tool as configured in "More Search Tools" menu. */ QPointer 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 -- cgit v1.3