Port from KIconLoader::drawOverlays to KIconUtils::addOverlays

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

diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index 31617bb5ea3338da51f898a78275a09518b94550..02fe3e308ae4f58bea4c56139a353c051832ef6a 100644 (file)
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -9,33 +9,33 @@
 #include "informationpanelcontent.h"
 
 #include <KDirNotify>
 #include "informationpanelcontent.h"
 
 #include <KDirNotify>

-#include <KIO/Job>
+#include <KIO/StatJob>

 #include <KJobWidgets>
 #include <KLocalizedString>
 
 #include <Baloo/FileMetaDataWidget>
 
 #include <QApplication>
 #include <KJobWidgets>
 #include <KLocalizedString>
 
 #include <Baloo/FileMetaDataWidget>
 
 #include <QApplication>

+#include <QMenu>

 #include <QShowEvent>
 #include <QShowEvent>

-#include <QVBoxLayout>

 #include <QTimer>
 #include <QTimer>

-#include <QMenu>
+#include <QVBoxLayout>

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

-InformationPanel::InformationPanel(QWidget* parent) :
-    Panel(parent),
-    m_initialized(false),
-    m_infoTimer(nullptr),
-    m_urlChangedTimer(nullptr),
-    m_resetUrlTimer(nullptr),
-    m_shownUrl(),
-    m_urlCandidate(),
-    m_invalidUrlCandidate(),
-    m_hoveredItem(),
-    m_selection(),
-    m_folderStatJob(nullptr),
-    m_content(nullptr)
+InformationPanel::InformationPanel(QWidget *parent)
+    : Panel(parent)
+    , m_initialized(false)
+    , m_infoTimer(nullptr)
+    , m_urlChangedTimer(nullptr)
+    , m_resetUrlTimer(nullptr)
+    , m_shownUrl()
+    , m_urlCandidate()
+    , m_invalidUrlCandidate()
+    , m_hoveredItem()
+    , m_selection()
+    , m_folderStatJob(nullptr)
+    , m_content(nullptr)

 {
 }
 
 {
 }
 


@@ -43,7 +43,7 @@ InformationPanel::~InformationPanel()
 {
 }
 
 {
 }
 

-void InformationPanel::setSelection(const KFileItemList& selection)
+void InformationPanel::setSelection(const KFileItemList &selection)

 {
     m_selection = selection;
 
 {
     m_selection = selection;
 


@@ -62,13 +62,13 @@ void InformationPanel::setSelection(const KFileItemList& selection)
         if ((count == 1) && !selection.first().url().isEmpty()) {
             m_urlCandidate = selection.first().url();
         }
         if ((count == 1) && !selection.first().url().isEmpty()) {
             m_urlCandidate = selection.first().url();
         }

-        m_infoTimer->start();
+        showItemInfo();

     }
 }
 
     }
 }
 

-void InformationPanel::requestDelayedItemInfo(const KFileItem& item)
+void InformationPanel::requestDelayedItemInfo(const KFileItem &item)

 {
 {

-    if (!isVisible()) {
+    if (!isVisible() || !InformationPanelSettings::showHovered()) {

         return;
     }
 
         return;
     }
 


@@ -115,7 +115,7 @@ bool InformationPanel::urlChanged()
     return true;
 }
 
     return true;
 }
 

-void InformationPanel::showEvent(QShowEvent* event)
+void InformationPanel::showEvent(QShowEvent *event)

 {
     Panel::showEvent(event);
     if (!event->spontaneous()) {
 {
     Panel::showEvent(event);
     if (!event->spontaneous()) {


@@ -131,7 +131,7 @@ void InformationPanel::showEvent(QShowEvent* event)
     }
 }
 
     }
 }
 

-void InformationPanel::resizeEvent(QResizeEvent* event)
+void InformationPanel::resizeEvent(QResizeEvent *event)

 {
     if (isVisible()) {
         m_urlCandidate = m_shownUrl;
 {
     if (isVisible()) {
         m_urlCandidate = m_shownUrl;


@@ -140,7 +140,7 @@ void InformationPanel::resizeEvent(QResizeEvent* event)
     Panel::resizeEvent(event);
 }
 
     Panel::resizeEvent(event);
 }
 

-void InformationPanel::contextMenuEvent(QContextMenuEvent* event)
+void InformationPanel::contextMenuEvent(QContextMenuEvent *event)

 {
     showContextMenu(event->globalPos());
     Panel::contextMenuEvent(event);
 {
     showContextMenu(event->globalPos());
     Panel::contextMenuEvent(event);


@@ -150,23 +150,28 @@ void InformationPanel::showContextMenu(const QPoint &pos)
 {
     QMenu popup(this);
 
 {
     QMenu popup(this);
 

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

     previewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
     previewAction->setCheckable(true);
     previewAction->setChecked(InformationPanelSettings::previewsShown());
 
     previewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
     previewAction->setCheckable(true);
     previewAction->setChecked(InformationPanelSettings::previewsShown());
 

-    QAction* previewAutoPlayAction = popup.addAction(i18nc("@action:inmenu", "Auto-Play media files"));
+    QAction *previewAutoPlayAction = popup.addAction(i18nc("@action:inmenu", "Auto-Play media files"));

     previewAutoPlayAction->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-start")));
     previewAutoPlayAction->setCheckable(true);
     previewAutoPlayAction->setChecked(InformationPanelSettings::previewsAutoPlay());
 
     previewAutoPlayAction->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-start")));
     previewAutoPlayAction->setCheckable(true);
     previewAutoPlayAction->setChecked(InformationPanelSettings::previewsAutoPlay());
 

-    QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));
+    QAction *showHoveredAction = popup.addAction(i18nc("@action:inmenu", "Show item on hover"));
+    showHoveredAction->setIcon(QIcon::fromTheme(QStringLiteral("followmouse")));
+    showHoveredAction->setCheckable(true);
+    showHoveredAction->setChecked(InformationPanelSettings::showHovered());
+
+    QAction *configureAction = popup.addAction(i18nc("@action:inmenu", "Configure…"));

     configureAction->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
     if (m_inConfigurationMode) {
         configureAction->setEnabled(false);
     }
 
     configureAction->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
     if (m_inConfigurationMode) {
         configureAction->setEnabled(false);
     }
 

-    QAction* dateformatAction = popup.addAction(i18nc("@action:inmenu", "Condensed Date"));
+    QAction *dateformatAction = popup.addAction(i18nc("@action:inmenu", "Condensed Date"));

     dateformatAction->setIcon(QIcon::fromTheme(QStringLiteral("change-date-symbolic")));
     dateformatAction->setCheckable(true);
     dateformatAction->setChecked(InformationPanelSettings::dateFormat() == static_cast<int>(Baloo::DateFormats::ShortFormat));
     dateformatAction->setIcon(QIcon::fromTheme(QStringLiteral("change-date-symbolic")));
     dateformatAction->setCheckable(true);
     dateformatAction->setChecked(InformationPanelSettings::dateFormat() == static_cast<int>(Baloo::DateFormats::ShortFormat));


@@ -179,7 +184,7 @@ void InformationPanel::showContextMenu(const QPoint &pos)
 
     // Open the popup and adjust the settings for the
     // selected action.
 
     // Open the popup and adjust the settings for the
     // selected action.

-    QAction* action = popup.exec(pos);
+    QAction *action = popup.exec(pos);

     if (!action) {
         return;
     }
     if (!action) {
         return;
     }


@@ -188,18 +193,23 @@ void InformationPanel::showContextMenu(const QPoint &pos)
     if (action == previewAction) {
         InformationPanelSettings::setPreviewsShown(isChecked);
         m_content->refreshPreview();
     if (action == previewAction) {
         InformationPanelSettings::setPreviewsShown(isChecked);
         m_content->refreshPreview();

+    } else if (action == previewAutoPlayAction) {
+        InformationPanelSettings::setPreviewsAutoPlay(isChecked);
+        m_content->setPreviewAutoPlay(isChecked);
+    } else if (action == showHoveredAction) {
+        InformationPanelSettings::setShowHovered(isChecked);
+        if (!isChecked) {
+            m_hoveredItem = KFileItem();
+            showItemInfo();
+        }

     } else if (action == configureAction) {
         m_inConfigurationMode = true;
         m_content->configureShownProperties();
     } else if (action == configureAction) {
         m_inConfigurationMode = true;
         m_content->configureShownProperties();

-    }
-    if (action == dateformatAction) {
+    } else if (action == dateformatAction) {

         int dateFormat = static_cast<int>(isChecked ? Baloo::DateFormats::ShortFormat : Baloo::DateFormats::LongFormat);
 
         InformationPanelSettings::setDateFormat(dateFormat);
         m_content->refreshMetaData();
         int dateFormat = static_cast<int>(isChecked ? Baloo::DateFormats::ShortFormat : Baloo::DateFormats::LongFormat);
 
         InformationPanelSettings::setDateFormat(dateFormat);
         m_content->refreshMetaData();

-    } else if (action == previewAutoPlayAction) {
-        InformationPanelSettings::setPreviewsAutoPlay(isChecked);
-        m_content->setPreviewAutoPlay(isChecked);

     }
 }
 
     }
 }
 


@@ -218,7 +228,7 @@ void InformationPanel::showItemInfo()
     } else {
         // The information for exactly one item should be shown
         KFileItem item;
     } else {
         // The information for exactly one item should be shown
         KFileItem item;

-        if (!m_hoveredItem.isNull()) {
+        if (!m_hoveredItem.isNull() && InformationPanelSettings::showHovered()) {

             item = m_hoveredItem;
         } else if (!m_selection.isEmpty()) {
             Q_ASSERT(m_selection.count() == 1);
             item = m_hoveredItem;
         } else if (!m_selection.isEmpty()) {
             Q_ASSERT(m_selection.count() == 1);


@@ -234,19 +244,18 @@ void InformationPanel::showItemInfo()
         // No item is hovered and no selection has been done: provide
         // an item for the currently shown directory.
         m_shownUrl = url();
         // No item is hovered and no selection has been done: provide
         // an item for the currently shown directory.
         m_shownUrl = url();

-        m_folderStatJob = KIO::statDetails(m_shownUrl, KIO::StatJob::SourceSide, KIO::StatDefaultDetails | KIO::StatRecursiveSize, KIO::HideProgressInfo);
+        m_folderStatJob = KIO::stat(m_shownUrl, KIO::StatJob::SourceSide, KIO::StatDefaultDetails | KIO::StatRecursiveSize, KIO::HideProgressInfo);

         if (m_folderStatJob->uiDelegate()) {
             KJobWidgets::setWindow(m_folderStatJob, this);
         }
         if (m_folderStatJob->uiDelegate()) {
             KJobWidgets::setWindow(m_folderStatJob, this);
         }

-        connect(m_folderStatJob, &KIO::Job::result,
-                this, &InformationPanel::slotFolderStatFinished);
+        connect(m_folderStatJob, &KIO::Job::result, this, &InformationPanel::slotFolderStatFinished);

     }
 }
 
     }
 }
 

-void InformationPanel::slotFolderStatFinished(KJob* job)
+void InformationPanel::slotFolderStatFinished(KJob *job)

 {
     m_folderStatJob = nullptr;
 {
     m_folderStatJob = nullptr;

-    const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
+    const KIO::UDSEntry entry = static_cast<KIO::StatJob *>(job)->statResult();

     m_content->showItem(KFileItem(entry, m_shownUrl));
 }
 
     m_content->showItem(KFileItem(entry, m_shownUrl));
 }
 


@@ -270,7 +279,7 @@ void InformationPanel::reset()
     }
 }
 
     }
 }
 

-void InformationPanel::slotFileRenamed(const QString& source, const QString& dest)
+void InformationPanel::slotFileRenamed(const QString &source, const QString &dest)

 {
     auto sourceUrl = QUrl::fromUserInput(source);
     if (m_shownUrl == sourceUrl) {
 {
     auto sourceUrl = QUrl::fromUserInput(source);
     if (m_shownUrl == sourceUrl) {


@@ -282,15 +291,13 @@ void InformationPanel::slotFileRenamed(const QString& source, const QString& des
             // item is selected, as the name of the item is shown. If this should change
             // in future: Before parsing the whole selection take care to test possible
             // performance bottlenecks when renaming several hundreds of files.
             // item is selected, as the name of the item is shown. If this should change
             // in future: Before parsing the whole selection take care to test possible
             // performance bottlenecks when renaming several hundreds of files.

-        } else {
-            m_hoveredItem = KFileItem(destUrl);

         }
 
         showItemInfo();
     }
 }
 
         }
 
         showItemInfo();
     }
 }
 

-void InformationPanel::slotFilesAdded(const QString& directory)
+void InformationPanel::slotFilesAdded(const QString &directory)

 {
     if (m_shownUrl == QUrl::fromUserInput(directory)) {
         // If the 'trash' icon changes because the trash has been emptied or got filled,
 {
     if (m_shownUrl == QUrl::fromUserInput(directory)) {
         // If the 'trash' icon changes because the trash has been emptied or got filled,


@@ -307,9 +314,9 @@ void InformationPanel::slotFilesItemChanged(const KFileItemList &changedFileItem
     }
 }
 
     }
 }
 

-void InformationPanel::slotFilesChanged(const QStringList& files)
+void InformationPanel::slotFilesChanged(const QStringList &files)

 {
 {

-    for (const QString& fileName : files) {
+    for (const QString &fileName : files) {

         if (m_shownUrl == QUrl::fromUserInput(fileName)) {
             showItemInfo();
             break;
         if (m_shownUrl == QUrl::fromUserInput(fileName)) {
             showItemInfo();
             break;


@@ -317,9 +324,9 @@ void InformationPanel::slotFilesChanged(const QStringList& files)
     }
 }
 
     }
 }
 

-void InformationPanel::slotFilesRemoved(const QStringList& files)
+void InformationPanel::slotFilesRemoved(const QStringList &files)

 {
 {

-    for (const QString& fileName : files) {
+    for (const QString &fileName : files) {

         if (m_shownUrl == QUrl::fromUserInput(fileName)) {
             // the currently shown item has been removed, show
             // the parent directory as fallback
         if (m_shownUrl == QUrl::fromUserInput(fileName)) {
             // the currently shown item has been removed, show
             // the parent directory as fallback


@@ -329,12 +336,12 @@ void InformationPanel::slotFilesRemoved(const QStringList& files)
     }
 }
 
     }
 }
 

-void InformationPanel::slotEnteredDirectory(const QString& directory)
+void InformationPanel::slotEnteredDirectory(const QString &directory)

 {
     Q_UNUSED(directory)
 }
 
 {
     Q_UNUSED(directory)
 }
 

-void InformationPanel::slotLeftDirectory(const QString& directory)
+void InformationPanel::slotLeftDirectory(const QString &directory)

 {
     if (m_shownUrl == QUrl::fromUserInput(directory)) {
         // The signal 'leftDirectory' is also emitted when a media
 {
     if (m_shownUrl == QUrl::fromUserInput(directory)) {
         // The signal 'leftDirectory' is also emitted when a media


@@ -360,7 +367,7 @@ void InformationPanel::cancelRequest()
     m_urlCandidate.clear();
 }
 
     m_urlCandidate.clear();
 }
 

-bool InformationPanel::isEqualToShownUrl(const QUrl& url) const
+bool InformationPanel::isEqualToShownUrl(const QUrl &url) const

 {
     return m_shownUrl.matches(url, QUrl::StripTrailingSlash);
 }
 {
     return m_shownUrl.matches(url, QUrl::StripTrailingSlash);
 }


@@ -371,31 +378,35 @@ void InformationPanel::markUrlAsInvalid()
     m_resetUrlTimer->start();
 }
 
     m_resetUrlTimer->start();
 }
 

+void InformationPanel::readSettings()
+{
+    if (m_initialized) {
+        m_content->refreshPreview();
+        m_content->refreshMetaData();
+    }
+}
+

 void InformationPanel::init()
 {
     m_infoTimer = new QTimer(this);
     m_infoTimer->setInterval(300);
     m_infoTimer->setSingleShot(true);
 void InformationPanel::init()
 {
     m_infoTimer = new QTimer(this);
     m_infoTimer->setInterval(300);
     m_infoTimer->setSingleShot(true);

-    connect(m_infoTimer, &QTimer::timeout,
-            this, &InformationPanel::slotInfoTimeout);
+    connect(m_infoTimer, &QTimer::timeout, this, &InformationPanel::slotInfoTimeout);

 
     m_urlChangedTimer = new QTimer(this);
     m_urlChangedTimer->setInterval(200);
     m_urlChangedTimer->setSingleShot(true);
 
     m_urlChangedTimer = new QTimer(this);
     m_urlChangedTimer->setInterval(200);
     m_urlChangedTimer->setSingleShot(true);

-    connect(m_urlChangedTimer, &QTimer::timeout,
-            this, &InformationPanel::showItemInfo);
+    connect(m_urlChangedTimer, &QTimer::timeout, this, &InformationPanel::showItemInfo);

 
     m_resetUrlTimer = new QTimer(this);
     m_resetUrlTimer->setInterval(1000);
     m_resetUrlTimer->setSingleShot(true);
 
     m_resetUrlTimer = new QTimer(this);
     m_resetUrlTimer->setInterval(1000);
     m_resetUrlTimer->setSingleShot(true);

-    connect(m_resetUrlTimer, &QTimer::timeout,
-            this, &InformationPanel::reset);
+    connect(m_resetUrlTimer, &QTimer::timeout, this, &InformationPanel::reset);

 
     Q_ASSERT(m_urlChangedTimer->interval() < m_infoTimer->interval());
     Q_ASSERT(m_urlChangedTimer->interval() < m_resetUrlTimer->interval());
 
 
     Q_ASSERT(m_urlChangedTimer->interval() < m_infoTimer->interval());
     Q_ASSERT(m_urlChangedTimer->interval() < m_resetUrlTimer->interval());
 

-    org::kde::KDirNotify* dirNotify = new org::kde::KDirNotify(QString(), QString(),
-                                                               QDBusConnection::sessionBus(), this);
+    org::kde::KDirNotify *dirNotify = new org::kde::KDirNotify(QString(), QString(), QDBusConnection::sessionBus(), this);

     connect(dirNotify, &OrgKdeKDirNotifyInterface::FileRenamed, this, &InformationPanel::slotFileRenamed);
     connect(dirNotify, &OrgKdeKDirNotifyInterface::FilesAdded, this, &InformationPanel::slotFilesAdded);
     connect(dirNotify, &OrgKdeKDirNotifyInterface::FilesChanged, this, &InformationPanel::slotFilesChanged);
     connect(dirNotify, &OrgKdeKDirNotifyInterface::FileRenamed, this, &InformationPanel::slotFileRenamed);
     connect(dirNotify, &OrgKdeKDirNotifyInterface::FilesAdded, this, &InformationPanel::slotFilesAdded);
     connect(dirNotify, &OrgKdeKDirNotifyInterface::FilesChanged, this, &InformationPanel::slotFilesChanged);


@@ -405,13 +416,16 @@ void InformationPanel::init()
 
     m_content = new InformationPanelContent(this);
     connect(m_content, &InformationPanelContent::urlActivated, this, &InformationPanel::urlActivated);
 
     m_content = new InformationPanelContent(this);
     connect(m_content, &InformationPanelContent::urlActivated, this, &InformationPanel::urlActivated);

-    connect(m_content, &InformationPanelContent::configurationFinished, this, [this]() { m_inConfigurationMode = false; });
+    connect(m_content, &InformationPanelContent::configurationFinished, this, [this]() {
+        m_inConfigurationMode = false;
+    });

     connect(m_content, &InformationPanelContent::contextMenuRequested, this, &InformationPanel::showContextMenu);
 
     connect(m_content, &InformationPanelContent::contextMenuRequested, this, &InformationPanel::showContextMenu);
 

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

     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_content);
 
     m_initialized = true;
 }
 
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_content);
 
     m_initialized = true;
 }
 

+#include "moc_informationpanel.cpp"