Merge branch 'release/22.04'

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 3a29d1c0a483bef09e16e21e89c72032e43b00fc..17327f2de9f3bbafd6027b9b89b99f34eef19e24 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -95,6 +95,12 @@ public:
      */
     KNewFileMenu* newFileMenu() const;
 
      */
     KNewFileMenu* newFileMenu() const;
 

+    /**
+     * Augments Qt's build-in QMainWindow context menu to add
+     * Dolphin-specific actions, such as "unlock panels".
+     */
+    QMenu *createPopupMenu() override;
+

     /**
      * Switch the window's view containers' locations to display the home path
      * for any which are currently displaying a location corresponding to or
     /**
      * Switch the window's view containers' locations to display the home path
      * for any which are currently displaying a location corresponding to or


@@ -171,6 +177,19 @@ public Q_SLOTS:
      */
     void openNewTab(const QUrl& url);
 
      */
     void openNewTab(const QUrl& url);
 

+    /**
+     * Opens a new tab  showing the URL \a url and activate it.
+     */
+    void openNewTabAndActivate(const QUrl &url);
+
+    /**
+     * Opens a new window showing the URL \a url.
+     */
+    void openNewWindow(const QUrl &url);
+
+    /** @see GeneralSettings::splitViewChanged() */
+    void slotSplitViewChanged();
+

 Q_SIGNALS:
     /**
      * Is sent if the selection of the currently active view has
 Q_SIGNALS:
     /**
      * Is sent if the selection of the currently active view has


@@ -456,14 +475,11 @@ private Q_SLOTS:
      * @pos           Position in screen coordinates.
      * @item          File item context. If item is null, the context menu
      *                should be applied to \a url.
      * @pos           Position in screen coordinates.
      * @item          File item context. If item is null, the context menu
      *                should be applied to \a url.

+     * @selectedItems The selected items for which the context menu
+     *                is opened. This list generally includes \a item.

      * @url           URL which contains \a item.
      * @url           URL which contains \a item.

-     * @customActions Actions that should be added to the context menu,
-     *                if the file item is null.

      */
      */

-    void openContextMenu(const QPoint& pos,
-                         const KFileItem& item,
-                         const QUrl& url,
-                         const QList<QAction*>& customActions);
+    void openContextMenu(const QPoint& pos, const KFileItem& item, const KFileItemList &selectedItems, const QUrl& url);

 
     /**
      * Updates the menu that is by default at the right end of the toolbar.
 
     /**
      * Updates the menu that is by default at the right end of the toolbar.


@@ -563,6 +579,12 @@ private Q_SLOTS:
       * to go to.
       */
     void slotGoForward(QAction* action);
       * to go to.
       */
     void slotGoForward(QAction* action);

+
+    /**
+     * Is called when configuring the keyboard shortcuts
+     */
+    void slotKeyBindings();
+

 private:
     /**
      * Sets up the various menus and actions and connects them.
 private:
     /**
      * Sets up the various menus and actions and connects them.


@@ -628,6 +650,9 @@ private:
      */
     bool addHamburgerMenuToToolbar();
 
      */
     bool addHamburgerMenuToToolbar();
 

+    /** Creates an action representing an item in the URL navigator history */
+    static QAction *urlNavigatorHistoryAction(const KUrlNavigator *urlNavigator, int historyIndex, QObject *parent = nullptr);
+

 private:
     /**
      * Implements a custom error handling for the undo manager. This
 private:
     /**
      * Implements a custom error handling for the undo manager. This