Use the new KIO::PreviewJob API

This makes it unnecessary to manually apply the plugins. See https://git.reviewboard.kde.org/r/100578/ for more details.

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 69951f22c14f3366e722c84395b86b41f797789b..77a6232389a25364e86c85333e552f468de58d38 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -63,8 +63,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_phononWidget(0),
     m_nameLabel(0),
     m_metaDataWidget(0),
     m_phononWidget(0),
     m_nameLabel(0),
     m_metaDataWidget(0),

-    m_metaDataArea(0),
-    m_enabledPlugins()
+    m_metaDataArea(0)

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


@@ -174,16 +173,8 @@ void InformationPanelContent::showItem(const KFileItem& item)
                 m_outdatedPreviewTimer->start();
             }
 
                 m_outdatedPreviewTimer->start();
             }
 

-            if (m_enabledPlugins.isEmpty()) {
-                const KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
-                m_enabledPlugins = globalConfig.readEntry("Plugins", QStringList()
-                                                                     << "directorythumbnail"
-                                                                     << "imagethumbnail"
-                                                                     << "jpegthumbnail");
-            }
-
-            KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << item, m_preview->width(), m_preview->height(),
-                                                    0, 0, false, true, &m_enabledPlugins);
+            KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << item, QSize(m_preview->width(), m_preview->height()));
+            job->setScaleType(KIO::PreviewJob::Unscaled);

 
             connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
                     this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
 
             connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
                     this, SLOT(showPreview(const KFileItem&, const QPixmap&)));

diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index 184ce557d0ad1a3ebe2e48c721e11d0dd7fb9593..1d964f515933f819e4a7b4199038c31d916c8ec1 100644 (file)
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -135,7 +135,6 @@ private:
     QLabel* m_nameLabel;
     KFileMetaDataWidget* m_metaDataWidget;
     QScrollArea* m_metaDataArea;
     QLabel* m_nameLabel;
     KFileMetaDataWidget* m_metaDataWidget;
     QScrollArea* m_metaDataArea;

-    QStringList m_enabledPlugins;

 };
 
 #endif // INFORMATIONPANELCONTENT_H
 };
 
 #endif // INFORMATIONPANELCONTENT_H

diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
index cb86b3355020e1c056cdc59dffec3ed4a461fcca..44e60049f42f813b0f768ca486ada93514aefbff 100644 (file)
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -20,7 +20,6 @@
 #include "tooltipmanager.h"
 
 #include "filemetadatatooltip.h"
 #include "tooltipmanager.h"
 
 #include "filemetadatatooltip.h"

-#include <KConfigGroup>

 #include <KIcon>
 #include <KIO/PreviewJob>
 #include <KSharedConfig>
 #include <KIcon>
 #include <KIO/PreviewJob>
 #include <KSharedConfig>


@@ -47,8 +46,7 @@ ToolTipManager::ToolTipManager(QAbstractItemView* parent,
     m_metaDataRequested(false),
     m_appliedWaitCursor(false),
     m_item(),
     m_metaDataRequested(false),
     m_appliedWaitCursor(false),
     m_item(),

-    m_itemRect(),
-    m_enabledPlugins()
+    m_itemRect()

 {
     static FileMetaDataToolTip* sharedToolTip = 0;
     if (!sharedToolTip) {
 {
     static FileMetaDataToolTip* sharedToolTip = 0;
     if (!sharedToolTip) {


@@ -171,14 +169,7 @@ void ToolTipManager::startContentRetrieval()
     // Request a preview of the item
     m_fileMetaDataToolTip->setPreview(QPixmap());
 
     // Request a preview of the item
     m_fileMetaDataToolTip->setPreview(QPixmap());
 

-    if (m_enabledPlugins.isEmpty()) {
-        const KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
-        m_enabledPlugins = globalConfig.readEntry("Plugins", QStringList()
-                                                             << "directorythumbnail"
-                                                             << "imagethumbnail"
-                                                             << "jpegthumbnail");
-    }
-    KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << m_item, 256, 256, true, true, &m_enabledPlugins);
+    KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << m_item, QSize(256, 256));

 
     connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
             this, SLOT(setPreviewPix(const KFileItem&, const QPixmap&)));
 
     connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
             this, SLOT(setPreviewPix(const KFileItem&, const QPixmap&)));

diff --git a/src/views/tooltips/tooltipmanager.h b/src/views/tooltips/tooltipmanager.h
index 2dee9d286575990a4090de9df7a8e8f1cf118cb2..f8bcd3dfdb256e8ac4a7126e7b192d03c98426a9 100644 (file)
--- a/src/views/tooltips/tooltipmanager.h
+++ b/src/views/tooltips/tooltipmanager.h
@@ -87,7 +87,6 @@ private:
     bool m_appliedWaitCursor;
     KFileItem m_item;
     QRect m_itemRect;
     bool m_appliedWaitCursor;
     KFileItem m_item;
     QRect m_itemRect;

-    QStringList m_enabledPlugins;

 };
 
 #endif
 };
 
 #endif