Fix minor typos

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

diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h
index 4e5a0d32f09046198e789679ae0fa34716a8944d..537adb4da53ed6b0d8f7300d27e24a63ac68809b 100644 (file)
--- a/src/views/dolphinviewactionhandler.h
+++ b/src/views/dolphinviewactionhandler.h
@@ -1,5 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2008 by David Faure <faure@kde.org>                     *
 /***************************************************************************
  *   Copyright (C) 2008 by David Faure <faure@kde.org>                     *

+ *   Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.com>             *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -21,10 +22,9 @@
 #ifndef DOLPHINVIEWACTIONHANDLER_H
 #define DOLPHINVIEWACTIONHANDLER_H
 
 #ifndef DOLPHINVIEWACTIONHANDLER_H
 #define DOLPHINVIEWACTIONHANDLER_H
 

-#include "libdolphin_export.h"
-#include <KActionMenu>
-#include <KSelectAction>
+#include "dolphin_export.h"

 #include "views/dolphinview.h"
 #include "views/dolphinview.h"

+

 #include <QObject>
 
 class KToggleAction;
 #include <QObject>
 
 class KToggleAction;


@@ -47,7 +47,7 @@ class KActionCollection;
  * @see DolphinMainWindow
  * @see DolphinPart
  */
  * @see DolphinMainWindow
  * @see DolphinPart
  */

-class LIBDOLPHINPRIVATE_EXPORT DolphinViewActionHandler : public QObject
+class DOLPHIN_EXPORT DolphinViewActionHandler : public QObject

 {
     Q_OBJECT
 
 {
     Q_OBJECT
 


@@ -84,7 +84,7 @@ public Q_SLOTS:
 Q_SIGNALS:
     /**
      * Emitted by DolphinViewActionHandler when the user triggered an action.
 Q_SIGNALS:
     /**
      * Emitted by DolphinViewActionHandler when the user triggered an action.

-     * This is only used for clearining the statusbar in DolphinMainWindow.
+     * This is only used for clearing the statusbar in DolphinMainWindow.

      */
     void actionBeingHandled();
 
      */
     void actionBeingHandled();
 


@@ -93,7 +93,7 @@ Q_SIGNALS:
      * The receiver of the signal (DolphinMainWindow or DolphinPart) invokes
      * the method createDirectory of their KNewFileMenu instance.
      */
      * The receiver of the signal (DolphinMainWindow or DolphinPart) invokes
      * the method createDirectory of their KNewFileMenu instance.
      */

-    void createDirectory();
+    void createDirectoryTriggered();

 
 private Q_SLOTS:
     /**
 
 private Q_SLOTS:
     /**


@@ -111,7 +111,7 @@ private Q_SLOTS:
      * Moves the selected items of the active view to the trash.
      * This methods adds "shift means del" handling.
      */
      * Moves the selected items of the active view to the trash.
      * This methods adds "shift means del" handling.
      */

-    void slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers);
+    void slotTrashActivated();

 
     /**
      * Deletes the selected items of the active view.
 
     /**
      * Deletes the selected items of the active view.


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

-    void slotSortingChanged(DolphinView::Sorting sorting);
+    void slotSortRoleChanged(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.


@@ -162,7 +162,7 @@ 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 toggleAdditionalInfo(QAction* action);
+    void toggleVisibleRole(QAction* action);

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


@@ -172,18 +172,18 @@ private Q_SLOTS:
     /**
      * Updates the state of the 'Additional Information' actions.
      */
     /**
      * Updates the state of the 'Additional Information' actions.
      */

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

 
     /**
 
     /**

-     * Switches between sorting by categories or not.
+     * Switches between sorting by groups or not.

      */
      */

-    void toggleSortCategorization(bool);
+    void toggleGroupedSorting(bool);

 
     /**
      * Updates the state of the 'Categorized sorting' menu action.
      */
 
     /**
      * Updates the state of the 'Categorized sorting' menu action.
      */

-    void slotCategorizedSortingChanged(bool sortCategorized);
+    void slotGroupedSortingChanged(bool sortCategorized);

 
     /**
      * Switches between showing and hiding of hidden marked files
 
     /**
      * Switches between showing and hiding of hidden marked files


@@ -195,6 +195,11 @@ private Q_SLOTS:
      */
     void slotHiddenFilesShownChanged(bool shown);
 
      */
     void slotHiddenFilesShownChanged(bool shown);
 

+    /**
+     * Updates the state of the 'Create Folder...' action.
+     */
+    void slotWriteStateChanged(bool isFolderWritable);
+

     /**
      * Opens the view properties dialog, which allows to modify the properties
      * of the currently active view.
     /**
      * Opens the view properties dialog, which allows to modify the properties
      * of the currently active view.


@@ -217,16 +222,14 @@ private:
     void createActions();
 
     /**
     void createActions();
 
     /**

-     * Creates an action group with all the "show additional information" actions in it.
-     * Helper method for createActions();
-     */
-    QActionGroup* createAdditionalInformationActionGroup();
-
-    /**
-     * Creates an action group with all the "sort by" actions in it.
-     * Helper method for createActions();
+     * Creates an action-group out of all roles from KFileItemModel.
+     * Dependent on the group-prefix either a radiobutton-group is
+     * created for sorting (prefix is "sort_by_") or a checkbox-group
+     * is created for additional information (prefix is "show_").
+     * The changes of actions are reported to slotSortTriggered() or
+     * toggleAdditionalInfo().

      */
      */

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

 
     /**
      * Returns the "switch to icons mode" action.
 
     /**
      * Returns the "switch to icons mode" action.


@@ -248,6 +251,9 @@ private:
 
     KActionCollection* m_actionCollection;
     DolphinView* m_currentView;
 
     KActionCollection* m_actionCollection;
     DolphinView* m_currentView;

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

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