Merge branch 'release/21.04'

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

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index d632cfcd1c956c8b84a707a2199a1d4fea8d8070..d43b9f5205d72b92531b0b9849f652a59078d881 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>
 


@@ -33,11 +35,13 @@
 #include <QTextLayout>
 #include <QTimer>
 #include <QVBoxLayout>
 #include <QTextLayout>
 #include <QTimer>
 #include <QVBoxLayout>

+#include <QScroller>

 #include <QStyle>
 #include <QPainter>
 #include <QBitmap>
 #include <QLinearGradient>
 #include <QPolygon>
 #include <QStyle>
 #include <QPainter>
 #include <QBitmap>
 #include <QLinearGradient>
 #include <QPolygon>

+#include <QGesture>

 
 #include "dolphin_informationpanelsettings.h"
 #include "phononwidget.h"
 
 #include "dolphin_informationpanelsettings.h"
 #include "phononwidget.h"


@@ -94,6 +98,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);


@@ -117,14 +122,14 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
                 m_metaDataWidget->setConfigurationMode(Baloo::ConfigurationMode::Accept);
                 m_configureButtons->setVisible(false);
                 m_configureLabel->setVisible(false);
                 m_metaDataWidget->setConfigurationMode(Baloo::ConfigurationMode::Accept);
                 m_configureButtons->setVisible(false);
                 m_configureLabel->setVisible(false);

-                emit configurationFinished();
+                Q_EMIT configurationFinished();

             }
     );
     connect(m_configureButtons, &QDialogButtonBox::rejected, this, [this]() {
                 m_metaDataWidget->setConfigurationMode(Baloo::ConfigurationMode::Cancel);
                 m_configureButtons->setVisible(false);
                 m_configureLabel->setVisible(false);
             }
     );
     connect(m_configureButtons, &QDialogButtonBox::rejected, this, [this]() {
                 m_metaDataWidget->setConfigurationMode(Baloo::ConfigurationMode::Cancel);
                 m_configureButtons->setVisible(false);
                 m_configureLabel->setVisible(false);

-                emit configurationFinished();
+                Q_EMIT configurationFinished();

             }
     );
 
             }
     );
 


@@ -134,6 +139,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_metaDataArea->setFrameShape(QFrame::NoFrame);
 
     QWidget* viewport = m_metaDataArea->viewport();
     m_metaDataArea->setFrameShape(QFrame::NoFrame);
 
     QWidget* viewport = m_metaDataArea->viewport();

+    QScroller::grabGesture(viewport, QScroller::TouchGesture);

     viewport->installEventFilter(this);
 
     layout->addWidget(m_preview);
     viewport->installEventFilter(this);
 
     layout->addWidget(m_preview);


@@ -144,6 +150,8 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     layout->addWidget(m_metaDataArea);
     layout->addWidget(m_configureButtons);
 
     layout->addWidget(m_metaDataArea);
     layout->addWidget(m_configureButtons);
 

+    grabGesture(Qt::TapAndHoldGesture);
+

     m_placesItemModel = new PlacesItemModel(this);
 }
 
     m_placesItemModel = new PlacesItemModel(this);
 }
 


@@ -179,7 +187,8 @@ 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 = new KIO::PreviewJob(KFileItemList() << m_item,
                                        QSize(m_preview->width(), m_preview->height()),
                                        &plugins);


@@ -338,6 +347,33 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
     return QWidget::eventFilter(obj, event);
 }
 
     return QWidget::eventFilter(obj, event);
 }
 

+bool InformationPanelContent::event(QEvent* event)
+{
+    if (event->type() == QEvent::Gesture) {
+        gestureEvent(static_cast<QGestureEvent*>(event));
+        return true;
+    }
+    return QWidget::event(event);
+}
+
+bool InformationPanelContent::gestureEvent(QGestureEvent* event)
+{
+    if (!underMouse()) {
+        return false;
+    }
+
+    QTapAndHoldGesture* tap = static_cast<QTapAndHoldGesture*>(event->gesture(Qt::TapAndHoldGesture));
+
+    if (tap) {
+        if (tap->state() == Qt::GestureFinished) {
+            Q_EMIT contextMenuRequested(tap->position().toPoint());
+        }
+        event->accept();
+        return true;
+    }
+    return false;
+}
+

 void InformationPanelContent::showIcon(const KFileItem& item)
 {
     m_outdatedPreviewTimer->stop();
 void InformationPanelContent::showIcon(const KFileItem& item)
 {
     m_outdatedPreviewTimer->stop();