X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a73e81bf6af745623e7e92ba012522e34b2a312a..7d6aaf4c07e45977b63cfa4ac4dd695a45756379:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 883d92b69..eb7309fc6 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -12,9 +12,12 @@ #include "dolphintabwidget.h" #include #include -#include #include +#ifdef HAVE_BALOO + #include "panels/information/informationpanel.h" +#endif + #include #include #include @@ -37,7 +40,6 @@ class KNewFileMenu; class KHelpMenu; class KToolBarPopupAction; class QToolButton; -class QIcon; class PlacesPanel; class TerminalPanel; @@ -111,7 +113,7 @@ public: bool isFoldersPanelEnabled() const; bool isInformationPanelEnabled() const; -public slots: +public Q_SLOTS: /** * Opens each directory in \p dirs in a separate tab. If \a splitView is set, * 2 directories are collected within one tab. @@ -174,7 +176,7 @@ public slots: */ void openNewTab(const QUrl& url); -signals: +Q_SIGNALS: /** * Is sent if the selection of the currently active view has * been changed. @@ -193,6 +195,12 @@ signals: */ void requestItemInfo(const KFileItem& item); + /** + * It is emitted when in the current view, files are changed, + * or dirs have files/removed from them. + */ + void fileItemsChanged(const KFileItemList &changedFileItems); + /** * Is emitted if the settings have been changed. */ @@ -216,7 +224,10 @@ protected: /** Handles QWhatsThisClickedEvent and passes all others on. */ bool eventFilter(QObject*, QEvent*) override; -protected slots: + /** Sets a sane initial window size **/ + QSize sizeHint() const override; + +protected Q_SLOTS: /** * Calls the base method KXmlGuiWindow::saveNewToolbarConfig(). * Is also used to set toolbar constraints and UrlNavigator position @@ -224,7 +235,7 @@ protected slots: */ void saveNewToolbarConfig() override; -private slots: +private Q_SLOTS: /** * Refreshes the views of the main window by recreating them according to * the given Dolphin settings. @@ -459,9 +470,15 @@ private 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. + * + * 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. @@ -566,16 +583,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 @@ -616,6 +623,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 @@ -653,11 +670,7 @@ 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; - }; inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const