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, 10 insertions, 0 deletions

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index e7c919ad8..f144109cb 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -95,6 +95,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
             this, SLOT(updateViewActions()));
     connect(m_view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
+    connect(m_view, SIGNAL(additionalInfoChanged()),
+            this, SLOT(slotAdditionalInfoChanged()));
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
@@ -153,6 +155,9 @@ void DolphinPart::createActions()
     KAction* sortDescending = DolphinView::createSortDescendingAction(actionCollection());
     connect(sortDescending, SIGNAL(triggered()), m_view, SLOT(toggleSortOrder()));
 
+    QActionGroup* showInformationActionGroup = DolphinView::createAdditionalInformationActionGroup(actionCollection());
+    connect(showInformationActionGroup, SIGNAL(triggered(QAction*)), m_view, SLOT(toggleAdditionalInfo(QAction*)));
+
     // Go menu
 
     KAction* newDirAction = DolphinView::createNewDirAction(actionCollection());
@@ -447,4 +452,9 @@ void DolphinPart::slotSortOrderChanged(Qt::SortOrder order)
     descending->setChecked(sortDescending);
 }
 
+void DolphinPart::slotAdditionalInfoChanged()
+{
+    m_view->updateAdditionalInfoActions(actionCollection());
+}
+
 #include "dolphinpart.moc"