X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/638a0663a1a79230a870717e37cb48b9cb61062c..refs/heads/master:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 5f2ed20ca..8b9c4a211 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -32,6 +32,7 @@ typedef KIO::FileUndoManager::CommandType CommandType; +class DiskSpaceUsageMenu; class DolphinBookmarkHandler; class DolphinViewActionHandler; class DolphinSettingsDialog; @@ -209,8 +210,9 @@ public Q_SLOTS: /** * Opens a new tab in the background showing the URL \a url. + * @return A pointer to the opened DolphinTabPage. */ - void openNewTab(const QUrl &url); + DolphinTabPage *openNewTab(const QUrl &url); /** * Opens a new tab showing the URL \a url and activate it. @@ -295,6 +297,7 @@ private Q_SLOTS: void updateNewMenu(); void createDirectory(); + void createFile(); /** Shows the error message in the status bar of the active view. */ void showErrorMessage(const QString &message); @@ -403,10 +406,21 @@ private Q_SLOTS: void togglePanelLockState(); /** - * Is invoked if the Terminal panel got visible/invisible and takes care - * that the active view has the focus if the Terminal panel is invisible. + * Is invoked whenever the Terminal panel visibility is changed by the user and then moves the focus + * to the active view if the panel was hidden. + * @note The opposite action (putting focus to the Terminal) is not handled + * here but in TerminalPanel::showEvent(). + * @param visible the new visibility state of the terminal panel */ - void slotTerminalPanelVisibilityChanged(); + void slotTerminalPanelVisibilityChanged(bool visible); + + /** + * Is invoked whenever the Places panel visibility is changed by the user and then either moves the focus + * - to the Places panel if it was made visible, or + * - to the active view if the panel was hidden. + * @param visible the new visibility state of the Places panel + */ + void slotPlacesPanelVisibilityChanged(bool visible); /** Goes back one step of the URL history. */ void goBack(); @@ -456,8 +470,11 @@ private Q_SLOTS: /** Opens a terminal window for the URL. */ void openTerminalJob(const QUrl &url); - /** Focus a Terminal Panel. */ - void focusTerminalPanel(); + /** Toggles focus to/from a Terminal Panel. */ + void toggleTerminalPanelFocus(); + + /** Toggles focus to/from the Places Panel. */ + void togglePlacesPanelFocus(); /** Opens the settings dialog for Dolphin. */ void editSettings(); @@ -688,6 +705,12 @@ private: */ void updateAllowedToolbarAreas(); + /** + * Sets the background of the location bar(s) on if they are inside the toolbar, + * or off if they are outside the toolbar. + */ + void updateNavigatorsBackground(); + bool isKompareInstalled() const; /** @@ -750,6 +773,7 @@ private: KToolBarPopupAction *m_forwardAction; KActionMenu *m_splitViewAction; QAction *m_splitViewMenuAction; + DiskSpaceUsageMenu *m_diskSpaceUsageMenu; QMenu m_searchTools; KFileItemActions m_fileItemActions;