svn merge -r764536:HEAD from 4.0 branch: refactor "additional info" actions and provide them in the part

svn path=/trunk/KDE/kdebase/apps/; revision=764550

1 files changed, 20 insertions, 2 deletions

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 5ee535cb4..6f2658569 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -38,6 +38,7 @@
 #include <QListView>
 #include <QWidget>
 
+class QActionGroup;
 class DolphinController;
 class DolphinColumnView;
 class DolphinDetailsView;
@@ -373,6 +374,17 @@ public:
     static KAction* createSortDescendingAction(KActionCollection* collection);
 
     /**
+     * Creates an action group with all the "show additional information" actions in it.
+     * This code is here to share it between the mainwindow and the part
+     */
+    static QActionGroup* createAdditionalInformationActionGroup(KActionCollection* collection);
+
+    /**
+     * Updates the state of the 'Additional Information' actions in \a collection.
+     */
+    void updateAdditionalInfoActions(KActionCollection* collection);
+
+    /**
      * Returns the action name corresponding to the current view mode
      */
     QString currentViewModeActionName() const;
@@ -430,6 +442,12 @@ public slots:
     /** Switches between an ascending and descending sorting order. */
     void toggleSortOrder();
 
+    /**
+     * Switches on or off the displaying of additional information
+     * as specified by \a action.
+     */
+    void toggleAdditionalInfo(QAction* action);
+
 signals:
     /**
      * Is emitted if the view has been activated by e. g. a mouse click.
@@ -465,8 +483,8 @@ signals:
     /** Is emitted if the sort order (ascending or descending) has been changed. */
     void sortOrderChanged(Qt::SortOrder order);
 
-    /** Is emitted if the additional information for an item has been changed. */
-    void additionalInfoChanged(const KFileItemDelegate::InformationList& info);
+    /** Is emitted if the additional information shown for this view has been changed. */
+    void additionalInfoChanged();
 
     /**
      * Is emitted if information of an item is requested to be shown e. g. in the sidebar.