Show folder previews for items that have a Places Panel entry

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

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index d63f23b13f2b65ef079ed237eb43142bb2e9e765..5dcf8612efcba68c486f92afc42029de1197b0de 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -19,22 +19,23 @@
 
 #include "informationpanelcontent.h"
 
 
 #include "informationpanelcontent.h"
 

-#include <KDialog>
-#include <KFileItem>
-#include <KGlobalSettings>

 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
 #include <KIconEffect>
 #include <KIconLoader>
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
 #include <KIconEffect>
 #include <KIconLoader>

-#include <KLocale>
-#include <KMenu>
-#include <kseparator.h>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KSeparator>

 #include <KStringHandler>
 
 #include <KStringHandler>
 

-#ifndef HAVE_NEPOMUK
+#include <QIcon>
+#include <QMenu>
+#include <QTextDocument>
+
+#ifndef HAVE_BALOO

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

-#include <nepomuk2/filemetadatawidget.h>
+#include <Baloo/FileMetaDataWidget>

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


@@ -42,19 +43,13 @@
 
 #include <Phonon/BackendCapabilities>
 #include <Phonon/MediaObject>
 
 #include <Phonon/BackendCapabilities>
 #include <Phonon/MediaObject>

-#include <Phonon/SeekSlider>

 
 

-#include <QEvent>

 #include <QLabel>
 #include <QLabel>

-#include <QPixmap>
-#include <QPointer>
-#include <QResizeEvent>

 #include <QScrollArea>
 #include <QScrollArea>

-#include <QTextDocument>

 #include <QTextLayout>
 #include <QTextLayout>

-#include <QTextLine>

 #include <QTimer>
 #include <QVBoxLayout>
 #include <QTimer>
 #include <QVBoxLayout>

+#include <QStyle>

 
 #include "dolphin_informationpanelsettings.h"
 #include "filemetadataconfigurationdialog.h"
 
 #include "dolphin_informationpanelsettings.h"
 #include "filemetadataconfigurationdialog.h"


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

-    m_pendingPreview(false),
-    m_outdatedPreviewTimer(0),
-    m_preview(0),
-    m_phononWidget(0),
-    m_nameLabel(0),
-    m_metaDataWidget(0),
-    m_metaDataArea(0),
-    m_placesItemModel(0)
+    m_previewJob(nullptr),
+    m_outdatedPreviewTimer(nullptr),
+    m_preview(nullptr),
+    m_phononWidget(nullptr),
+    m_nameLabel(nullptr),
+    m_metaDataWidget(nullptr),
+    m_metaDataArea(nullptr),
+    m_placesItemModel(nullptr)

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


@@ -81,11 +76,10 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_outdatedPreviewTimer = new QTimer(this);
     m_outdatedPreviewTimer->setInterval(300);
     m_outdatedPreviewTimer->setSingleShot(true);
     m_outdatedPreviewTimer = new QTimer(this);
     m_outdatedPreviewTimer->setInterval(300);
     m_outdatedPreviewTimer->setSingleShot(true);

-    connect(m_outdatedPreviewTimer, SIGNAL(timeout()),
-            this, SLOT(markOutdatedPreview()));
+    connect(m_outdatedPreviewTimer, &QTimer::timeout,
+            this, &InformationPanelContent::markOutdatedPreview);

 
     QVBoxLayout* layout = new QVBoxLayout(this);
 
     QVBoxLayout* layout = new QVBoxLayout(this);

-    layout->setSpacing(KDialog::spacingHint());

 
     // preview
     const int minPreviewWidth = KIconLoader::SizeEnormous + KIconLoader::SizeMedium;
 
     // preview
     const int minPreviewWidth = KIconLoader::SizeEnormous + KIconLoader::SizeMedium;


@@ -97,8 +91,8 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_phononWidget = new PhononWidget(parent);
     m_phononWidget->hide();
     m_phononWidget->setMinimumWidth(minPreviewWidth);
     m_phononWidget = new PhononWidget(parent);
     m_phononWidget->hide();
     m_phononWidget->setMinimumWidth(minPreviewWidth);

-    connect(m_phononWidget, SIGNAL(hasVideoChanged(bool)),
-            this, SLOT(slotHasVideoChanged(bool)));
+    connect(m_phononWidget, &PhononWidget::hasVideoChanged,
+            this, &InformationPanelContent::slotHasVideoChanged);

 
     // name
     m_nameLabel = new QLabel(parent);
 
     // name
     m_nameLabel = new QLabel(parent);


@@ -107,19 +101,22 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_nameLabel->setFont(font);
     m_nameLabel->setTextFormat(Qt::PlainText);
     m_nameLabel->setAlignment(Qt::AlignHCenter);
     m_nameLabel->setFont(font);
     m_nameLabel->setTextFormat(Qt::PlainText);
     m_nameLabel->setAlignment(Qt::AlignHCenter);

-    m_nameLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    m_nameLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);

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

-#ifndef HAVE_NEPOMUK
+#ifndef HAVE_BALOO

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

+    connect(m_metaDataWidget, &KFileMetaDataWidget::urlActivated,
+            this, &InformationPanelContent::urlActivated);

 #else
 #else

-    m_metaDataWidget = new Nepomuk2::FileMetaDataWidget(parent);
+    m_metaDataWidget = new Baloo::FileMetaDataWidget(parent);
+    connect(m_metaDataWidget, &Baloo::FileMetaDataWidget::urlActivated,
+            this, &InformationPanelContent::urlActivated);

 #endif
 #endif

-    m_metaDataWidget->setFont(KGlobalSettings::smallestReadableFont());
+    m_metaDataWidget->setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));

     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);

-    connect(m_metaDataWidget, SIGNAL(urlActivated(KUrl)), this, SIGNAL(urlActivated(KUrl)));

 
     // Encapsulate the MetaDataWidget inside a container that has a dummy widget
     // at the bottom. This prevents that the meta data widget gets vertically stretched
 
     // Encapsulate the MetaDataWidget inside a container that has a dummy widget
     // at the bottom. This prevents that the meta data widget gets vertically stretched


@@ -139,10 +136,6 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     QWidget* viewport = m_metaDataArea->viewport();
     viewport->installEventFilter(this);
 
     QWidget* viewport = m_metaDataArea->viewport();
     viewport->installEventFilter(this);
 

-    QPalette palette = viewport->palette();
-    palette.setColor(viewport->backgroundRole(), QColor(Qt::transparent));
-    viewport->setPalette(palette);
-

     layout->addWidget(m_preview);
     layout->addWidget(m_phononWidget);
     layout->addWidget(m_nameLabel);
     layout->addWidget(m_preview);
     layout->addWidget(m_phononWidget);
     layout->addWidget(m_nameLabel);


@@ -154,50 +147,49 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
 
 InformationPanelContent::~InformationPanelContent()
 {
 
 InformationPanelContent::~InformationPanelContent()
 {

-    InformationPanelSettings::self()->writeConfig();
+    InformationPanelSettings::self()->save();

 }
 
 void InformationPanelContent::showItem(const KFileItem& item)
 {
 }
 
 void InformationPanelContent::showItem(const KFileItem& item)
 {

-    m_pendingPreview = false;
-
-    const KUrl itemUrl = item.url();
-    const bool isSearchUrl = itemUrl.protocol().contains("search") && item.nepomukUri().isEmpty();
-    if (!applyPlace(itemUrl)) {
-        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)
-            KIconLoader iconLoader;
-            QPixmap icon = iconLoader.loadIcon("nepomuk",
-                                               KIconLoader::NoGroup,
-                                               KIconLoader::SizeEnormous);
-            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
-            // can be shown within a short timeframe. This timer is not started
-            // for directories, as directory previews might fail and return the
-            // same icon.
-            if (!item.isDir()) {
-                m_outdatedPreviewTimer->start();
-            }
+    // 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();
+    }

 
 

-            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);
-            }
+    const QUrl itemUrl = item.url();
+    const bool isSearchUrl = itemUrl.scheme().contains(QStringLiteral("search")) && item.localPath().isEmpty();
+    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)
+        m_preview->setPixmap(
+            QIcon::fromTheme(QStringLiteral("nepomuk")).pixmap(KIconLoader::SizeEnormous, KIconLoader::SizeEnormous)
+        );
+    } else {
+        // try to get a preview pixmap from the item...
+
+        // Mark the currently shown preview as outdated. This is done
+        // with a small delay to prevent a flickering when the next preview
+        // can be shown within a short timeframe. This timer is not started
+        // for directories, as directory previews might fail and return the
+        // same icon.
+        if (!item.isDir()) {
+            m_outdatedPreviewTimer->start();
+        }

 
 

-            connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)),
-                    this, SLOT(showPreview(KFileItem,QPixmap)));
-            connect(job, SIGNAL(failed(KFileItem)),
-                    this, SLOT(showIcon(KFileItem)));
+        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->uiDelegate()) {
+            KJobWidgets::setWindow(m_previewJob, this);

         }
         }

+
+        connect(m_previewJob.data(), &KIO::PreviewJob::gotPreview,
+                this, &InformationPanelContent::showPreview);
+        connect(m_previewJob.data(), &KIO::PreviewJob::failed,
+                this, &InformationPanelContent::showIcon);

     }
 
     if (m_metaDataWidget) {
     }
 
     if (m_metaDataWidget) {


@@ -207,7 +199,7 @@ void InformationPanelContent::showItem(const KFileItem& item)
 
     if (InformationPanelSettings::previewsShown()) {
         const QString mimeType = item.mimetype();
 
     if (InformationPanelSettings::previewsShown()) {
         const QString mimeType = item.mimetype();

-        const bool usePhonon = mimeType.startsWith("audio/") || mimeType.startsWith("video/");
+        const bool usePhonon = mimeType.startsWith(QLatin1String("audio/")) || mimeType.startsWith(QLatin1String("video/"));

         if (usePhonon) {
             m_phononWidget->show();
             m_phononWidget->setUrl(item.targetUrl());
         if (usePhonon) {
             m_phononWidget->show();
             m_phononWidget->setUrl(item.targetUrl());


@@ -227,13 +219,15 @@ 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);
+    m_preview->setPixmap(
+        QIcon::fromTheme(QStringLiteral("dialog-information")).pixmap(KIconLoader::SizeEnormous, KIconLoader::SizeEnormous)
+    );

     setNameLabelText(i18ncp("@label", "%1 item selected", "%1 items selected", items.count()));
 
     if (m_metaDataWidget) {
     setNameLabelText(i18ncp("@label", "%1 item selected", "%1 items selected", items.count()));
 
     if (m_metaDataWidget) {


@@ -264,6 +258,10 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
         adjustWidgetSizes(parentWidget()->width());
         break;
 
         adjustWidgetSizes(parentWidget()->width());
         break;
 

+    case QEvent::FontChange:
+        m_metaDataWidget->setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
+        break;
+

     default:
         break;
     }
     default:
         break;
     }


@@ -273,15 +271,15 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
 
 void InformationPanelContent::configureSettings(const QList<QAction*>& customContextMenuActions)
 {
 
 void InformationPanelContent::configureSettings(const QList<QAction*>& customContextMenuActions)
 {

-    KMenu popup(this);
+    QMenu popup(this);

 
     QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview"));
 
     QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview"));

-    previewAction->setIcon(KIcon("view-preview"));
+    previewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));

     previewAction->setCheckable(true);
     previewAction->setChecked(InformationPanelSettings::previewsShown());
 
     QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));
     previewAction->setCheckable(true);
     previewAction->setChecked(InformationPanelSettings::previewsShown());
 
     QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));

-    configureAction->setIcon(KIcon("configure"));
+    configureAction->setIcon(QIcon::fromTheme(QStringLiteral("configure")));

 
     popup.addSeparator();
     foreach (QAction* action, customContextMenuActions) {
 
     popup.addSeparator();
     foreach (QAction* action, customContextMenuActions) {


@@ -300,26 +298,22 @@ void InformationPanelContent::configureSettings(const QList<QAction*>& customCon
         m_preview->setVisible(isChecked);
         InformationPanelSettings::setPreviewsShown(isChecked);
     } else if (action == configureAction) {
         m_preview->setVisible(isChecked);
         InformationPanelSettings::setPreviewsShown(isChecked);
     } else if (action == configureAction) {

-        FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog();
+        FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog(this);

         dialog->setDescription(i18nc("@label::textbox",
                                      "Select which data should be shown in the information panel:"));
         dialog->setItems(m_metaDataWidget->items());
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
         dialog->setDescription(i18nc("@label::textbox",
                                      "Select which data should be shown in the information panel:"));
         dialog->setItems(m_metaDataWidget->items());
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();

-        dialog->raise();
-        dialog->activateWindow();
-        connect(dialog, SIGNAL(destroyed()), this, SLOT(refreshMetaData()));
+        connect(dialog, &FileMetaDataConfigurationDialog::destroyed, this, &InformationPanelContent::refreshMetaData);

     }
 }
 
 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));
-    }
+    QPixmap pixmap = QIcon::fromTheme(item.iconName()).pixmap(KIconLoader::SizeEnormous, KIconLoader::SizeEnormous);
+    KIconLoader::global()->drawOverlays(item.overlays(), pixmap, KIconLoader::Desktop);
+    m_preview->setPixmap(pixmap);

 }
 
 void InformationPanelContent::showPreview(const KFileItem& item,
 }
 
 void InformationPanelContent::showPreview(const KFileItem& item,


@@ -327,12 +321,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()


@@ -351,26 +343,11 @@ 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);
     }
 }
 

-bool InformationPanelContent::applyPlace(const KUrl& url)
-{
-    const int count = m_placesItemModel->count();
-    for (int i = 0; i < count; ++i) {
-        const PlacesItem* item = m_placesItemModel->placesItem(i);
-        if (item->url().equals(url, KUrl::CompareWithoutTrailingSlash)) {
-            setNameLabelText(item->text());
-            m_preview->setPixmap(KIcon(item->icon()).pixmap(128, 128));
-            return true;
-        }
-    }
-
-    return false;
-}
-

 void InformationPanelContent::setNameLabelText(const QString& text)
 {
     QTextOption textOption;
 void InformationPanelContent::setNameLabelText(const QString& text)
 {
     QTextOption textOption;


@@ -390,7 +367,7 @@ void InformationPanelContent::setNameLabelText(const QString& text)
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_nameLabel->width());
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_nameLabel->width());

-        wrappedText += processedText.mid(line.textStart(), line.textLength());
+        wrappedText += processedText.midRef(line.textStart(), line.textLength());

 
         line = textLayout.createLine();
         if (line.isValid()) {
 
         line = textLayout.createLine();
         if (line.isValid()) {


@@ -409,7 +386,7 @@ void InformationPanelContent::adjustWidgetSizes(int width)
     // so that the width of the information panel gets increased.
     // To prevent this, the maximum width is adjusted to
     // the current width of the panel.
     // so that the width of the information panel gets increased.
     // To prevent this, the maximum width is adjusted to
     // the current width of the panel.

-    const int maxWidth = width - KDialog::spacingHint() * 4;
+    const int maxWidth = width - style()->layoutSpacing(QSizePolicy::DefaultType, QSizePolicy::DefaultType, Qt::Horizontal) * 4;

     m_nameLabel->setMaximumWidth(maxWidth);
 
     // The metadata widget also contains a text widget which may return
     m_nameLabel->setMaximumWidth(maxWidth);
 
     // The metadata widget also contains a text widget which may return


@@ -427,4 +404,3 @@ void InformationPanelContent::adjustWidgetSizes(int width)
     }
 }
 
     }
 }
 

-#include "informationpanelcontent.moc"