X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5cf5a8ea4bf482b5a78d9948a6cdaea44ad9c627..78d4fffee8694281190ceab84f47bd2f2dfc8235:/src/viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 3a2bb1fc1..3e08358f7 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Peter Penz (<peter.penz@gmx.at>)                *
- *   Copyright (C) 2006 by Aaron J. Seigo (<aseigo@kde.org>)               *
+ *   Copyright (C) 2006-2010 by Peter Penz <peter.penz@gmx.at>             *
+ *   Copyright (C) 2006 by Aaron J. Seigo <aseigo@kde.org>                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -20,7 +20,7 @@
 
 #include "viewproperties.h"
 
-#include "settings/dolphinsettings.h"
+#include "additionalinfoaccessor.h"
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"
 
@@ -33,40 +33,31 @@
 #include <QFile>
 #include <QFileInfo>
 
-#define FILE_NAME "/.directory"
+#include "settings/dolphinsettings.h"
 
 ViewProperties::ViewProperties(const KUrl& url) :
     m_changedProps(false),
     m_autoSave(true),
     m_node(0)
 {
-    KUrl cleanUrl(url);
-    cleanUrl.cleanPath();
-    m_filepath = cleanUrl.toLocalFile();
-
-    if ((m_filepath.length() < 1) || (!QDir::isAbsolutePath(m_filepath))) {
-        const QString file = destinationDir("global") + FILE_NAME;
-        m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
-        return;
-    }
-
-    // We try and save it to a file in the directory being viewed.
+    // We try and save it to the file .directory in the directory being viewed.
     // If the directory is not writable by the user or the directory is not local,
     // we store the properties information in a local file.
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     const bool useGlobalViewProps = settings->globalViewProps();
     if (useGlobalViewProps) {
-        m_filepath = destinationDir("global");
-    } else if (cleanUrl.isLocalFile()) {
-        const QFileInfo info(m_filepath);
+        m_filePath = destinationDir("global");
+    } else if (url.isLocalFile()) {
+        m_filePath = url.toLocalFile();
+        const QFileInfo info(m_filePath);
         if (!info.isWritable()) {
-            m_filepath = destinationDir("local") + m_filepath;
+            m_filePath = destinationDir("local") + m_filePath;
         }
     } else {
-        m_filepath = destinationDir("remote") + m_filepath;
+        m_filePath = destinationDir("remote") + m_filePath;
     }
 
-    const QString file = m_filepath + FILE_NAME;
+    const QString file = m_filePath + QDir::separator() + QLatin1String(".directory");
     m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
 
     const bool useDefaultProps = !useGlobalViewProps &&
@@ -122,7 +113,6 @@ bool ViewProperties::showPreview() const
     return m_node->showPreview();
 }
 
-
 void ViewProperties::setShowHiddenFiles(bool show)
 {
     if (m_node->showHiddenFiles() != show) {
@@ -144,7 +134,6 @@ bool ViewProperties::categorizedSorting() const
     return m_node->categorizedSorting();
 }
 
-
 bool ViewProperties::showHiddenFiles() const
 {
     return m_node->showHiddenFiles();
@@ -189,35 +178,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();
@@ -226,29 +196,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;
 }
 
 
@@ -282,7 +243,7 @@ void ViewProperties::updateTimeStamp()
 
 void ViewProperties::save()
 {
-    KStandardDirs::makeDir(m_filepath);
+    KStandardDirs::makeDir(m_filePath);
     m_node->writeConfig();
     m_changedProps = false;
 }
@@ -328,10 +289,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: