X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bd8b41a13577eb197b721d00303c7056926502bf..5b5a7b8da8cb3ee6bbb9f7450c87fca5de41dc05:/src/viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 7101bed29..485ed4384 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -22,6 +22,7 @@
 
 #include <QDateTime>
 #include <QFile>
+#include <QFileInfo>
 
 #include <kcomponentdata.h>
 #include <klocale.h>
@@ -31,14 +32,14 @@
 
 #include "viewproperties.h"
 #include "dolphinsettings.h"
-#include "generalsettings.h"
+#include "dolphin_generalsettings.h"
 
 #define FILE_NAME "/.directory"
 
 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();
@@ -56,14 +57,12 @@ 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;
     }
 
@@ -163,6 +162,20 @@ Qt::SortOrder ViewProperties::sortOrder() const
     return static_cast<Qt::SortOrder>(m_node->sortOrder());
 }
 
+void ViewProperties::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
+{
+    if (m_node->additionalInfo() != info) {
+        m_node->setAdditionalInfo(info);
+        updateTimeStamp();
+    }
+}
+
+KFileItemDelegate::AdditionalInformation ViewProperties::additionalInfo() const
+{
+    return static_cast<KFileItemDelegate::AdditionalInformation>(m_node->additionalInfo());
+}
+
+
 void ViewProperties::setDirProperties(const ViewProperties& props)
 {
     setViewMode(props.viewMode());
@@ -170,6 +183,7 @@ void ViewProperties::setDirProperties(const ViewProperties& props)
     setShowHiddenFiles(props.showHiddenFiles());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());
+    setAdditionalInfo(props.additionalInfo());
 }
 
 void ViewProperties::setAutoSaveEnabled(bool autoSave)
@@ -208,13 +222,3 @@ QString ViewProperties::destinationDir(const QString& subDir) const
     basePath.append("/view_properties/").append(subDir);
     return KStandardDirs::locateLocal("data", basePath);
 }
-
-ViewProperties::ViewProperties(const ViewProperties& /*props*/)
-{
-    assert(false);
-}
-
-ViewProperties& ViewProperties::operator = (const ViewProperties& /*props*/)
-{
-    assert(false);
-}