there's no need having 2-liners inside their own method when this method is only...

[dolphin.git] / src / viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index d3fe7224627abaeb6f2fb9a3476c014bd2d4e1a8..30346a862ab82ab0817ff89b7a8595df47e21ea3 100644 (file)
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -18,28 +18,42 @@
  *   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 "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 <klocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>

-#include <kcomponentdata.h>

 
 

-#include "viewproperties.h"
-#include "dolphinsettings.h"
-#include "dolphin_generalsettings.h"
+#ifdef HAVE_NEPOMUK
+    #include <nepomuk/resourcemanager.h>
+#endif
+
+#include <QDate>
+#include <QFile>
+#include <QFileInfo>
+
+bool ViewProperties::m_nepomukSupport = false;

 
 #define FILE_NAME "/.directory"
 
 ViewProperties::ViewProperties(const KUrl& url) :
 
 #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)

 {
 {

+#ifdef HAVE_NEPOMUK
+    static bool checkedNepomukSupport = false;
+    if (!checkedNepomukSupport) {
+        m_nepomukSupport = !Nepomuk::ResourceManager::instance()->init();
+        checkedNepomukSupport = true;
+    }
+#endif
+

     KUrl cleanUrl(url);
     cleanUrl.cleanPath();
     m_filepath = cleanUrl.path();
     KUrl cleanUrl(url);
     cleanUrl.cleanPath();
     m_filepath = cleanUrl.path();


@@ -56,14 +70,12 @@ ViewProperties::ViewProperties(const KUrl& url) :
     const bool useGlobalViewProps = settings->globalViewProps();
     if (useGlobalViewProps) {
         m_filepath = destinationDir("global");
     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;
         }
         const QFileInfo info(m_filepath);
         if (!info.isWritable()) {
             m_filepath = destinationDir("local") + m_filepath;
         }

-    }
-    else {
+    } else {

         m_filepath = destinationDir("remote") + m_filepath;
     }
 
         m_filepath = destinationDir("remote") + m_filepath;
     }
 


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


@@ -147,7 +173,15 @@ void ViewProperties::setSorting(DolphinView::Sorting sorting)
 
 DolphinView::Sorting ViewProperties::sorting() const
 {
 
 DolphinView::Sorting ViewProperties::sorting() const
 {

-    return static_cast<DolphinView::Sorting>(m_node->sorting());
+    // 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;

 }
 
 void ViewProperties::setSortOrder(Qt::SortOrder sortOrder)
 }
 
 void ViewProperties::setSortOrder(Qt::SortOrder sortOrder)


@@ -163,17 +197,65 @@ Qt::SortOrder ViewProperties::sortOrder() const
     return static_cast<Qt::SortOrder>(m_node->sortOrder());
 }
 
     return static_cast<Qt::SortOrder>(m_node->sortOrder());
 }
 

-void ViewProperties::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
+void ViewProperties::setAdditionalInfo(KFileItemDelegate::InformationList list)

 {
 {

+    int info = NoInfo;
+    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;
+        }
+    }
+

     if (m_node->additionalInfo() != info) {
         m_node->setAdditionalInfo(info);
         updateTimeStamp();
     }
 }
 
     if (m_node->additionalInfo() != info) {
         m_node->setAdditionalInfo(info);
         updateTimeStamp();
     }
 }
 

-KFileItemDelegate::AdditionalInformation ViewProperties::additionalInfo() const
+KFileItemDelegate::InformationList ViewProperties::additionalInfo() const

 {
 {

-    return static_cast<KFileItemDelegate::AdditionalInformation>(m_node->additionalInfo());
+    const int info = m_node->additionalInfo();
+
+    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);
+    }
+
+    return list;

 }
 
 
 }
 
 


@@ -182,6 +264,7 @@ void ViewProperties::setDirProperties(const ViewProperties& props)
     setViewMode(props.viewMode());
     setShowPreview(props.showPreview());
     setShowHiddenFiles(props.showHiddenFiles());
     setViewMode(props.viewMode());
     setShowPreview(props.showPreview());
     setShowHiddenFiles(props.showHiddenFiles());

+    setCategorizedSorting(props.categorizedSorting());

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