X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/eaeee9f7d68d120b1982f24e73d8183db3418261..a047333c0482249a12dca4e6a16c102684c785de:/src/viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index c22b0adc1..67f0634f2 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -20,6 +20,7 @@
 
 #include "viewproperties.h"
 
+#include "additionalinfoaccessor.h"
 #include "settings/dolphinsettings.h"
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"
@@ -33,10 +34,6 @@
 #include <QFile>
 #include <QFileInfo>
 
-bool ViewProperties::m_nepomukSupport = false;
-
-#define FILE_NAME "/.directory"
-
 ViewProperties::ViewProperties(const KUrl& url) :
     m_changedProps(false),
     m_autoSave(true),
@@ -46,8 +43,10 @@ ViewProperties::ViewProperties(const KUrl& url) :
     cleanUrl.cleanPath();
     m_filepath = cleanUrl.toLocalFile();
 
-    if ((m_filepath.length() < 1) || (!QDir::isAbsolutePath(m_filepath))) {
-        const QString file = destinationDir("global") + FILE_NAME;
+    const QLatin1String fileName("/.directory");
+
+    if ((m_filepath.length() < 1) || !QDir::isAbsolutePath(m_filepath)) {
+        const QString file = destinationDir("global") + fileName;
         m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
         return;
     }
@@ -68,7 +67,7 @@ ViewProperties::ViewProperties(const KUrl& url) :
         m_filepath = destinationDir("remote") + m_filepath;
     }
 
-    const QString file = m_filepath + FILE_NAME;
+    const QString file = m_filepath + fileName;
     m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
 
     const bool useDefaultProps = !useGlobalViewProps &&
@@ -162,15 +161,7 @@ void ViewProperties::setSorting(DolphinView::Sorting sorting)
 
 DolphinView::Sorting ViewProperties::sorting() const
 {
-    // If Nepomuk is not available, return SortByName as fallback if SortByRating
-    // or SortByTags is stored.
-    DolphinView::Sorting sorting = static_cast<DolphinView::Sorting>(m_node->sorting());
-    const bool sortByName = !m_nepomukSupport &&
-                            ((sorting == DolphinView::SortByRating) || (sorting == DolphinView::SortByTags));
-    if (sortByName) {
-        sorting = DolphinView::SortByName;
-    }
-    return sorting;
+    return static_cast<DolphinView::Sorting>(m_node->sorting());
 }
 
 void ViewProperties::setSortOrder(Qt::SortOrder sortOrder)
@@ -199,35 +190,16 @@ bool ViewProperties::sortFoldersFirst() const
     return m_node->sortFoldersFirst();
 }
 
-void ViewProperties::setAdditionalInfo(KFileItemDelegate::InformationList list)
+void ViewProperties::setAdditionalInfo(const KFileItemDelegate::InformationList& list)
 {
-    int info = NoInfo;
+    AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+
+    int infoMask = 0;
     foreach (KFileItemDelegate::Information currentInfo, list) {
-        switch (currentInfo) {
-        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;
-        }
+        infoMask = infoMask | infoAccessor.bitValue(currentInfo);
     }
 
-    const int encodedInfo = encodedAdditionalInfo(info);
+    const int encodedInfo = encodedAdditionalInfo(infoMask);
     if (m_node->additionalInfo() != encodedInfo) {
         m_node->setAdditionalInfo(encodedInfo);
         updateTimeStamp();
@@ -236,29 +208,20 @@ void ViewProperties::setAdditionalInfo(KFileItemDelegate::InformationList list)
 
 KFileItemDelegate::InformationList ViewProperties::additionalInfo() const
 {
-    const int info = decodedAdditionalInfo();
+    KFileItemDelegate::InformationList usedInfos;
 
-    KFileItemDelegate::InformationList list;
-    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);
+    const int decodedInfo = decodedAdditionalInfo();
+
+    AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+    const KFileItemDelegate::InformationList infos = infoAccessor.keys();
+
+    foreach (const KFileItemDelegate::Information info, infos) {
+        if (decodedInfo & infoAccessor.bitValue(info)) {
+            usedInfos.append(info);
+        }
     }
 
-    return list;
+    return usedInfos;
 }
 
 
@@ -270,6 +233,7 @@ void ViewProperties::setDirProperties(const ViewProperties& props)
     setCategorizedSorting(props.categorizedSorting());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());
+    setSortFoldersFirst(props.sortFoldersFirst());
     setAdditionalInfo(props.additionalInfo());
 }
 
@@ -337,10 +301,12 @@ int ViewProperties::decodedAdditionalInfo() const
     switch (viewMode()) {
     case DolphinView::DetailsView:
         decodedInfo = decodedInfo & 0xFF;
-        if (decodedInfo == NoInfo) {
-            // a details view without any additional info makes no sense, hence
+        if (decodedInfo == 0) {
+            // A details view without any additional info makes no sense, hence
             // provide at least a size-info and date-info as fallback
-            decodedInfo = SizeInfo | DateInfo;
+            AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+            decodedInfo = infoAccessor.bitValue(KFileItemDelegate::Size) |
+                          infoAccessor.bitValue(KFileItemDelegate::ModificationTime);
         }
         break;
     case DolphinView::IconsView: