due to the recent tagging freeze this commit contains several fixes in one:

* the filterbar now also filters directories (works also in the column-view :-))

* The "Additional Information" menu entry now also works for showing/hiding the columns of the details view. This also implies that the columns for the details view can now be adjusted per directory -> we have now a consistent behavior between the icons view and details view. Still open: the view properties dialog must be fixed

* Don't show a "Nepomuk not available" error message when starting Dolphin and Nepomuk is not available.

* Fix issue that the information panel blocked the application because of parsing the full meta data of a huge file.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/src/dolphiniconsview.h b/src/dolphiniconsview.h
index 5838a98dd..2b7d00bf0 100644
--- a/src/dolphiniconsview.h
+++ b/src/dolphiniconsview.h
@@ -23,6 +23,7 @@
 #include <kcategorizedview.h>
 
 #include <kfileitem.h>
+#include <kfileitemdelegate.h>
 
 #include <QSize>
 #include <QStyleOption>
@@ -64,7 +65,7 @@ private slots:
     void triggerItem(const QModelIndex& index);
     void slotEntered(const QModelIndex& index);
     void slotShowPreviewChanged(bool show);
-    void slotAdditionalInfoCountChanged(int count);
+    void slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info);
     void zoomIn();
     void zoomOut();