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, 9 insertions, 9 deletions

diff --git a/src/dolphinview.h b/src/dolphinview.h
index aef541a89..9b56e85a8 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -395,7 +395,7 @@ signals:
     void sortOrderChanged(Qt::SortOrder order);
 
     /** Is emitted if the additional information for an item has been changed. */
-    void additionalInfoChanged(KFileItemDelegate::InformationList info);
+    void additionalInfoChanged(const KFileItemDelegate::InformationList& info);
 
     /**
      * Is emitted if information of an item is requested to be shown e. g. in the sidebar.
@@ -489,12 +489,12 @@ private slots:
     /**
      * Drops the URLs \a urls to the destination path \a destPath. If
      * the URLs are dropped above an item inside the destination path,
-     * the item is indicated by \a destIndex. \a source
+     * the item is indicated by \a destItem. \a source
      * indicates the widget where the dragging has been started from.
      */
     void dropUrls(const KUrl::List& urls,
                   const KUrl& destPath,
-                  const QModelIndex& destIndex,
+                  const KFileItem& destItem,
                   QWidget* source);
 
     /**
@@ -516,6 +516,12 @@ private slots:
     void updateSortOrder(Qt::SortOrder order);
 
     /**
+     * Updates the view properties of the current URL to the
+     * additional informations given by \a info.
+     */
+    void updateAdditionalInfo(const KFileItemDelegate::InformationList& info);
+
+    /**
      * Emits the signal contentsMoved with the current coordinates
      * of the viewport as parameters.
      */
@@ -569,12 +575,6 @@ private:
     QAbstractItemView* itemView() const;
 
     /**
-     * Returns true if the index is valid and represents
-     * the column DolphinModel::Name.
-     */
-    bool isValidNameIndex(const QModelIndex& index) const;
-
-    /**
      * Returns true, if the item \a item has been cut into
      * the clipboard.
      */