X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/9b83378c087a87cef537ba751b7713aff8bed84c..a4be53fb997ea2f844f2ca4a590c073a50fcbbf6:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index c03eb1be0..40101852b 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -15,6 +15,10 @@ #include #include +#ifdef HAVE_BALOO + #include "panels/information/informationpanel.h" +#endif + #include #include #include @@ -37,7 +41,6 @@ class KNewFileMenu; class KHelpMenu; class KToolBarPopupAction; class QToolButton; -class QIcon; class PlacesPanel; class TerminalPanel; @@ -92,9 +95,26 @@ public: */ KNewFileMenu* newFileMenu() const; - void setTabsToHomeIfMountPathOpen(const QString& mountPath); + /** + * Switch the window's view containers' locations to display the home path + * for any which are currently displaying a location corresponding to or + * within mountPath. + * + * This typically done after unmounting a disk at mountPath to ensure that + * the window is not displaying an invalid location. + */ + void setViewsToHomeIfMountPathOpen(const QString& mountPath); -public slots: + /** + * 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; + +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. @@ -153,16 +173,11 @@ public slots: void quit(); /** - * Opens a new tab and places it after the current tab - */ - void openNewTabAfterCurrentTab(const QUrl& url); - - /** - * Opens a new tab and places it as the last tab + * Opens a new tab in the background showing the URL \a url. */ - void openNewTabAfterLastTab(const QUrl& url); + void openNewTab(const QUrl& url); -signals: +Q_SIGNALS: /** * Is sent if the selection of the currently active view has * been changed. @@ -181,6 +196,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. */ @@ -204,7 +225,15 @@ protected: /** Handles QWhatsThisClickedEvent and passes all others on. */ bool eventFilter(QObject*, QEvent*) override; -private slots: +protected Q_SLOTS: + /** + * Calls the base method KXmlGuiWindow::saveNewToolbarConfig(). + * Is also used to set toolbar constraints and UrlNavigator position + * based on the newly changed toolbar configuration. + */ + void saveNewToolbarConfig() override; + +private Q_SLOTS: /** * Refreshes the views of the main window by recreating them according to * the given Dolphin settings. @@ -287,6 +316,7 @@ private slots: void disableStopAction(); void showFilterBar(); + void toggleFilterBar(); /** * Toggles between edit and browse mode of the navigation bar. @@ -391,11 +421,6 @@ private slots: */ void addToPlaces(); - /** - * Opens a new tab in the background showing the URL \a url. - */ - void openNewTab(const QUrl& url, DolphinTabWidget::TabPlacement tabPlacement); - /** * Opens the selected folder in a new tab. */ @@ -443,9 +468,10 @@ 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. + */ + void updateHamburgerMenu(); /** * Is called if the user clicked an item in the Places Panel. @@ -550,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 @@ -576,6 +592,11 @@ private: */ void updateSplitAction(); + /** + * Sets the window sides the toolbar may be moved to based on toolbar contents. + */ + void updateAllowedToolbarAreas(); + bool isKompareInstalled() const; /** @@ -595,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 @@ -632,8 +663,10 @@ private: KToolBarPopupAction* m_backAction; KToolBarPopupAction* m_forwardAction; - QMenu m_searchTools; + /** Makes sure that only one object is ever connected to the history. */ + QMetaObject::Connection m_updateHistoryConnection; + QMenu m_searchTools; }; inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const