Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index f5fdbbf3a05caf9347e677faa4b6eee5490fe8e6..30346a862ab82ab0817ff89b7a8595df47e21ea3 100644 (file)
--- 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) {
     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::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;
         }
         default:
             break;
         }


@@ -227,15 +236,24 @@ KFileItemDelegate::InformationList ViewProperties::additionalInfo() const
     const int info = m_node->additionalInfo();
 
     KFileItemDelegate::InformationList list;
     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 & 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;
 }
 
     return list;
 }