Port Dolphin to Baloo

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

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 0c4c62fc7c6f710cf0233e4b8f5378d3765b4bd3..b2dd1582ef834f8e57649355924f5273ceba90f5 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -31,10 +31,10 @@
 #include <kseparator.h>
 #include <KStringHandler>
 
 #include <kseparator.h>
 #include <KStringHandler>
 

-#ifndef HAVE_NEPOMUK
+#ifndef HAVE_BALOO

 #include <KFileMetaDataWidget>
 #else
 #include <KFileMetaDataWidget>
 #else

-#include <nepomuk2/filemetadatawidget.h>
+#include <baloo/filemetadatawidget.h>

 #endif
 
 #include <panels/places/placesitem.h>
 #endif
 
 #include <panels/places/placesitem.h>


@@ -64,7 +64,7 @@
 InformationPanelContent::InformationPanelContent(QWidget* parent) :
     QWidget(parent),
     m_item(),
 InformationPanelContent::InformationPanelContent(QWidget* parent) :
     QWidget(parent),
     m_item(),

-    m_pendingPreview(false),
+    m_previewJob(0),

     m_outdatedPreviewTimer(0),
     m_preview(0),
     m_phononWidget(0),
     m_outdatedPreviewTimer(0),
     m_preview(0),
     m_phononWidget(0),


@@ -105,16 +105,17 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     QFont font = m_nameLabel->font();
     font.setBold(true);
     m_nameLabel->setFont(font);
     QFont font = m_nameLabel->font();
     font.setBold(true);
     m_nameLabel->setFont(font);

+    m_nameLabel->setTextFormat(Qt::PlainText);

     m_nameLabel->setAlignment(Qt::AlignHCenter);
     m_nameLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     const bool previewsShown = InformationPanelSettings::previewsShown();
     m_preview->setVisible(previewsShown);
 
     m_nameLabel->setAlignment(Qt::AlignHCenter);
     m_nameLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     const bool previewsShown = InformationPanelSettings::previewsShown();
     m_preview->setVisible(previewsShown);
 

-#ifndef HAVE_NEPOMUK
+#ifndef HAVE_BALOO

     m_metaDataWidget = new KFileMetaDataWidget(parent);
 #else
     m_metaDataWidget = new KFileMetaDataWidget(parent);
 #else

-    m_metaDataWidget = new Nepomuk2::FileMetaDataWidget(parent);
+    m_metaDataWidget = new Baloo::FileMetaDataWidget(parent);

 #endif
     m_metaDataWidget->setFont(KGlobalSettings::smallestReadableFont());
     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
 #endif
     m_metaDataWidget->setFont(KGlobalSettings::smallestReadableFont());
     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);


@@ -158,12 +159,16 @@ InformationPanelContent::~InformationPanelContent()
 
 void InformationPanelContent::showItem(const KFileItem& item)
 {
 
 void InformationPanelContent::showItem(const KFileItem& item)
 {

-    m_pendingPreview = false;
+    // If there is a preview job, kill it to prevent that we have jobs for
+    // multiple items running, and thus a race condition (bug 250787).
+    if (m_previewJob) {
+        m_previewJob->kill();
+    }

 
     const KUrl itemUrl = item.url();
 
     const KUrl itemUrl = item.url();

-    const bool isSearchUrl = itemUrl.protocol().contains("search") && item.nepomukUri().isEmpty();
+    const bool isSearchUrl = itemUrl.protocol().contains("search") && item.localPath().isEmpty();

     if (!applyPlace(itemUrl)) {
     if (!applyPlace(itemUrl)) {

-        setNameLabelText(Qt::escape(item.text()));
+        setNameLabelText(item.text());

         if (isSearchUrl) {
             // in the case of a search-URL the URL is not readable for humans
             // (at least not useful to show in the Information Panel)
         if (isSearchUrl) {
             // in the case of a search-URL the URL is not readable for humans
             // (at least not useful to show in the Information Panel)


@@ -174,7 +179,6 @@ void InformationPanelContent::showItem(const KFileItem& item)
             m_preview->setPixmap(icon);
         } else {
             // try to get a preview pixmap from the item...
             m_preview->setPixmap(icon);
         } else {
             // try to get a preview pixmap from the item...

-            m_pendingPreview = true;

 
             // Mark the currently shown preview as outdated. This is done
             // with a small delay to prevent a flickering when the next preview
 
             // Mark the currently shown preview as outdated. This is done
             // with a small delay to prevent a flickering when the next preview


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

-            KIO::PreviewJob* job = new KIO::PreviewJob(KFileItemList() << item, QSize(m_preview->width(), m_preview->height()));
-            job->setScaleType(KIO::PreviewJob::Unscaled);
-            job->setIgnoreMaximumSize(item.isLocalFile());
-            if (job->ui()) {
-                job->ui()->setWindow(this);
+            m_previewJob = new KIO::PreviewJob(KFileItemList() << item, QSize(m_preview->width(), m_preview->height()));
+            m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);
+            m_previewJob->setIgnoreMaximumSize(item.isLocalFile());
+            if (m_previewJob->ui()) {
+                m_previewJob->ui()->setWindow(this);

             }
 
             }
 

-            connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)),
+            connect(m_previewJob, SIGNAL(gotPreview(KFileItem,QPixmap)),

                     this, SLOT(showPreview(KFileItem,QPixmap)));
                     this, SLOT(showPreview(KFileItem,QPixmap)));

-            connect(job, SIGNAL(failed(KFileItem)),
+            connect(m_previewJob, SIGNAL(failed(KFileItem)),

                     this, SLOT(showIcon(KFileItem)));
         }
     }
                     this, SLOT(showIcon(KFileItem)));
         }
     }


@@ -226,14 +230,18 @@ void InformationPanelContent::showItem(const KFileItem& item)
 
 void InformationPanelContent::showItems(const KFileItemList& items)
 {
 
 void InformationPanelContent::showItems(const KFileItemList& items)
 {

-    m_pendingPreview = false;
+    // If there is a preview job, kill it to prevent that we have jobs for
+    // multiple items running, and thus a race condition (bug 250787).
+    if (m_previewJob) {
+        m_previewJob->kill();
+    }

 
     KIconLoader iconLoader;
     QPixmap icon = iconLoader.loadIcon("dialog-information",
                                        KIconLoader::NoGroup,
                                        KIconLoader::SizeEnormous);
     m_preview->setPixmap(icon);
 
     KIconLoader iconLoader;
     QPixmap icon = iconLoader.loadIcon("dialog-information",
                                        KIconLoader::NoGroup,
                                        KIconLoader::SizeEnormous);
     m_preview->setPixmap(icon);

-    setNameLabelText(i18ncp("@info", "%1 item selected", "%1 items selected", items.count()));
+    setNameLabelText(i18ncp("@label", "%1 item selected", "%1 items selected", items.count()));

 
     if (m_metaDataWidget) {
         m_metaDataWidget->setItems(items);
 
     if (m_metaDataWidget) {
         m_metaDataWidget->setItems(items);


@@ -314,7 +322,6 @@ void InformationPanelContent::configureSettings(const QList<QAction*>& customCon
 void InformationPanelContent::showIcon(const KFileItem& item)
 {
     m_outdatedPreviewTimer->stop();
 void InformationPanelContent::showIcon(const KFileItem& item)
 {
     m_outdatedPreviewTimer->stop();

-    m_pendingPreview = false;

     if (!applyPlace(item.targetUrl())) {
         KIcon icon(item.iconName(), KIconLoader::global(), item.overlays());
         m_preview->setPixmap(icon.pixmap(KIconLoader::SizeEnormous));
     if (!applyPlace(item.targetUrl())) {
         KIcon icon(item.iconName(), KIconLoader::global(), item.overlays());
         m_preview->setPixmap(icon.pixmap(KIconLoader::SizeEnormous));


@@ -326,12 +333,10 @@ void InformationPanelContent::showPreview(const KFileItem& item,
 {
     m_outdatedPreviewTimer->stop();
     Q_UNUSED(item);
 {
     m_outdatedPreviewTimer->stop();
     Q_UNUSED(item);

-    if (m_pendingPreview) {
-        QPixmap p = pixmap;
-        KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);
-        m_preview->setPixmap(p);
-        m_pendingPreview = false;
-    }
+
+    QPixmap p = pixmap;
+    KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);
+    m_preview->setPixmap(p);

 }
 
 void InformationPanelContent::markOutdatedPreview()
 }
 
 void InformationPanelContent::markOutdatedPreview()


@@ -350,7 +355,7 @@ void InformationPanelContent::slotHasVideoChanged(bool hasVideo)
 
 void InformationPanelContent::refreshMetaData()
 {
 
 void InformationPanelContent::refreshMetaData()
 {

-    if (!m_item.isNull() && m_item.nepomukUri().isValid()) {
+    if (!m_item.isNull()) {

         showItem(m_item);
     }
 }
         showItem(m_item);
     }
 }


@@ -361,7 +366,7 @@ bool InformationPanelContent::applyPlace(const KUrl& url)
     for (int i = 0; i < count; ++i) {
         const PlacesItem* item = m_placesItemModel->placesItem(i);
         if (item->url().equals(url, KUrl::CompareWithoutTrailingSlash)) {
     for (int i = 0; i < count; ++i) {
         const PlacesItem* item = m_placesItemModel->placesItem(i);
         if (item->url().equals(url, KUrl::CompareWithoutTrailingSlash)) {

-            setNameLabelText(Qt::escape(item->text()));
+            setNameLabelText(item->text());

             m_preview->setPixmap(KIcon(item->icon()).pixmap(128, 128));
             return true;
         }
             m_preview->setPixmap(KIcon(item->icon()).pixmap(128, 128));
             return true;
         }