Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

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

diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index a0dff0d5e25adacc97c3c6055ce980e45c3eb862..8adb64ff05b8a19b2964a6ffcff50cc92f9617e5 100644 (file)
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -8,8 +8,11 @@
 
 #include "informationpanelcontent.h"
 
+#define HAVE_KDIRNOTIFY __has_include(<KDirNotify>)
+#if HAVE_KDIRNOTIFY
 #include <KDirNotify>
-#include <KIO/Job>
+#endif
+#include <KIO/StatJob>
 #include <KJobWidgets>
 #include <KLocalizedString>
 
@@ -62,13 +65,13 @@ void InformationPanel::setSelection(const KFileItemList &selection)
         if ((count == 1) && !selection.first().url().isEmpty()) {
             m_urlCandidate = selection.first().url();
         }
-        m_infoTimer->start();
+        showItemInfo();
     }
 }
 
 void InformationPanel::requestDelayedItemInfo(const KFileItem &item)
 {
-    if (!isVisible()) {
+    if (!isVisible() || !InformationPanelSettings::showHovered()) {
         return;
     }
 
@@ -160,7 +163,12 @@ void InformationPanel::showContextMenu(const QPoint &pos)
     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);
@@ -188,18 +196,23 @@ void InformationPanel::showContextMenu(const QPoint &pos)
     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();
-    }
-    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();
-    } else if (action == previewAutoPlayAction) {
-        InformationPanelSettings::setPreviewsAutoPlay(isChecked);
-        m_content->setPreviewAutoPlay(isChecked);
     }
 }
 
@@ -218,7 +231,7 @@ void InformationPanel::showItemInfo()
     } 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);
@@ -234,7 +247,7 @@ void InformationPanel::showItemInfo()
         // 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);
         }
@@ -281,8 +294,6 @@ 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.
-        } else {
-            m_hoveredItem = KFileItem(destUrl);
         }
 
         showItemInfo();
@@ -370,6 +381,14 @@ void InformationPanel::markUrlAsInvalid()
     m_resetUrlTimer->start();
 }
 
+void InformationPanel::readSettings()
+{
+    if (m_initialized) {
+        m_content->refreshPreview();
+        m_content->refreshMetaData();
+    }
+}
+
 void InformationPanel::init()
 {
     m_infoTimer = new QTimer(this);
@@ -390,6 +409,7 @@ void InformationPanel::init()
     Q_ASSERT(m_urlChangedTimer->interval() < m_infoTimer->interval());
     Q_ASSERT(m_urlChangedTimer->interval() < m_resetUrlTimer->interval());
 
+#if HAVE_KDIRNOTIFY
     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);
@@ -397,6 +417,7 @@ void InformationPanel::init()
     connect(dirNotify, &OrgKdeKDirNotifyInterface::FilesRemoved, this, &InformationPanel::slotFilesRemoved);
     connect(dirNotify, &OrgKdeKDirNotifyInterface::enteredDirectory, this, &InformationPanel::slotEnteredDirectory);
     connect(dirNotify, &OrgKdeKDirNotifyInterface::leftDirectory, this, &InformationPanel::slotLeftDirectory);
+#endif
 
     m_content = new InformationPanelContent(this);
     connect(m_content, &InformationPanelContent::urlActivated, this, &InformationPanel::urlActivated);
@@ -411,3 +432,5 @@ void InformationPanel::init()
 
     m_initialized = true;
 }
+
+#include "moc_informationpanel.cpp"