Fix issue that the columns "Link Destination" and "Path" are shown outside the visibl...

[dolphin.git] / src / viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 45aadba23902dda48e8317a8f757764d4621b02e..3e08358f7308cd21673ed8a659b3cc04fca8856e 100644 (file)
--- 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  *
  *                                                                         *
  *   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  *


@@ -18,56 +18,46 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 

-#include <assert.h>
+#include "viewproperties.h"

 
 

-#include <QDateTime>
-#include <QFile>
+#include "additionalinfoaccessor.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 <klocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>

-#include <kcomponentdata.h>

 
 

-#include "viewproperties.h"
-#include "dolphinsettings.h"
-#include "dolphin_generalsettings.h"
+#include <QDate>
+#include <QFile>
+#include <QFileInfo>

 
 

-#define FILE_NAME "/.directory"
+#include "settings/dolphinsettings.h"

 
 ViewProperties::ViewProperties(const KUrl& url) :
 
 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();
-
-    if ((m_filepath.length() < 1) || (m_filepath.at(0) != QChar('/'))) {
-        m_node = new ViewPropertySettings();
-        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) {
     // 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()) {
         if (!info.isWritable()) {

-            m_filepath = destinationDir("local") + m_filepath;
+            m_filePath = destinationDir("local") + m_filePath;

         }
         }

-    }
-    else {
-        m_filepath = destinationDir("remote") + m_filepath;
+    } else {
+        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 &&
     m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
 
     const bool useDefaultProps = !useGlobalViewProps &&


@@ -123,7 +113,6 @@ bool ViewProperties::showPreview() const
     return m_node->showPreview();
 }
 
     return m_node->showPreview();
 }
 

-

 void ViewProperties::setShowHiddenFiles(bool show)
 {
     if (m_node->showHiddenFiles() != show) {
 void ViewProperties::setShowHiddenFiles(bool show)
 {
     if (m_node->showHiddenFiles() != show) {


@@ -132,6 +121,19 @@ 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();
 bool ViewProperties::showHiddenFiles() const
 {
     return m_node->showHiddenFiles();


@@ -163,13 +165,64 @@ Qt::SortOrder ViewProperties::sortOrder() const
     return static_cast<Qt::SortOrder>(m_node->sortOrder());
 }
 
     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());
 void ViewProperties::setDirProperties(const ViewProperties& props)
 {
     setViewMode(props.viewMode());
     setShowPreview(props.showPreview());
     setShowHiddenFiles(props.showHiddenFiles());

+    setCategorizedSorting(props.categorizedSorting());

     setSorting(props.sorting());
     setSortOrder(props.sortOrder());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());

+    setSortFoldersFirst(props.sortFoldersFirst());
+    setAdditionalInfo(props.additionalInfo());

 }
 
 void ViewProperties::setAutoSaveEnabled(bool autoSave)
 }
 
 void ViewProperties::setAutoSaveEnabled(bool autoSave)


@@ -190,7 +243,7 @@ void ViewProperties::updateTimeStamp()
 
 void ViewProperties::save()
 {
 
 void ViewProperties::save()
 {

-    KStandardDirs::makeDir(m_filepath);
+    KStandardDirs::makeDir(m_filePath);

     m_node->writeConfig();
     m_changedProps = false;
 }
     m_node->writeConfig();
     m_changedProps = false;
 }


@@ -209,12 +262,49 @@ QString ViewProperties::destinationDir(const QString& subDir) const
     return KStandardDirs::locateLocal("data", basePath);
 }
 
     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;

 }
 }