Merge branch 'master' of git.kde.org:dolphin

11 files changed, 132 insertions, 159 deletions

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 4105628ee..9728e58c3 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -29,6 +29,7 @@
 #include <QGraphicsSceneDragDropEvent>
 #include <QTimer>
 #include <QScrollBar>
+#include <QPixmapCache>
 #include <QPointer>
 #include <QMenu>
 #include <QVBoxLayout>
@@ -211,19 +212,7 @@ void DolphinView::setActive(bool active)
 
     m_active = active;
 
-    QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
-    if (!active) {
-        color.setAlpha(150);
-    }
-
-    QWidget* viewport = m_container->viewport();
-    if (viewport) {
-        QPalette palette;
-        palette.setColor(viewport->backgroundRole(), color);
-        viewport->setPalette(palette);
-    }
-
-    update();
+    updatePalette();
 
     if (active) {
         m_container->setFocus();
@@ -721,9 +710,31 @@ void DolphinView::stopLoading()
     m_model->cancelDirectoryLoading();
 }
 
+void DolphinView::updatePalette()
+{
+    QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
+    if (!m_active) {
+        color.setAlpha(150);
+    }
+
+    QWidget* viewport = m_container->viewport();
+    if (viewport) {
+        QPalette palette;
+        palette.setColor(viewport->backgroundRole(), color);
+        viewport->setPalette(palette);
+    }
+
+    update();
+}
+
 bool DolphinView::eventFilter(QObject* watched, QEvent* event)
 {
     switch (event->type()) {
+    case QEvent::PaletteChange:
+        updatePalette();
+        QPixmapCache::clear();
+        break;
+
     case QEvent::KeyPress:
         if (GeneralSettings::useTabForSwitchingSplitView()) {
             QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
@@ -1012,7 +1023,7 @@ void DolphinView::slotItemHovered(int index)
         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);
 
-        m_toolTipManager->showToolTip(item, itemRect);
+        m_toolTipManager->showToolTip(item, itemRect, nativeParentWidget()->windowHandle());
     }
 
     emit requestItemInfo(item);
@@ -1525,7 +1536,7 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con
             KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
             KJobWidgets::setWindow(job, this);
             KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);
-            job->ui()->setAutoErrorHandlingEnabled(true);
+            job->uiDelegate()->setAutoErrorHandlingEnabled(true);
 
             if (!newNameExistsAlready) {
                 // Only connect the result signal if there is no item with the new name
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 0b0d8196d..fbe3a6376 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -762,6 +762,8 @@ private:
     QUrl viewPropertiesUrl() const;
 
 private:
+    void updatePalette();
+
     bool m_active;
     bool m_tabsForFiles;
     bool m_assureVisibleCurrentIndex;
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 858f9299b..273bcdd76 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -37,6 +37,7 @@
 #include <KSelectAction>
 #include <KToggleAction>
 #include <KPropertiesDialog>
+#include <KProtocolManager>
 #include <QIcon>
 
 #include "dolphindebug.h"
@@ -481,12 +482,19 @@ void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown)
     QAction* showHiddenFilesAction = m_actionCollection->action(QStringLiteral("show_hidden_files"));
     showHiddenFilesAction->setChecked(shown);
 
+    // #374508: don't overwrite custom icons.
+    const QString iconName = showHiddenFilesAction->icon().name();
+    if (!iconName.isEmpty() && iconName != QLatin1String("visibility") && iconName != QLatin1String("hint")) {
+        return;
+    }
+
     showHiddenFilesAction->setIcon(QIcon::fromTheme(shown ? QStringLiteral("visibility") : QStringLiteral("hint")));
 }
 
 void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable)
 {
-    m_actionCollection->action(QStringLiteral("create_dir"))->setEnabled(isFolderWritable);
+    m_actionCollection->action(QStringLiteral("create_dir"))->setEnabled(isFolderWritable &&
+                                                                         KProtocolManager::supportsMakeDir(currentView()->url()));
 }
 
 KToggleAction* DolphinViewActionHandler::iconsModeAction()
diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index a514ede1e..df4827b3a 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -159,10 +159,10 @@ void RenameDialog::renameItem(const KFileItem &item, const QString& newName)
         widget = this;
     }
 
-    KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
+    KIO::Job * job = KIO::moveAs(oldUrl, newUrl, KIO::HideProgressInfo);
     KJobWidgets::setWindow(job, widget);
     KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);
-    job->ui()->setAutoErrorHandlingEnabled(true);
+    job->uiDelegate()->setAutoErrorHandlingEnabled(true);
 }
 
 void RenameDialog::slotAccepted()
diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp
index 0d58717d4..755636c6c 100644
--- a/src/views/tooltips/filemetadatatooltip.cpp
+++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp
@@ -19,12 +19,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "filemetadatatooltip.h"
+#include "dolphinfilemetadatawidget.h"
 
 #include <KColorScheme>
 #include <KSeparator>
-// For the blurred tooltip background
-#include <KWindowEffects>
 #include <KStringHandler>
 #include <QTextDocument>
 
@@ -41,15 +39,12 @@
 #include <Baloo/FileMetaDataWidget>
 #endif
 
-FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
+DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
     QWidget(parent),
     m_preview(0),
     m_name(0),
     m_fileMetaDataWidget(0)
 {
-    setAttribute(Qt::WA_TranslucentBackground);
-    setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint);
-
     // Create widget for file preview
     m_preview = new QLabel(this);
     m_preview->setAlignment(Qt::AlignTop);
@@ -71,11 +66,11 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
 #ifndef HAVE_BALOO
     m_fileMetaDataWidget = new KFileMetaDataWidget(this);
     connect(m_fileMetaDataWidget, &KFileMetaDataWidget::metaDataRequestFinished,
-            this, &FileMetaDataToolTip::metaDataRequestFinished);
+            this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
 #else
     m_fileMetaDataWidget = new Baloo::FileMetaDataWidget(this);
     connect(m_fileMetaDataWidget, &Baloo::FileMetaDataWidget::metaDataRequestFinished,
-            this, &FileMetaDataToolTip::metaDataRequestFinished);
+            this, &DolphinFileMetaDataWidget::metaDataRequestFinished);
 #endif
     m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
     m_fileMetaDataWidget->setReadOnly(true);
@@ -92,22 +87,22 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
     // (see bug #241608)
     textLayout->addStretch();
 
-    QHBoxLayout* tipLayout = new QHBoxLayout(this);
-    tipLayout->addWidget(m_preview);
-    tipLayout->addSpacing(tipLayout->margin());
-    tipLayout->addLayout(textLayout);
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->addWidget(m_preview);
+    layout->addSpacing(layout->margin());
+    layout->addLayout(textLayout);
 }
 
-FileMetaDataToolTip::~FileMetaDataToolTip()
+DolphinFileMetaDataWidget::~DolphinFileMetaDataWidget()
 {
 }
 
-void FileMetaDataToolTip::setPreview(const QPixmap& pixmap)
+void DolphinFileMetaDataWidget::setPreview(const QPixmap& pixmap)
 {
     m_preview->setPixmap(pixmap);
 }
 
-QPixmap FileMetaDataToolTip::preview() const
+QPixmap DolphinFileMetaDataWidget::preview() const
 {
     if (m_preview->pixmap()) {
         return *m_preview->pixmap();
@@ -115,7 +110,7 @@ QPixmap FileMetaDataToolTip::preview() const
     return QPixmap();
 }
 
-void FileMetaDataToolTip::setName(const QString& name)
+void DolphinFileMetaDataWidget::setName(const QString& name)
 {
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
@@ -146,34 +141,18 @@ void FileMetaDataToolTip::setName(const QString& name)
     m_name->setText(wrappedText);
 }
 
-QString FileMetaDataToolTip::name() const
+QString DolphinFileMetaDataWidget::name() const
 {
     return m_name->text();
 }
 
-void FileMetaDataToolTip::setItems(const KFileItemList& items)
+void DolphinFileMetaDataWidget::setItems(const KFileItemList& items)
 {
     m_fileMetaDataWidget->setItems(items);
 }
 
-KFileItemList FileMetaDataToolTip::items() const
+KFileItemList DolphinFileMetaDataWidget::items() const
 {
     return m_fileMetaDataWidget->items();
 }
 
-void FileMetaDataToolTip::paintEvent(QPaintEvent* event)
-{
-    QStylePainter painter(this);
-    QStyleOptionFrame option;
-    option.init(this);
-    painter.drawPrimitive(QStyle::PE_PanelTipLabel, option);
-    painter.end();
-
-    QWidget::paintEvent(event);
-}
-
-void FileMetaDataToolTip::showEvent(QShowEvent *)
-{
-    KWindowEffects::enableBlurBehind(winId(), true, mask());
-}
-
diff --git a/src/views/tooltips/filemetadatatooltip.h b/src/views/tooltips/dolphinfilemetadatawidget.h
index 379b025c8..cf796250d 100644
--- a/src/views/tooltips/filemetadatatooltip.h
+++ b/src/views/tooltips/dolphinfilemetadatawidget.h
@@ -19,8 +19,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#ifndef FILEMETADATATOOLTIP_H
-#define FILEMETADATATOOLTIP_H
+#ifndef DOLPHINFILEMETADATAWIDGET_H
+#define DOLPHINFILEMETADATAWIDGET_H
 
 #include <QWidget>
 #include "config-baloo.h"
@@ -37,16 +37,16 @@ namespace Baloo {
 #endif
 
 /**
- * @brief Tooltip, that shows the meta information and a preview of one
- *        or more files.
+ * @brief Widget that shows the meta information and a preview of one
+ *        or more files inside a KToolTipWidget.
  */
-class FileMetaDataToolTip : public QWidget
+class DolphinFileMetaDataWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    FileMetaDataToolTip(QWidget* parent = 0);
-    virtual ~FileMetaDataToolTip();
+    DolphinFileMetaDataWidget(QWidget* parent = 0);
+    virtual ~DolphinFileMetaDataWidget();
 
     void setPreview(const QPixmap& pixmap);
     QPixmap preview() const;
@@ -65,14 +65,10 @@ public:
 signals:
     /**
      * Is emitted after the meta data has been received for the items
-     * set by FileMetaDataToolTip::setItems().
+     * set by DolphinFileMetaDataWidget::setItems().
      */
     void metaDataRequestFinished(const KFileItemList& items);
 
-protected:
-    virtual void paintEvent(QPaintEvent* event) Q_DECL_OVERRIDE;
-    virtual void showEvent(QShowEvent *) Q_DECL_OVERRIDE;
-
 private:
     QLabel* m_preview;
     QLabel* m_name;
diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
index 0636df795..4a9f91359 100644
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -19,23 +19,27 @@
 
 #include "tooltipmanager.h"
 
-#include "filemetadatatooltip.h"
+#include "dolphinfilemetadatawidget.h"
 #include <QIcon>
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
 #include <KJobWidgets>
+#include <KToolTipWidget>
 
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QLayout>
 #include <QStyle>
 #include <QTimer>
+#include <QWindow>
 
 ToolTipManager::ToolTipManager(QWidget* parent) :
     QObject(parent),
     m_showToolTipTimer(0),
     m_contentRetrievalTimer(0),
-    m_fileMetaDataToolTip(0),
+    m_transientParent(0),
+    m_fileMetaDataWidget(0),
+    m_tooltipWidget(new KToolTipWidget()),
     m_toolTipRequested(false),
     m_metaDataRequested(false),
     m_appliedWaitCursor(false),
@@ -62,11 +66,9 @@ ToolTipManager::ToolTipManager(QWidget* parent) :
 
 ToolTipManager::~ToolTipManager()
 {
-    delete m_fileMetaDataToolTip;
-    m_fileMetaDataToolTip = 0;
 }
 
-void ToolTipManager::showToolTip(const KFileItem& item, const QRectF& itemRect)
+void ToolTipManager::showToolTip(const KFileItem& item, const QRectF& itemRect, QWindow *transientParent)
 {
     hideToolTip();
 
@@ -75,12 +77,14 @@ void ToolTipManager::showToolTip(const KFileItem& item, const QRectF& itemRect)
     m_itemRect.adjust(-m_margin, -m_margin, m_margin, m_margin);
     m_item = item;
 
+    m_transientParent = transientParent;
+
     // Only start the retrieving of the content, when the mouse has been over this
     // item for 200 milliseconds. This prevents a lot of useless preview jobs and
     // meta data retrieval, when passing rapidly over a lot of items.
-    Q_ASSERT(!m_fileMetaDataToolTip);
-    m_fileMetaDataToolTip = new FileMetaDataToolTip();
-    connect(m_fileMetaDataToolTip, &FileMetaDataToolTip::metaDataRequestFinished,
+    delete m_fileMetaDataWidget;
+    m_fileMetaDataWidget = new DolphinFileMetaDataWidget();
+    connect(m_fileMetaDataWidget, &DolphinFileMetaDataWidget::metaDataRequestFinished,
             this, &ToolTipManager::slotMetaDataRequestFinished);
 
     m_contentRetrievalTimer->start();
@@ -100,14 +104,7 @@ void ToolTipManager::hideToolTip()
     m_metaDataRequested = false;
     m_showToolTipTimer->stop();
     m_contentRetrievalTimer->stop();
-
-    if (m_fileMetaDataToolTip) {
-        m_fileMetaDataToolTip->hide();
-        // Do not delete the tool tip immediately to prevent crashes when
-        // QCoreApplication tries to deliver an 'Enter' event to it, see bug 310579.
-        m_fileMetaDataToolTip->deleteLater();
-        m_fileMetaDataToolTip = 0;
-    }
+    m_tooltipWidget->hideLater();
 }
 
 void ToolTipManager::startContentRetrieval()
@@ -116,21 +113,21 @@ void ToolTipManager::startContentRetrieval()
         return;
     }
 
-    m_fileMetaDataToolTip->setName(m_item.text());
+    m_fileMetaDataWidget->setName(m_item.text());
 
     // Request the retrieval of meta-data. The slot
     // slotMetaDataRequestFinished() is invoked after the
     // meta-data have been received.
     m_metaDataRequested = true;
-    m_fileMetaDataToolTip->setItems(KFileItemList() << m_item);
-    m_fileMetaDataToolTip->adjustSize();
+    m_fileMetaDataWidget->setItems(KFileItemList() << m_item);
+    m_fileMetaDataWidget->adjustSize();
 
     // Request a preview of the item
-    m_fileMetaDataToolTip->setPreview(QPixmap());
+    m_fileMetaDataWidget->setPreview(QPixmap());
 
     KIO::PreviewJob* job = new KIO::PreviewJob(KFileItemList() << m_item, QSize(256, 256));
     job->setIgnoreMaximumSize(m_item.isLocalFile());
-    if (job->ui()) {
+    if (job->uiDelegate()) {
         KJobWidgets::setWindow(job, qApp->activeWindow());
     }
 
@@ -152,7 +149,7 @@ void ToolTipManager::setPreviewPix(const KFileItem& item,
     if (pixmap.isNull()) {
         previewFailed();
     } else {
-        m_fileMetaDataToolTip->setPreview(pixmap);
+        m_fileMetaDataWidget->setPreview(pixmap);
         if (!m_showToolTipTimer->isActive()) {
             showToolTip();
         }
@@ -166,7 +163,7 @@ void ToolTipManager::previewFailed()
     }
 
     const QPixmap pixmap = QIcon::fromTheme(m_item.iconName()).pixmap(128, 128);
-    m_fileMetaDataToolTip->setPreview(pixmap);
+    m_fileMetaDataWidget->setPreview(pixmap);
     if (!m_showToolTipTimer->isActive()) {
         showToolTip();
     }
@@ -193,75 +190,16 @@ void ToolTipManager::showToolTip()
         m_appliedWaitCursor = false;
     }
 
-    if (m_fileMetaDataToolTip->preview().isNull() || m_metaDataRequested) {
+    if (m_fileMetaDataWidget->preview().isNull() || m_metaDataRequested) {
         Q_ASSERT(!m_appliedWaitCursor);
         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
         m_appliedWaitCursor = true;
         return;
     }
 
-    const QRect screen = QApplication::desktop()->screenGeometry(QCursor::pos());
-
-    // Restrict tooltip size to current screen size when needed.
-    // Because layout controlling widget doesn't respect widget's maximumSize property
-    // (correct me if I'm wrong), we need to let layout do its work, then manually change
-    // geometry if resulting widget doesn't fit the screen.
-
-    // Step #1 - make sizeHint return calculated tooltip size
-    m_fileMetaDataToolTip->layout()->setSizeConstraint(QLayout::SetFixedSize);
-    m_fileMetaDataToolTip->adjustSize();
-    QSize size = m_fileMetaDataToolTip->sizeHint();
-
-    // Step #2 - correct tooltip size when needed
-    if (size.width() > screen.width()) {
-        size.setWidth(screen.width());
-    }
-    if (size.height() > screen.height()) {
-        size.setHeight(screen.height());
-    }
-
-    // m_itemRect defines the area of the item, where the tooltip should be
-    // shown. Per default the tooltip is shown centered at the bottom.
-    // It must be assured that:
-    // - the content is fully visible
-    // - the content is not drawn inside m_itemRect
-    const bool hasRoomToLeft  = (m_itemRect.left()   - size.width()  - m_margin >= screen.left());
-    const bool hasRoomToRight = (m_itemRect.right()  + size.width()  + m_margin <= screen.right());
-    const bool hasRoomAbove   = (m_itemRect.top()    - size.height() - m_margin >= screen.top());
-    const bool hasRoomBelow   = (m_itemRect.bottom() + size.height() + m_margin <= screen.bottom());
-    if (!hasRoomAbove && !hasRoomBelow && !hasRoomToLeft && !hasRoomToRight) {
-        return;
-    }
-
-    int x, y;
-    if (hasRoomBelow || hasRoomAbove) {
-        x = qMax(screen.left(), m_itemRect.center().x() - size.width() / 2);
-        if (x + size.width() >= screen.right()) {
-            x = screen.right() - size.width() + 1;
-        }
-        if (hasRoomBelow) {
-            y = m_itemRect.bottom() + m_margin;
-        } else {
-            y = m_itemRect.top() - size.height() - m_margin;
-        }
-    } else {
-        Q_ASSERT(hasRoomToLeft || hasRoomToRight);
-        if (hasRoomToRight) {
-            x = m_itemRect.right() + m_margin;
-        } else {
-            x = m_itemRect.left() - size.width() - m_margin;
-        }
-        // Put the tooltip at the bottom of the screen. The x-coordinate has already
-        // been adjusted, so that no overlapping with m_itemRect occurs.
-        y = screen.bottom() - size.height() + 1;
-    }
-
-    // Step #3 - Alter tooltip geometry
-    m_fileMetaDataToolTip->setFixedSize(size);
-    m_fileMetaDataToolTip->layout()->setSizeConstraint(QLayout::SetNoConstraint);
-    m_fileMetaDataToolTip->move(QPoint(x, y));
-    m_fileMetaDataToolTip->show();
-
+    // Adjust the size to get a proper sizeHint()
+    m_fileMetaDataWidget->adjustSize();
+    m_tooltipWidget->showBelow(m_itemRect, m_fileMetaDataWidget, m_transientParent);
     m_toolTipRequested = false;
 }
 
diff --git a/src/views/tooltips/tooltipmanager.h b/src/views/tooltips/tooltipmanager.h
index f6d8b8f26..9c504c898 100644
--- a/src/views/tooltips/tooltipmanager.h
+++ b/src/views/tooltips/tooltipmanager.h
@@ -25,8 +25,10 @@
 
 #include <KFileItem>
 
-class FileMetaDataToolTip;
+class DolphinFileMetaDataWidget;
+class KToolTipWidget;
 class QTimer;
+class QWindow;
 
 /**
  * @brief Manages the tooltips for an item view.
@@ -47,9 +49,9 @@ public:
      * Triggers the showing of the tooltip for the item \p item
      * where the item has the maximum boundaries of \p itemRect.
      * The tooltip manager takes care that the tooltip is shown
-     * slightly delayed.
+     * slightly delayed and with a proper \p transientParent.
      */
-    void showToolTip(const KFileItem& item, const QRectF& itemRect);
+    void showToolTip(const KFileItem& item, const QRectF& itemRect, QWindow *transientParent);
 
     /**
      * Hides the currently shown tooltip.
@@ -72,7 +74,11 @@ private:
     /// the tooltip content like preview and meta data gets started.
     QTimer* m_contentRetrievalTimer;
 
-    FileMetaDataToolTip* m_fileMetaDataToolTip;
+    /// Transient parent of the tooltip, mandatory on Wayland.
+    QWindow* m_transientParent;
+
+    DolphinFileMetaDataWidget* m_fileMetaDataWidget;
+    QScopedPointer<KToolTipWidget> m_tooltipWidget;
 
     bool m_toolTipRequested;
     bool m_metaDataRequested;
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
index cdec01b9d..889c1232a 100644
--- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
+++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
@@ -2,7 +2,7 @@
 Type=ServiceType
 X-KDE-ServiceType=FileViewVersionControlPlugin
 Comment=Version Control Plugin for File Views
-Comment[ast]=Complementu de control de versiones pa vistes de ficheros
+Comment[ar]=ملحقة تحكّم بالإصدارات لمناظير الملفّات
 Comment[ca]=Connector de control de versions per a les vistes de fitxers
 Comment[ca@valencia]=Connector de control de versions per a les vistes de fitxers
 Comment[cs]=Modul pro správu verzí pro pohledy na soubory
diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index 597baa293..ca52be890 100644
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -35,7 +35,8 @@
 namespace {
     const int AdditionalInfoViewPropertiesVersion = 1;
     const int NameRolePropertiesVersion = 2;
-    const int CurrentViewPropertiesVersion = 3;
+    const int DateRolePropertiesVersion = 4;
+    const int CurrentViewPropertiesVersion = 4;
 
     // String representation to mark the additional properties of
     // the details view as customized by the user. See
@@ -123,6 +124,11 @@ ViewProperties::ViewProperties(const QUrl& url) :
             Q_ASSERT(m_node->version() == NameRolePropertiesVersion);
         }
 
+        if (m_node->version() < DateRolePropertiesVersion) {
+            convertDateRoleToModificationTimeRole();
+            Q_ASSERT(m_node->version() == DateRolePropertiesVersion);
+        }
+
         m_node->setVersion(CurrentViewPropertiesVersion);
     }
 }
@@ -309,7 +315,7 @@ QList<QByteArray> ViewProperties::visibleRoles() const
                                   && !visibleRoles.contains(CustomizedDetailsString);
     if (useDefaultValues) {
         roles.append("size");
-        roles.append("date");
+        roles.append("modificationtime");
     }
 
     return roles;
@@ -448,6 +454,27 @@ void ViewProperties::convertNameRoleToTextRole()
     update();
 }
 
+void ViewProperties::convertDateRoleToModificationTimeRole()
+{
+    QStringList visibleRoles = m_node->visibleRoles();
+    for (int i = 0; i < visibleRoles.count(); ++i) {
+        if (visibleRoles[i].endsWith(QLatin1String("_date"))) {
+            const int leftLength = visibleRoles[i].length() - 5;
+            visibleRoles[i] = visibleRoles[i].left(leftLength) + "_modificationtime";
+        }
+    }
+
+    QString sortRole = m_node->sortRole();
+    if (sortRole == QLatin1String("date")) {
+        sortRole = QStringLiteral("modificationtime");
+    }
+
+    m_node->setVisibleRoles(visibleRoles);
+    m_node->setSortRole(sortRole);
+    m_node->setVersion(DateRolePropertiesVersion);
+    update();
+}
+
 bool ViewProperties::isPartOfHome(const QString& filePath)
 {
     // For performance reasons cache the path in a static QString
diff --git a/src/views/viewproperties.h b/src/views/viewproperties.h
index dc118e2d7..05b80f455 100644
--- a/src/views/viewproperties.h
+++ b/src/views/viewproperties.h
@@ -154,6 +154,12 @@ private:
     void convertNameRoleToTextRole();
 
     /**
+     * Provides backward compatibility with .directory files created with
+     * Dolphin < 16.11.70: Converts the old name-role "date" to "modificationtime"
+     */
+
+    void convertDateRoleToModificationTimeRole();
+    /**
      * Returns true, if \a filePath is part of the home-path (see QDir::homePath()).
      */
     static bool isPartOfHome(const QString& filePath);