Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 5f96ca3b621fbb04ea7cabbd870513c6f39df468..8b9c4a211be7762a8cfff8c23bff71f18937706a 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -32,6 +32,7 @@
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 

+class DiskSpaceUsageMenu;

 class DolphinBookmarkHandler;
 class DolphinViewActionHandler;
 class DolphinSettingsDialog;
 class DolphinBookmarkHandler;
 class DolphinViewActionHandler;
 class DolphinSettingsDialog;


@@ -42,6 +43,7 @@ class KFileItem;
 class KFileItemList;
 class KJob;
 class KNewFileMenu;
 class KFileItemList;
 class KJob;
 class KNewFileMenu;

+class KRecentFilesAction;

 class KToolBarPopupAction;
 class QToolButton;
 class PlacesPanel;
 class KToolBarPopupAction;
 class QToolButton;
 class PlacesPanel;


@@ -208,8 +210,9 @@ public Q_SLOTS:
 
     /**
      * Opens a new tab in the background showing the URL \a url.
 
     /**
      * 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.
 
     /**
      * Opens a new tab  showing the URL \a url and activate it.


@@ -294,6 +297,7 @@ private Q_SLOTS:
     void updateNewMenu();
 
     void createDirectory();
     void updateNewMenu();
 
     void createDirectory();

+    void createFile();

 
     /** Shows the error message in the status bar of the active view. */
     void showErrorMessage(const QString &message);
 
     /** Shows the error message in the status bar of the active view. */
     void showErrorMessage(const QString &message);


@@ -402,10 +406,21 @@ private Q_SLOTS:
     void togglePanelLockState();
 
     /**
     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();
 
     /** Goes back one step of the URL history. */
     void goBack();


@@ -455,8 +470,11 @@ private Q_SLOTS:
     /** Opens a terminal window for the URL. */
     void openTerminalJob(const QUrl &url);
 
     /** 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();
 
     /** Opens the settings dialog for Dolphin. */
     void editSettings();


@@ -687,6 +705,12 @@ private:
      */
     void updateAllowedToolbarAreas();
 
      */
     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;
 
     /**
     bool isKompareInstalled() const;
 
     /**


@@ -749,6 +773,7 @@ private:
     KToolBarPopupAction *m_forwardAction;
     KActionMenu *m_splitViewAction;
     QAction *m_splitViewMenuAction;
     KToolBarPopupAction *m_forwardAction;
     KActionMenu *m_splitViewAction;
     QAction *m_splitViewMenuAction;

+    DiskSpaceUsageMenu *m_diskSpaceUsageMenu;

 
     QMenu m_searchTools;
     KFileItemActions m_fileItemActions;
 
     QMenu m_searchTools;
     KFileItemActions m_fileItemActions;


@@ -759,6 +784,8 @@ private:
 
     KIO::CommandLauncherJob *m_job;
 
 
     KIO::CommandLauncherJob *m_job;
 

+    KRecentFilesAction *m_recentFiles = nullptr;
+

     friend class DolphinMainWindowTest;
 };
 
     friend class DolphinMainWindowTest;
 };