Merge branch 'master' into frameworks

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

diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h
index 05339ce3740cc928c822a9579d8e67178c1ab035..58cdb5416068d423e1421201c5b82071781a06f0 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) 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  *
@@ -22,10 +23,10 @@
 #define DOLPHINVIEWACTIONHANDLER_H
 
 #include "libdolphin_export.h"
-#include <kactionmenu.h>
-#include <kselectaction.h>
+#include <KActionMenu>
+#include <KSelectAction>
 #include "views/dolphinview.h"
-#include <QtCore/QObject>
+#include <QObject>
 
 class KToggleAction;
 class QAction;
@@ -111,7 +112,7 @@ private Q_SLOTS:
      * 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.
@@ -124,7 +125,7 @@ private Q_SLOTS:
     void togglePreview(bool);
 
     /** Updates the state of the 'Show preview' menu action. */
-    void slotShowPreviewChanged();
+    void slotPreviewsShownChanged(bool shown);
 
     /** Increases the size of the current set view mode. */
     void zoomIn();
@@ -151,18 +152,18 @@ private Q_SLOTS:
     /**
      * 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.
      */
-    void slotZoomLevelChanged(int level);
+    void slotZoomLevelChanged(int current, int previous);
 
     /**
      * 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.
@@ -172,17 +173,18 @@ private Q_SLOTS:
     /**
      * Updates the state of the 'Additional Information' actions.
      */
-    void slotAdditionalInfoChanged();
+    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.
      */
-    void slotCategorizedSortingChanged();
+    void slotGroupedSortingChanged(bool sortCategorized);
 
     /**
      * Switches between showing and hiding of hidden marked files
@@ -192,7 +194,12 @@ private Q_SLOTS:
     /**
      * Updates the state of the 'Show hidden files' menu action.
      */
-    void slotShowHiddenFilesChanged();
+    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
@@ -216,16 +223,14 @@ private:
     void createActions();
 
     /**
-     * Creates an action group with all the "show additional information" 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* createAdditionalInformationActionGroup();
-
-    /**
-     * Creates an action group with all the "sort by" actions in it.
-     * Helper method for createActions();
-     */
-    QActionGroup* createSortByActionGroup();
+    QActionGroup* createFileItemRolesActionGroup(const QString& groupPrefix);
 
     /**
      * Returns the "switch to icons mode" action.
@@ -234,19 +239,22 @@ private:
     KToggleAction* iconsModeAction();
 
     /**
-     * Returns the "switch to details mode" action.
+     * Returns the "switch to compact mode" action.
      * Helper method for createActions();
      */
-    KToggleAction* detailsModeAction();
+    KToggleAction* compactModeAction();
 
     /**
-     * Returns the "switch to columns mode" action.
+     * Returns the "switch to details mode" action.
      * Helper method for createActions();
      */
-    KToggleAction* columnsModeAction();
+    KToggleAction* detailsModeAction();
 
     KActionCollection* m_actionCollection;
     DolphinView* m_currentView;
+
+    QHash<QByteArray, KToggleAction*> m_sortByActions;
+    QHash<QByteArray, KToggleAction*> m_visibleRoles;
 };
 
 #endif /* DOLPHINVIEWACTIONHANDLER_H */