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, 24 insertions, 6 deletions

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index f5fdbbf3a..30346a862 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -202,15 +202,24 @@ void ViewProperties::setAdditionalInfo(KFileItemDelegate::InformationList list)
     int info = NoInfo;
     foreach (KFileItemDelegate::Information currentInfo, list) {
         switch (currentInfo) {
-        case KFileItemDelegate::FriendlyMimeType:
-            info = info | TypeInfo;
-            break;
         case KFileItemDelegate::Size:
             info = info | SizeInfo;
             break;
         case KFileItemDelegate::ModificationTime:
             info = info | DateInfo;
             break;
+        case KFileItemDelegate::Permissions:
+            info = info | PermissionsInfo;
+            break;
+        case KFileItemDelegate::Owner:
+            info = info | OwnerInfo;
+            break;
+        case KFileItemDelegate::OwnerAndGroup:
+            info = info | GroupInfo;
+            break;
+        case KFileItemDelegate::FriendlyMimeType:
+            info = info | TypeInfo;
+            break;
         default:
             break;
         }
@@ -227,15 +236,24 @@ KFileItemDelegate::InformationList ViewProperties::additionalInfo() const
     const int info = m_node->additionalInfo();
 
     KFileItemDelegate::InformationList list;
-    if (info & TypeInfo) {
-        list.append(KFileItemDelegate::FriendlyMimeType);
-    }
     if (info & SizeInfo) {
         list.append(KFileItemDelegate::Size);
     }
     if (info & DateInfo) {
         list.append(KFileItemDelegate::ModificationTime);
     }
+    if (info & PermissionsInfo) {
+        list.append(KFileItemDelegate::Permissions);
+    }
+    if (info & OwnerInfo) {
+        list.append(KFileItemDelegate::Owner);
+    }
+    if (info & GroupInfo) {
+        list.append(KFileItemDelegate::OwnerAndGroup);
+    }
+    if (info & TypeInfo) {
+        list.append(KFileItemDelegate::FriendlyMimeType);
+    }
 
     return list;
 }