Merge branch 'Applications/19.08'

[dolphin.git] / src / views / viewproperties.cpp

diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index e056e25e3b5d81da541b7b20b8c71698f84b1841..48ed654715ca55ccdcbaa697eebdc5d6ba49edcd 100644 (file)
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -26,6 +26,8 @@
 
 #include <QCryptographicHash>
 
 
 #include <QCryptographicHash>
 

+#include <KFileItem>
+

 namespace {
     const int AdditionalInfoViewPropertiesVersion = 1;
     const int NameRolePropertiesVersion = 2;
 namespace {
     const int AdditionalInfoViewPropertiesVersion = 1;
     const int NameRolePropertiesVersion = 2;


@@ -49,6 +51,8 @@ ViewProperties::ViewProperties(const QUrl& url) :
     GeneralSettings* settings = GeneralSettings::self();
     const bool useGlobalViewProps = settings->globalViewProps() || url.isEmpty();
     bool useDetailsViewWithPath = false;
     GeneralSettings* settings = GeneralSettings::self();
     const bool useGlobalViewProps = settings->globalViewProps() || url.isEmpty();
     bool useDetailsViewWithPath = false;

+    bool useRecentDocumentsView = false;
+    bool useDownloadsView = false;

 
     // 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 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,


@@ -61,10 +65,18 @@ ViewProperties::ViewProperties(const QUrl& url) :
     } else if (url.scheme() == QLatin1String("trash")) {
         m_filePath = destinationDir(QStringLiteral("trash"));
         useDetailsViewWithPath = true;
     } else if (url.scheme() == QLatin1String("trash")) {
         m_filePath = destinationDir(QStringLiteral("trash"));
         useDetailsViewWithPath = true;

+    } else if (url.scheme() == QLatin1String("recentdocuments")) {
+        m_filePath = destinationDir(QStringLiteral("recentdocuments"));
+        useRecentDocumentsView = true;

     } else if (url.isLocalFile()) {
         m_filePath = url.toLocalFile();
 
         bool useDestinationDir = !isPartOfHome(m_filePath);
     } else if (url.isLocalFile()) {
         m_filePath = url.toLocalFile();
 
         bool useDestinationDir = !isPartOfHome(m_filePath);

+        if (!useDestinationDir) {
+            const KFileItem fileItem(url);
+            useDestinationDir = fileItem.isSlow();
+        }
+

         if (!useDestinationDir) {
             const QFileInfo dirInfo(m_filePath);
             const QFileInfo fileInfo(m_filePath + QDir::separator() + ViewPropertiesFileName);
         if (!useDestinationDir) {
             const QFileInfo dirInfo(m_filePath);
             const QFileInfo fileInfo(m_filePath + QDir::separator() + ViewPropertiesFileName);


@@ -78,6 +90,10 @@ ViewProperties::ViewProperties(const QUrl& url) :
     #endif
             m_filePath = destinationDir(QStringLiteral("local")) + m_filePath;
         }
     #endif
             m_filePath = destinationDir(QStringLiteral("local")) + m_filePath;
         }

+
+        if (m_filePath == QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)) {
+            useDownloadsView = true;
+        }

     } else {
         m_filePath = destinationDir(QStringLiteral("remote")) + m_filePath;
     }
     } else {
         m_filePath = destinationDir(QStringLiteral("remote")) + m_filePath;
     }


@@ -94,6 +110,17 @@ ViewProperties::ViewProperties(const QUrl& url) :
         if (useDetailsViewWithPath) {
             setViewMode(DolphinView::DetailsView);
             setVisibleRoles({"path"});
         if (useDetailsViewWithPath) {
             setViewMode(DolphinView::DetailsView);
             setVisibleRoles({"path"});

+        } else if (useRecentDocumentsView || useDownloadsView) {
+            setSortRole(QByteArrayLiteral("modificationtime"));
+            setSortOrder(Qt::DescendingOrder);
+
+            if (useRecentDocumentsView) {
+                setViewMode(DolphinView::DetailsView);
+                setVisibleRoles({QByteArrayLiteral("path")});
+            } else if (useDownloadsView) {
+                setSortFoldersFirst(false);
+                setGroupedSorting(true);
+            }

         } else {
             // The global view-properties act as default for directories without
             // any view-property configuration. Constructing a ViewProperties 
         } else {
             // The global view-properties act as default for directories without
             // any view-property configuration. Constructing a ViewProperties