[InformationPanel] Remove obsolete intermediate wrapper widget/layout

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

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 75052021bbd35ab0137c20e6ee3305ae07c56e41..6e718f961dc74f0e7f366f06e1b26d0e0128f920 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -19,61 +19,48 @@
 
 #include "informationpanelcontent.h"
 
 
 #include "informationpanelcontent.h"
 

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

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

-#include <KJobWidgets>

 #include <KIconEffect>
 #include <KIconLoader>
 #include <KIconEffect>
 #include <KIconLoader>

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

 #include <KStringHandler>
 
 #include <KStringHandler>
 

-#ifndef HAVE_BALOO
-#include <KFileMetaDataWidget>
-#else
+#include <QIcon>
+#include <QTextDocument>
+

 #include <Baloo/FileMetaDataWidget>
 #include <Baloo/FileMetaDataWidget>

-#endif

 
 #include <panels/places/placesitem.h>
 #include <panels/places/placesitemmodel.h>
 
 #include <Phonon/BackendCapabilities>
 #include <Phonon/MediaObject>
 
 #include <panels/places/placesitem.h>
 #include <panels/places/placesitemmodel.h>
 
 #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 "dolphin_informationpanelsettings.h"

-#include "filemetadataconfigurationdialog.h"

 #include "phononwidget.h"
 #include "pixmapviewer.h"
 
 InformationPanelContent::InformationPanelContent(QWidget* parent) :
     QWidget(parent),
     m_item(),
 #include "phononwidget.h"
 #include "pixmapviewer.h"
 
 InformationPanelContent::InformationPanelContent(QWidget* parent) :
     QWidget(parent),
     m_item(),

-    m_previewJob(0),
-    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);
 


@@ -87,7 +74,6 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
             this, &InformationPanelContent::markOutdatedPreview);
 
     QVBoxLayout* layout = new QVBoxLayout(this);
             this, &InformationPanelContent::markOutdatedPreview);
 
     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;


@@ -109,45 +95,26 @@ 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_BALOO
-    m_metaDataWidget = new KFileMetaDataWidget(parent);
-    connect(m_metaDataWidget, &KFileMetaDataWidget::urlActivated,
-            this, &InformationPanelContent::urlActivated);
-#else

     m_metaDataWidget = new Baloo::FileMetaDataWidget(parent);
     m_metaDataWidget = new Baloo::FileMetaDataWidget(parent);

+    m_metaDataWidget->setDateFormat(static_cast<Baloo::DateFormats>(InformationPanelSettings::dateFormat()));

     connect(m_metaDataWidget, &Baloo::FileMetaDataWidget::urlActivated,
             this, &InformationPanelContent::urlActivated);
     connect(m_metaDataWidget, &Baloo::FileMetaDataWidget::urlActivated,
             this, &InformationPanelContent::urlActivated);

-#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);
 

-    // Encapsulate the MetaDataWidget inside a container that has a dummy widget
-    // at the bottom. This prevents that the meta data widget gets vertically stretched
-    // in the case where the height of m_metaDataArea > m_metaDataWidget.
-    QWidget* metaDataWidgetContainer = new QWidget(parent);
-    QVBoxLayout* containerLayout = new QVBoxLayout(metaDataWidgetContainer);
-    containerLayout->setContentsMargins(0, 0, 0, 0);
-    containerLayout->setSpacing(0);
-    containerLayout->addWidget(m_metaDataWidget);
-    containerLayout->addStretch();
-

     m_metaDataArea = new QScrollArea(parent);
     m_metaDataArea = new QScrollArea(parent);

-    m_metaDataArea->setWidget(metaDataWidgetContainer);
+    m_metaDataArea->setWidget(m_metaDataWidget);

     m_metaDataArea->setWidgetResizable(true);
     m_metaDataArea->setFrameShape(QFrame::NoFrame);
 
     QWidget* viewport = m_metaDataArea->viewport();
     viewport->installEventFilter(this);
 
     m_metaDataArea->setWidgetResizable(true);
     m_metaDataArea->setFrameShape(QFrame::NoFrame);
 
     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);


@@ -159,10 +126,18 @@ 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_item = item;
+
+    refreshPreview();
+    refreshMetaData();
+}
+
+void InformationPanelContent::refreshPreview()

 {
     // 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 there is a preview job, kill it to prevent that we have jobs for
     // multiple items running, and thus a race condition (bug 250787).


@@ -170,18 +145,18 @@ void InformationPanelContent::showItem(const KFileItem& item)
         m_previewJob->kill();
     }
 
         m_previewJob->kill();
     }
 

-    const KUrl itemUrl = item.url();
-    const bool isSearchUrl = itemUrl.protocol().contains("search") && item.localPath().isEmpty();
-    if (!applyPlace(itemUrl)) {
-        setNameLabelText(item.text());
+    setNameLabelText(m_item.text());
+    if (InformationPanelSettings::previewsShown()) {
+        m_preview->show();
+
+        const QUrl itemUrl = m_item.url();
+        const bool isSearchUrl = itemUrl.scheme().contains(QStringLiteral("search")) && m_item.localPath().isEmpty();

         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)

-            KIconLoader iconLoader;
-            QPixmap icon = iconLoader.loadIcon("nepomuk",
-                                               KIconLoader::NoGroup,
-                                               KIconLoader::SizeEnormous);
-            m_preview->setPixmap(icon);
+            m_preview->setPixmap(
+                QIcon::fromTheme(QStringLiteral("nepomuk")).pixmap(KIconLoader::SizeEnormous, KIconLoader::SizeEnormous)
+            );

         } else {
             // try to get a preview pixmap from the item...
 
         } else {
             // try to get a preview pixmap from the item...
 


@@ -190,14 +165,17 @@ void InformationPanelContent::showItem(const KFileItem& item)
             // can be shown within a short timeframe. This timer is not started
             // for directories, as directory previews might fail and return the
             // same icon.
             // 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()) {
+            if (!m_item.isDir()) {

                 m_outdatedPreviewTimer->start();
             }
 
                 m_outdatedPreviewTimer->start();
             }
 

-            m_previewJob = new KIO::PreviewJob(KFileItemList() << item, QSize(m_preview->width(), m_preview->height()));
+            QStringList plugins = KIO::PreviewJob::availablePlugins();
+            m_previewJob = new KIO::PreviewJob(KFileItemList() << m_item,
+                                               QSize(m_preview->width(), m_preview->height()),
+                                               &plugins);

             m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);
             m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);

-            m_previewJob->setIgnoreMaximumSize(item.isLocalFile());
-            if (m_previewJob->ui()) {
+            m_previewJob->setIgnoreMaximumSize(m_item.isLocalFile());
+            if (m_previewJob->uiDelegate()) {

                 KJobWidgets::setWindow(m_previewJob, this);
             }
 
                 KJobWidgets::setWindow(m_previewJob, this);
             }
 


@@ -205,32 +183,28 @@ void InformationPanelContent::showItem(const KFileItem& item)
                     this, &InformationPanelContent::showPreview);
             connect(m_previewJob.data(), &KIO::PreviewJob::failed,
                     this, &InformationPanelContent::showIcon);
                     this, &InformationPanelContent::showPreview);
             connect(m_previewJob.data(), &KIO::PreviewJob::failed,
                     this, &InformationPanelContent::showIcon);

-        }
-    }
-
-    if (m_metaDataWidget) {
-        m_metaDataWidget->show();
-        m_metaDataWidget->setItems(KFileItemList() << item);
-    }

 
 

-    if (InformationPanelSettings::previewsShown()) {
-        const QString mimeType = item.mimetype();
-        const bool usePhonon = mimeType.startsWith("audio/") || mimeType.startsWith("video/");
-        if (usePhonon) {
-            m_phononWidget->show();
-            m_phononWidget->setUrl(item.targetUrl());
-            if (m_preview->isVisible()) {
+            const QString mimeType = m_item.mimetype();
+            const bool usePhonon = mimeType.startsWith(QLatin1String("audio/")) || mimeType.startsWith(QLatin1String("video/"));
+            if (usePhonon) {
+                m_phononWidget->show();
+                m_phononWidget->setUrl(m_item.targetUrl());

                 m_phononWidget->setVideoSize(m_preview->size());
                 m_phononWidget->setVideoSize(m_preview->size());

+            } else {
+                m_phononWidget->hide();

             }
             }

-        } else {
-            m_phononWidget->hide();
-            m_preview->setVisible(true);

         }
     } else {
         }
     } else {

+        m_preview->hide();

         m_phononWidget->hide();
     }
         m_phononWidget->hide();
     }

+}

 
 

-    m_item = item;
+void InformationPanelContent::refreshMetaData()
+{
+    m_metaDataWidget->setDateFormat(static_cast<Baloo::DateFormats>(InformationPanelSettings::dateFormat()));
+    m_metaDataWidget->show();
+    m_metaDataWidget->setItems(KFileItemList() << m_item);

 }
 
 void InformationPanelContent::showItems(const KFileItemList& items)
 }
 
 void InformationPanelContent::showItems(const KFileItemList& items)


@@ -241,16 +215,12 @@ void InformationPanelContent::showItems(const KFileItemList& items)
         m_previewJob->kill();
     }
 
         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()));
 
     setNameLabelText(i18ncp("@label", "%1 item selected", "%1 items selected", items.count()));
 

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

 
     m_phononWidget->hide();
 
 
     m_phononWidget->hide();
 


@@ -277,7 +247,7 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
         break;
 
     case QEvent::FontChange:
         break;
 
     case QEvent::FontChange:

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

         break;
 
     default:
         break;
 
     default:


@@ -287,54 +257,12 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
     return QWidget::eventFilter(obj, event);
 }
 
     return QWidget::eventFilter(obj, event);
 }
 

-void InformationPanelContent::configureSettings(const QList<QAction*>& customContextMenuActions)
-{
-    KMenu popup(this);
-
-    QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview"));
-    previewAction->setIcon(QIcon::fromTheme("view-preview"));
-    previewAction->setCheckable(true);
-    previewAction->setChecked(InformationPanelSettings::previewsShown());
-
-    QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));
-    configureAction->setIcon(KIcon("configure"));
-
-    popup.addSeparator();
-    foreach (QAction* action, customContextMenuActions) {
-        popup.addAction(action);
-    }
-
-    // Open the popup and adjust the settings for the
-    // selected action.
-    QAction* action = popup.exec(QCursor::pos());
-    if (!action) {
-        return;
-    }
-
-    const bool isChecked = action->isChecked();
-    if (action == previewAction) {
-        m_preview->setVisible(isChecked);
-        InformationPanelSettings::setPreviewsShown(isChecked);
-    } else if (action == configureAction) {
-        FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog();
-        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, &FileMetaDataConfigurationDialog::destroyed, this, &InformationPanelContent::refreshMetaData);
-    }
-}
-

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

-    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,


@@ -357,31 +285,14 @@ void InformationPanelContent::markOutdatedPreview()
     m_preview->setPixmap(disabledPixmap);
 }
 
     m_preview->setPixmap(disabledPixmap);
 }
 

-void InformationPanelContent::slotHasVideoChanged(bool hasVideo)
-{
-    m_preview->setVisible(!hasVideo);
-}
-
-void InformationPanelContent::refreshMetaData()
+KFileItemList InformationPanelContent::items()

 {
 {

-    if (!m_item.isNull()) {
-        showItem(m_item);
-    }
+    return m_metaDataWidget->items();

 }
 
 }
 

-bool InformationPanelContent::applyPlace(const KUrl& url)
+void InformationPanelContent::slotHasVideoChanged(bool hasVideo)

 {
 {

-    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;
+    m_preview->setVisible(InformationPanelSettings::previewsShown() && !hasVideo);

 }
 
 void InformationPanelContent::setNameLabelText(const QString& text)
 }
 
 void InformationPanelContent::setNameLabelText(const QString& text)


@@ -403,7 +314,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()) {


@@ -422,14 +333,12 @@ 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
     // a large preferred width.
     m_nameLabel->setMaximumWidth(maxWidth);
 
     // The metadata widget also contains a text widget which may return
     // a large preferred width.

-    if (m_metaDataWidget) {
-        m_metaDataWidget->setMaximumWidth(maxWidth);
-    }
+    m_metaDataWidget->setMaximumWidth(maxWidth);

 
     // try to increase the preview as large as possible
     m_preview->setSizeHint(QSize(maxWidth, maxWidth));
 
     // try to increase the preview as large as possible
     m_preview->setSizeHint(QSize(maxWidth, maxWidth));