Merge branch 'Applications/18.04'

[dolphin.git] / src / kitemviews / kfileitemlistview.cpp

diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index 1ffd5019b48dd9ac4719d3bbc12a2460279164bb..3c1ef1b98dee04ecaecfa453f20a966fdbb2d6ef 100644 (file)
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -19,19 +19,16 @@
 
 #include "kfileitemlistview.h"
 
 
 #include "kfileitemlistview.h"
 

-#include "kfileitemmodelrolesupdater.h"

 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"
 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"

-#include <KLocale>
-#include <KStringHandler>
+#include "kfileitemmodelrolesupdater.h"

 #include "private/kpixmapmodifier.h"
 
 #include "private/kpixmapmodifier.h"
 

-#include <KDebug>
-#include <KIcon>
-#include <KTextEdit>
+#include <KIconLoader>

 
 

+#include <QGraphicsScene>
+#include <QGraphicsView>

 #include <QPainter>
 #include <QPainter>

-#include <QTextLine>

 #include <QTimer>
 
 // #define KFILEITEMLISTVIEW_DEBUG
 #include <QTimer>
 
 // #define KFILEITEMLISTVIEW_DEBUG


@@ -45,15 +42,15 @@ namespace {
 
     // If the icon size changes, a longer delay is used. This prevents that
     // the expensive re-generation of all previews is triggered repeatedly when
 
     // If the icon size changes, a longer delay is used. This prevents that
     // the expensive re-generation of all previews is triggered repeatedly when

-    // chaning the zoom level.
+    // changing the zoom level.

     const int LongInterval = 300;
 }
 
 KFileItemListView::KFileItemListView(QGraphicsWidget* parent) :
     KStandardItemListView(parent),
     const int LongInterval = 300;
 }
 
 KFileItemListView::KFileItemListView(QGraphicsWidget* parent) :
     KStandardItemListView(parent),

-    m_modelRolesUpdater(0),
-    m_updateVisibleIndexRangeTimer(0),
-    m_updateIconSizeTimer(0)
+    m_modelRolesUpdater(nullptr),
+    m_updateVisibleIndexRangeTimer(nullptr),
+    m_updateIconSizeTimer(nullptr)

 {
     setAcceptDrops(true);
 
 {
     setAcceptDrops(true);
 


@@ -62,14 +59,14 @@ KFileItemListView::KFileItemListView(QGraphicsWidget* parent) :
     m_updateVisibleIndexRangeTimer = new QTimer(this);
     m_updateVisibleIndexRangeTimer->setSingleShot(true);
     m_updateVisibleIndexRangeTimer->setInterval(ShortInterval);
     m_updateVisibleIndexRangeTimer = new QTimer(this);
     m_updateVisibleIndexRangeTimer->setSingleShot(true);
     m_updateVisibleIndexRangeTimer->setInterval(ShortInterval);

-    connect(m_updateVisibleIndexRangeTimer, SIGNAL(timeout()), this, SLOT(updateVisibleIndexRange()));
+    connect(m_updateVisibleIndexRangeTimer, &QTimer::timeout, this, &KFileItemListView::updateVisibleIndexRange);

 
     m_updateIconSizeTimer = new QTimer(this);
     m_updateIconSizeTimer->setSingleShot(true);
     m_updateIconSizeTimer->setInterval(LongInterval);
 
     m_updateIconSizeTimer = new QTimer(this);
     m_updateIconSizeTimer->setSingleShot(true);
     m_updateIconSizeTimer->setInterval(LongInterval);

-    connect(m_updateIconSizeTimer, SIGNAL(timeout()), this, SLOT(updateIconSize()));
+    connect(m_updateIconSizeTimer, &QTimer::timeout, this, &KFileItemListView::updateIconSize);

 
 

-    setVisibleRoles(QList<QByteArray>() << "text");
+    setVisibleRoles({"text"});

 }
 
 KFileItemListView::~KFileItemListView()
 }
 
 KFileItemListView::~KFileItemListView()


@@ -119,7 +116,7 @@ QStringList KFileItemListView::enabledPlugins() const
     return m_modelRolesUpdater ? m_modelRolesUpdater->enabledPlugins() : QStringList();
 }
 
     return m_modelRolesUpdater ? m_modelRolesUpdater->enabledPlugins() : QStringList();
 }
 

-QPixmap KFileItemListView::createDragPixmap(const QSet<int>& indexes) const
+QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const

 {
     if (!model()) {
         return QPixmap();
 {
     if (!model()) {
         return QPixmap();


@@ -158,23 +155,23 @@ QPixmap KFileItemListView::createDragPixmap(const QSet<int>& indexes) const
         yCount = xCount;
     }
 
         yCount = xCount;
     }
 

+    const qreal dpr = scene()->views()[0]->devicePixelRatio();

     // Draw the selected items into the grid cells.
     // Draw the selected items into the grid cells.

-    QPixmap dragPixmap(xCount * size + xCount, yCount * size + yCount);
+    QPixmap dragPixmap(QSize(xCount * size + xCount, yCount * size + yCount) * dpr);
+    dragPixmap.setDevicePixelRatio(dpr);

     dragPixmap.fill(Qt::transparent);
 
     QPainter painter(&dragPixmap);
     int x = 0;
     int y = 0;
     dragPixmap.fill(Qt::transparent);
 
     QPainter painter(&dragPixmap);
     int x = 0;
     int y = 0;

-    QSetIterator<int> it(indexes);
-    while (it.hasNext()) {
-        const int index = it.next();

 
 

+    for (int index : indexes) {

         QPixmap pixmap = model()->data(index).value("iconPixmap").value<QPixmap>();
         if (pixmap.isNull()) {
         QPixmap pixmap = model()->data(index).value("iconPixmap").value<QPixmap>();
         if (pixmap.isNull()) {

-            KIcon icon(model()->data(index).value("iconName").toString());
+            QIcon icon = QIcon::fromTheme(model()->data(index).value("iconName").toString());

             pixmap = icon.pixmap(size, size);
         } else {
             pixmap = icon.pixmap(size, size);
         } else {

-            KPixmapModifier::scale(pixmap, QSize(size, size));
+            KPixmapModifier::scale(pixmap, QSize(size, size) * dpr);

         }
 
         painter.drawPixmap(x, y, pixmap);
         }
 
         painter.drawPixmap(x, y, pixmap);


@@ -210,7 +207,7 @@ void KFileItemListView::initializeItemListWidget(KItemListWidget* item)
 
         const KFileItem fileItem = fileItemModel->fileItem(item->index());
         data.insert("iconName", fileItem.iconName());
 
         const KFileItem fileItem = fileItemModel->fileItem(item->index());
         data.insert("iconName", fileItem.iconName());

-        item->setData(data, QSet<QByteArray>() << "iconName");
+        item->setData(data, {"iconName"});

     }
 }
 
     }
 }
 


@@ -221,12 +218,6 @@ void KFileItemListView::onPreviewsShownChanged(bool shown)
 
 void KFileItemListView::onItemLayoutChanged(ItemLayout current, ItemLayout previous)
 {
 
 void KFileItemListView::onItemLayoutChanged(ItemLayout current, ItemLayout previous)
 {

-    if (previous == DetailsLayout || current == DetailsLayout) {
-        // The details-layout requires some invisible roles that
-        // must be added to the model if the new layout is "details".
-        // If the old layout was "details" the roles will get removed.
-        applyRolesToModel();
-    }

     KStandardItemListView::onItemLayoutChanged(current, previous);
     triggerVisibleIndexRangeUpdate();
 }
     KStandardItemListView::onItemLayoutChanged(current, previous);
     triggerVisibleIndexRangeUpdate();
 }


@@ -237,7 +228,7 @@ void KFileItemListView::onModelChanged(KItemModelBase* current, KItemModelBase*
     KStandardItemListView::onModelChanged(current, previous);
 
     delete m_modelRolesUpdater;
     KStandardItemListView::onModelChanged(current, previous);
 
     delete m_modelRolesUpdater;

-    m_modelRolesUpdater = 0;
+    m_modelRolesUpdater = nullptr;

 
     if (current) {
         m_modelRolesUpdater = new KFileItemModelRolesUpdater(static_cast<KFileItemModel*>(current), this);
 
     if (current) {
         m_modelRolesUpdater = new KFileItemModelRolesUpdater(static_cast<KFileItemModel*>(current), this);


@@ -404,6 +395,7 @@ void KFileItemListView::applyRolesToModel()
     roles.insert("text");
     roles.insert("isDir");
     roles.insert("isLink");
     roles.insert("text");
     roles.insert("isDir");
     roles.insert("isLink");

+    roles.insert("isHidden");

     if (supportsItemExpanding()) {
         roles.insert("isExpanded");
         roles.insert("isExpandable");
     if (supportsItemExpanding()) {
         roles.insert("isExpanded");
         roles.insert("isExpandable");


@@ -429,4 +421,3 @@ QSize KFileItemListView::availableIconSize() const
     return QSize(iconSize, iconSize);
 }
 
     return QSize(iconSize, iconSize);
 }
 

-#include "kfileitemlistview.moc"