X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/50a7b6fd45d88e61b06961dc9a4e564a13330acc..dbc8874c00c35aaefacdd03f8aef9e4ac4e2be01:/src/viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 835be2aad..8dc5b8ad6 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -29,10 +29,16 @@
 #include <kstandarddirs.h>
 #include <kurl.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) :
@@ -40,6 +46,14 @@ ViewProperties::ViewProperties(const KUrl& url) :
     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();
@@ -159,7 +173,15 @@ void ViewProperties::setSorting(DolphinView::Sorting sorting)
 
 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)
@@ -175,17 +197,25 @@ Qt::SortOrder ViewProperties::sortOrder() const
     return static_cast<Qt::SortOrder>(m_node->sortOrder());
 }
 
-void ViewProperties::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
+void ViewProperties::setAdditionalInfo(KFileItemDelegate::InformationList list)
 {
+    KFileItemDelegate::Information info = list.isEmpty() ?
+                            KFileItemDelegate::NoInformation : list.first();
+
     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());
+    KFileItemDelegate::Information info = static_cast<KFileItemDelegate::Information>(m_node->additionalInfo());
+
+    if (info != KFileItemDelegate::NoInformation)
+        return KFileItemDelegate::InformationList() << info;
+    else
+        return KFileItemDelegate::InformationList();
 }