[Places Panel] Make use of KFilePlacesView::dragAutoActivationDelay

[dolphin.git] / src / panels / information / informationpanelcontent.cpp

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 946bad7207037dfeb55ad49fbee13f2e6661c77d..a1e8d1b1d65cbf6b590625919e79ce7b5e676ba1 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -8,11 +8,13 @@
 
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
 
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>

+#include <KConfigGroup>

 #include <KIconEffect>
 #include <KIconLoader>
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KSeparator>
 #include <KIconEffect>
 #include <KIconLoader>
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KSeparator>

+#include <KSharedConfig>

 #include <KStringHandler>
 #include <QPainterPath>
 
 #include <KStringHandler>
 #include <QPainterPath>
 


@@ -21,9 +23,6 @@
 
 #include <Baloo/FileMetaDataWidget>
 
 
 #include <Baloo/FileMetaDataWidget>
 

-#include <panels/places/placesitem.h>
-#include <panels/places/placesitemmodel.h>
-

 #include <Phonon/BackendCapabilities>
 #include <Phonon/MediaObject>
 
 #include <Phonon/BackendCapabilities>
 #include <Phonon/MediaObject>
 


@@ -58,7 +57,6 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_nameLabel(nullptr),
     m_metaDataWidget(nullptr),
     m_metaDataArea(nullptr),
     m_nameLabel(nullptr),
     m_metaDataWidget(nullptr),
     m_metaDataArea(nullptr),

-    m_placesItemModel(nullptr),

     m_isVideo(false)
 {
     parent->installEventFilter(this);
     m_isVideo(false)
 {
     parent->installEventFilter(this);


@@ -96,6 +94,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_nameLabel->setTextFormat(Qt::PlainText);
     m_nameLabel->setAlignment(Qt::AlignHCenter);
     m_nameLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
     m_nameLabel->setTextFormat(Qt::PlainText);
     m_nameLabel->setAlignment(Qt::AlignHCenter);
     m_nameLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);

+    m_nameLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);

 
     const bool previewsShown = InformationPanelSettings::previewsShown();
     m_preview->setVisible(previewsShown);
 
     const bool previewsShown = InformationPanelSettings::previewsShown();
     m_preview->setVisible(previewsShown);


@@ -148,8 +147,6 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     layout->addWidget(m_configureButtons);
 
     grabGesture(Qt::TapAndHoldGesture);
     layout->addWidget(m_configureButtons);
 
     grabGesture(Qt::TapAndHoldGesture);

-
-    m_placesItemModel = new PlacesItemModel(this);

 }
 
 InformationPanelContent::~InformationPanelContent()
 }
 
 InformationPanelContent::~InformationPanelContent()


@@ -184,12 +181,13 @@ void InformationPanelContent::refreshPixmapView()
     // can be shown within a short timeframe.
     m_outdatedPreviewTimer->start();
 
     // can be shown within a short timeframe.
     m_outdatedPreviewTimer->start();
 

-    QStringList plugins = KIO::PreviewJob::availablePlugins();
+    const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
+    const QStringList plugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins());

     m_previewJob = new KIO::PreviewJob(KFileItemList() << m_item,
                                        QSize(m_preview->width(), m_preview->height()),
                                        &plugins);
     m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);
     m_previewJob = new KIO::PreviewJob(KFileItemList() << m_item,
                                        QSize(m_preview->width(), m_preview->height()),
                                        &plugins);
     m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);

-    m_previewJob->setIgnoreMaximumSize(m_item.isLocalFile());
+    m_previewJob->setIgnoreMaximumSize(m_item.isLocalFile() && !m_item.isSlow());

     if (m_previewJob->uiDelegate()) {
         KJobWidgets::setWindow(m_previewJob, this);
     }
     if (m_previewJob->uiDelegate()) {
         KJobWidgets::setWindow(m_previewJob, this);
     }


@@ -387,22 +385,25 @@ void InformationPanelContent::showPreview(const KFileItem& item,
     KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);
 
     if (m_isVideo) {
     KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);
 
     if (m_isVideo) {

-        // adds a play arrow
+        // adds a play arrow overlay
+
+        auto maxDim = qMax(p.width(), p.height());
+        auto arrowSize = qMax(PLAY_ARROW_SIZE, maxDim / 8);

 
         // compute relative pixel positions
 
         // compute relative pixel positions

-        const int zeroX = static_cast<int>(p.width() / 2 - PLAY_ARROW_SIZE / 2 / devicePixelRatio());
-        const int zeroY = static_cast<int>(p.height() / 2 - PLAY_ARROW_SIZE / 2 / devicePixelRatio());
+        const int zeroX = static_cast<int>((p.width() / 2 - arrowSize / 2) / pixmap.devicePixelRatio());
+        const int zeroY = static_cast<int>((p.height() / 2 - arrowSize / 2) / pixmap.devicePixelRatio());

 
         QPolygon arrow;
         arrow << QPoint(zeroX, zeroY);
 
         QPolygon arrow;
         arrow << QPoint(zeroX, zeroY);

-        arrow << QPoint(zeroX, zeroY + PLAY_ARROW_SIZE);
-        arrow << QPoint(zeroX + PLAY_ARROW_SIZE, zeroY + PLAY_ARROW_SIZE / 2);
+        arrow << QPoint(zeroX, zeroY + arrowSize);
+        arrow << QPoint(zeroX + arrowSize, zeroY + arrowSize / 2);

 
         QPainterPath path;
         path.addPolygon(arrow);
 
 
         QPainterPath path;
         path.addPolygon(arrow);
 

-        QLinearGradient gradient(QPointF(zeroX, zeroY),
-                                 QPointF(zeroX + PLAY_ARROW_SIZE,zeroY + PLAY_ARROW_SIZE));
+        QLinearGradient gradient(QPointF(zeroX, zeroY + arrowSize / 2),
+                                 QPointF(zeroX + arrowSize, zeroY + arrowSize / 2));

 
         QColor whiteColor = Qt::white;
         QColor blackColor = Qt::black;
 
         QColor whiteColor = Qt::white;
         QColor blackColor = Qt::black;