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

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 45aadba23..67f0634f2 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -18,34 +18,36 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <assert.h>
+#include "viewproperties.h"
 
-#include <QDateTime>
-#include <QFile>
+#include "additionalinfoaccessor.h"
+#include "settings/dolphinsettings.h"
+#include "dolphin_directoryviewpropertysettings.h"
+#include "dolphin_generalsettings.h"
 
 #include <kcomponentdata.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kcomponentdata.h>
-
-#include "viewproperties.h"
-#include "dolphinsettings.h"
-#include "dolphin_generalsettings.h"
 
-#define FILE_NAME "/.directory"
+#include <QDate>
+#include <QFile>
+#include <QFileInfo>
 
 ViewProperties::ViewProperties(const KUrl& url) :
-      m_changedProps(false),
-      m_autoSave(true),
-      m_node(0)
+    m_changedProps(false),
+    m_autoSave(true),
+    m_node(0)
 {
     KUrl cleanUrl(url);
     cleanUrl.cleanPath();
-    m_filepath = cleanUrl.path();
+    m_filepath = cleanUrl.toLocalFile();
+
+    const QLatin1String fileName("/.directory");
 
-    if ((m_filepath.length() < 1) || (m_filepath.at(0) != QChar('/'))) {
-        m_node = new ViewPropertySettings();
+    if ((m_filepath.length() < 1) || !QDir::isAbsolutePath(m_filepath)) {
+        const QString file = destinationDir("global") + fileName;
+        m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
         return;
     }
 
@@ -56,18 +58,16 @@ ViewProperties::ViewProperties(const KUrl& url) :
     const bool useGlobalViewProps = settings->globalViewProps();
     if (useGlobalViewProps) {
         m_filepath = destinationDir("global");
-    }
-    else if (cleanUrl.isLocalFile()) {
+    } else if (cleanUrl.isLocalFile()) {
         const QFileInfo info(m_filepath);
         if (!info.isWritable()) {
             m_filepath = destinationDir("local") + m_filepath;
         }
-    }
-    else {
+    } else {
         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 &&
@@ -132,6 +132,20 @@ void ViewProperties::setShowHiddenFiles(bool show)
     }
 }
 
+void ViewProperties::setCategorizedSorting(bool categorized)
+{
+    if (m_node->categorizedSorting() != categorized) {
+        m_node->setCategorizedSorting(categorized);
+        updateTimeStamp();
+    }
+}
+
+bool ViewProperties::categorizedSorting() const
+{
+    return m_node->categorizedSorting();
+}
+
+
 bool ViewProperties::showHiddenFiles() const
 {
     return m_node->showHiddenFiles();
@@ -163,13 +177,64 @@ Qt::SortOrder ViewProperties::sortOrder() const
     return static_cast<Qt::SortOrder>(m_node->sortOrder());
 }
 
+void ViewProperties::setSortFoldersFirst(bool foldersFirst)
+{
+    if (m_node->sortFoldersFirst() != foldersFirst) {
+        m_node->setSortFoldersFirst(foldersFirst);
+        updateTimeStamp();
+    }
+}
+
+bool ViewProperties::sortFoldersFirst() const
+{
+    return m_node->sortFoldersFirst();
+}
+
+void ViewProperties::setAdditionalInfo(const KFileItemDelegate::InformationList& list)
+{
+    AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+
+    int infoMask = 0;
+    foreach (KFileItemDelegate::Information currentInfo, list) {
+        infoMask = infoMask | infoAccessor.bitValue(currentInfo);
+    }
+
+    const int encodedInfo = encodedAdditionalInfo(infoMask);
+    if (m_node->additionalInfo() != encodedInfo) {
+        m_node->setAdditionalInfo(encodedInfo);
+        updateTimeStamp();
+    }
+}
+
+KFileItemDelegate::InformationList ViewProperties::additionalInfo() const
+{
+    KFileItemDelegate::InformationList usedInfos;
+
+    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 usedInfos;
+}
+
+
 void ViewProperties::setDirProperties(const ViewProperties& props)
 {
     setViewMode(props.viewMode());
     setShowPreview(props.showPreview());
     setShowHiddenFiles(props.showHiddenFiles());
+    setCategorizedSorting(props.categorizedSorting());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());
+    setSortFoldersFirst(props.sortFoldersFirst());
+    setAdditionalInfo(props.additionalInfo());
 }
 
 void ViewProperties::setAutoSaveEnabled(bool autoSave)
@@ -209,12 +274,49 @@ QString ViewProperties::destinationDir(const QString& subDir) const
     return KStandardDirs::locateLocal("data", basePath);
 }
 
-ViewProperties::ViewProperties(const ViewProperties& /*props*/)
+int ViewProperties::encodedAdditionalInfo(int info) const
 {
-    assert(false);
+    int encodedInfo = m_node->additionalInfo();
+
+    switch (viewMode()) {
+    case DolphinView::DetailsView:
+        encodedInfo = (encodedInfo & 0xFFFF00) | info;
+        break;
+    case DolphinView::IconsView:
+        encodedInfo = (encodedInfo & 0xFF00FF) | (info << 8);
+        break;
+    case DolphinView::ColumnView:
+        encodedInfo = (encodedInfo & 0x00FFFF) | (info << 16);
+        break;
+    default: break;
+    }
+
+    return encodedInfo;
 }
 
-ViewProperties& ViewProperties::operator = (const ViewProperties& /*props*/)
+int ViewProperties::decodedAdditionalInfo() const
 {
-    assert(false);
+    int decodedInfo = m_node->additionalInfo();
+
+    switch (viewMode()) {
+    case DolphinView::DetailsView:
+        decodedInfo = decodedInfo & 0xFF;
+        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
+            AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+            decodedInfo = infoAccessor.bitValue(KFileItemDelegate::Size) |
+                          infoAccessor.bitValue(KFileItemDelegate::ModificationTime);
+        }
+        break;
+    case DolphinView::IconsView:
+        decodedInfo = (decodedInfo >> 8) & 0xFF;
+        break;
+    case DolphinView::ColumnView:
+        decodedInfo = (decodedInfo >> 16) & 0xFF;
+        break;
+    default: break;
+    }
+
+    return decodedInfo;
 }