Merge branch 'Applications/19.08'

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

diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index 4444f64e76f4efc7747f21df371d760fdd285184..e5f3a82c47172f548263655c384b43ec6689aa89 100644 (file)
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -22,11 +22,12 @@
 
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"
-
 #include "dolphindebug.h"
 
 #include <QCryptographicHash>
 
+#include <KFileItem>
+
 namespace {
     const int AdditionalInfoViewPropertiesVersion = 1;
     const int NameRolePropertiesVersion = 2;
@@ -50,33 +51,49 @@ ViewProperties::ViewProperties(const QUrl& url) :
     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 store the properties information in a local file.
     if (useGlobalViewProps) {
         m_filePath = destinationDir(QStringLiteral("global"));
-    } else if (url.scheme().contains(QStringLiteral("search"))) {
+    } else if (url.scheme().contains(QLatin1String("search"))) {
         m_filePath = destinationDir(QStringLiteral("search/")) + directoryHashForUrl(url);
         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();
-        const QFileInfo dirInfo(m_filePath);
-        const QFileInfo fileInfo(m_filePath + QDir::separator() + ViewPropertiesFileName);
-        // Check if the directory is writable and check if the ".directory" file exists and
-        // is read- and writable.
-        if (!dirInfo.isWritable()
-                || (fileInfo.exists() && !(fileInfo.isReadable() && fileInfo.isWritable()))
-                || !isPartOfHome(m_filePath)) {
-#ifdef Q_OS_WIN
-                       // m_filePath probably begins with C:/ - the colon is not a valid character for paths though
-                       m_filePath =  QDir::separator() + m_filePath.remove(QLatin1Char(':'));
-#endif
+
+        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);
+            useDestinationDir = !dirInfo.isWritable() || (dirInfo.size() > 0 && fileInfo.exists() && !(fileInfo.isReadable() && fileInfo.isWritable()));
+        }
+
+        if (useDestinationDir) {
+    #ifdef Q_OS_WIN
+            // m_filePath probably begins with C:/ - the colon is not a valid character for paths though
+            m_filePath =  QDir::separator() + m_filePath.remove(QLatin1Char(':'));
+    #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;
     }
@@ -93,6 +110,17 @@ ViewProperties::ViewProperties(const QUrl& url) :
         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 
@@ -282,7 +310,7 @@ QList<QByteArray> ViewProperties::visibleRoles() const
     //
     // For the details-view a special case must be respected: Per default the size
     // and date should be shown without creating a .directory file. Only if
-    // the user explictly has modified the properties of the details view (marked
+    // the user explicitly has modified the properties of the details view (marked
     // by "CustomizedDetails"), also a details-view with no additional information
     // is accepted.