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

[dolphin.git] / src / views / dolphinviewactionhandler.h

diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h
index 8631936d9c9ddda11364c51ccc7f4aa64ce3953b..a589be9eaac7eb8e41efd7bd20b49fe75552a1b4 100644 (file)
--- a/src/views/dolphinviewactionhandler.h
+++ b/src/views/dolphinviewactionhandler.h
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 

-

 #ifndef DOLPHINVIEWACTIONHANDLER_H
 #define DOLPHINVIEWACTIONHANDLER_H
 
 #ifndef DOLPHINVIEWACTIONHANDLER_H
 #define DOLPHINVIEWACTIONHANDLER_H
 


@@ -21,8 +20,9 @@ class QActionGroup;
 class DolphinView;
 class KActionCollection;
 class KFileItemList;
 class DolphinView;
 class KActionCollection;
 class KFileItemList;

-namespace SelectionMode {
-    class ActionTextHelper;
+namespace SelectionMode
+{
+class ActionTextHelper;

 }
 
 /**
 }
 
 /**


@@ -44,17 +44,17 @@ class DOLPHIN_EXPORT DolphinViewActionHandler : public QObject
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    explicit DolphinViewActionHandler(KActionCollection* collection, SelectionMode::ActionTextHelper* actionTextHelper, QObject* parent);
+    explicit DolphinViewActionHandler(KActionCollection *collection, SelectionMode::ActionTextHelper *actionTextHelper, QObject *parent);

 
     /**
      * Sets the view that this action handler should work on.
      */
 
     /**
      * Sets the view that this action handler should work on.
      */

-    void setCurrentView(DolphinView* view);
+    void setCurrentView(DolphinView *view);

 
     /**
      * Returns the view that this action handler should work on.
      */
 
     /**
      * Returns the view that this action handler should work on.
      */

-    DolphinView* currentView();
+    DolphinView *currentView();

 
     /**
      * Returns the name of the action for the current viewmode
 
     /**
      * Returns the name of the action for the current viewmode


@@ -64,7 +64,7 @@ public:
     /**
      * Returns m_actionCollection
      */
     /**
      * Returns m_actionCollection
      */

-    KActionCollection* actionCollection();
+    KActionCollection *actionCollection();

 
 public Q_SLOTS:
     /**
 
 public Q_SLOTS:
     /**


@@ -87,6 +87,13 @@ Q_SIGNALS:
      */
     void createDirectoryTriggered();
 
      */
     void createDirectoryTriggered();
 

+    /**
+     * Emitted if the user requested creating a new file.
+     * The receiver of the signal (DolphinMainWindow or DolphinPart) invokes
+     * the method createFile of their KNewFileMenu instance.
+     */
+    void createFileTriggered();
+

     /** Used to request either entering or leaving of selection mode */
     void selectionModeChangeTriggered(bool enabled, SelectionMode::BottomBar::Contents bottomBarContents = SelectionMode::BottomBar::Contents::GeneralContents);
 
     /** Used to request either entering or leaving of selection mode */
     void selectionModeChangeTriggered(bool enabled, SelectionMode::BottomBar::Contents bottomBarContents = SelectionMode::BottomBar::Contents::GeneralContents);
 


@@ -94,7 +101,7 @@ private Q_SLOTS:
     /**
      * Emitted when the user requested a change of view mode
      */
     /**
      * Emitted when the user requested a change of view mode
      */

-    void slotViewModeActionTriggered(QAction*);
+    void slotViewModeActionTriggered(QAction *);

 
     /**
      * Let the user input a name for the selected item(s) and trigger
 
     /**
      * Let the user input a name for the selected item(s) and trigger


@@ -126,7 +133,7 @@ private Q_SLOTS:
 
     /** Decreases the size of the current set view mode. */
     void zoomOut();
 
     /** Decreases the size of the current set view mode. */
     void zoomOut();

-    
+

     /** Resets the size of the current set view mode to default. */
     void zoomReset();
 
     /** Resets the size of the current set view mode to default. */
     void zoomReset();
 


@@ -156,7 +163,17 @@ private Q_SLOTS:
     /**
      * Updates the state of the 'Sort by' actions.
      */
     /**
      * Updates the state of the 'Sort by' actions.
      */

-    void slotSortRoleChanged(const QByteArray& role);
+    void slotSortRoleChanged(const QByteArray &role);
+
+    /**
+     * Updates the state of the 'Group Ascending/Descending' action.
+     */
+    void slotGroupOrderChanged(Qt::SortOrder order);
+
+    /**
+     * Updates the state of the 'Group by' actions.
+     */
+    void slotGroupRoleChanged(const QByteArray &role);

 
     /**
      * Updates the state of the 'Zoom In' and 'Zoom Out' actions.
 
     /**
      * Updates the state of the 'Zoom In' and 'Zoom Out' actions.


@@ -167,19 +184,23 @@ private Q_SLOTS:
      * Switches on or off the displaying of additional information
      * as specified by \a action.
      */
      * Switches on or off the displaying of additional information
      * as specified by \a action.
      */

-    void toggleVisibleRole(QAction* action);
+    void toggleVisibleRole(QAction *action);

 
     /**
      * Changes the sorting of the current view.
      */
 
     /**
      * Changes the sorting of the current view.
      */

-    void slotSortTriggered(QAction*);
+    void slotSortTriggered(QAction *);

 
     /**
      * Updates the state of the 'Additional Information' actions.
      */
 
     /**
      * Updates the state of the 'Additional Information' actions.
      */

-    void slotVisibleRolesChanged(const QList<QByteArray>& current,
-                                 const QList<QByteArray>& previous);
+    void slotVisibleRolesChanged(const QList<QByteArray> &current, const QList<QByteArray> &previous);

 
 

+    /**
+     * Changes the grouping of the current view.
+     */
+    void slotGroupTriggered(QAction *);
+    

     /**
      * Switches between sorting by groups or not.
      */
     /**
      * Switches between sorting by groups or not.
      */


@@ -234,7 +255,7 @@ private Q_SLOTS:
      * The name is changed to something like "Actions for 3 Selected Items" to be extra
      * explicit of how these basic actions are used.
      */
      * The name is changed to something like "Actions for 3 Selected Items" to be extra
      * explicit of how these basic actions are used.
      */

-    void slotSelectionChanged(const KFileItemList& selection);
+    void slotSelectionChanged(const KFileItemList &selection);

 
 private:
     /**
 
 private:
     /**


@@ -251,31 +272,32 @@ private:
      * The changes of actions are reported to slotSortTriggered() or
      * toggleAdditionalInfo().
      */
      * The changes of actions are reported to slotSortTriggered() or
      * toggleAdditionalInfo().
      */

-    QActionGroup* createFileItemRolesActionGroup(const QString& groupPrefix);
+    QActionGroup *createFileItemRolesActionGroup(const QString &groupPrefix);

 
     /**
      * Returns the "switch to icons mode" action.
      * Helper method for createActions();
      */
 
     /**
      * Returns the "switch to icons mode" action.
      * Helper method for createActions();
      */

-    KToggleAction* iconsModeAction();
+    KToggleAction *iconsModeAction();

 
     /**
      * Returns the "switch to compact mode" action.
      * Helper method for createActions();
      */
 
     /**
      * Returns the "switch to compact mode" action.
      * Helper method for createActions();
      */

-    KToggleAction* compactModeAction();
+    KToggleAction *compactModeAction();

 
     /**
      * Returns the "switch to details mode" action.
      * Helper method for createActions();
      */
 
     /**
      * Returns the "switch to details mode" action.
      * Helper method for createActions();
      */

-    KToggleAction* detailsModeAction();
+    KToggleAction *detailsModeAction();

 
 

-    KActionCollection* m_actionCollection;
-    DolphinView* m_currentView;
+    KActionCollection *m_actionCollection;
+    DolphinView *m_currentView;

 
 

-    QHash<QByteArray, KToggleAction*> m_sortByActions;
-    QHash<QByteArray, KToggleAction*> m_visibleRoles;
+    QHash<QByteArray, KToggleAction *> m_sortByActions;
+    QHash<QByteArray, KToggleAction *> m_groupByActions;
+    QHash<QByteArray, KToggleAction *> m_visibleRoles;

 };
 
 #endif /* DOLPHINVIEWACTIONHANDLER_H */
 };
 
 #endif /* DOLPHINVIEWACTIONHANDLER_H */