Add settings page for Panels

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

diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index f843e7f4624016332e4fcd3f432ff64b91172c0f..02fe3e308ae4f58bea4c56139a353c051832ef6a 100644 (file)
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -8,35 +8,34 @@
 
 #include "informationpanelcontent.h"
 
 
 #include "informationpanelcontent.h"
 

-#include <KIO/Job>
-#include <KIO/JobUiDelegate>
-#include <KJobWidgets>

 #include <KDirNotify>
 #include <KDirNotify>

+#include <KIO/StatJob>
+#include <KJobWidgets>

 #include <KLocalizedString>
 
 #include <Baloo/FileMetaDataWidget>
 
 #include <QApplication>
 #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_fileItem(),
-    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)

 {
 }
 
 {
 }
 


@@ -44,10 +43,9 @@ InformationPanel::~InformationPanel()
 {
 }
 
 {
 }
 

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

 {
     m_selection = selection;
 {
     m_selection = selection;

-    m_fileItem = KFileItem();

 
     if (!isVisible()) {
         return;
 
     if (!isVisible()) {
         return;


@@ -59,17 +57,18 @@ void InformationPanel::setSelection(const KFileItemList& selection)
             m_shownUrl = url();
             showItemInfo();
         }
             m_shownUrl = url();
             showItemInfo();
         }

+        m_infoTimer->stop();

     } else {
         if ((count == 1) && !selection.first().url().isEmpty()) {
             m_urlCandidate = selection.first().url();
         }
     } else {
         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() || (item.isNull() && m_fileItem.isNull())) {
+    if (!isVisible() || !InformationPanelSettings::showHovered()) {

         return;
     }
 
         return;
     }
 


@@ -79,21 +78,15 @@ void InformationPanel::requestDelayedItemInfo(const KFileItem& item)
         return;
     }
 
         return;
     }
 

-    cancelRequest();
-

     if (item.isNull()) {
     if (item.isNull()) {

-        // The cursor is above the viewport. If files are selected,
-        // show information regarding the selection.
-        if (!m_selection.isEmpty()) {
-            m_fileItem = KFileItem();
-            m_infoTimer->start();
-        }
-    } else if (item.url().isValid() && !isEqualToShownUrl(item.url())) {
-        // The cursor is above an item that is not shown currently
-        m_urlCandidate = item.url();
-        m_fileItem = item;
-        m_infoTimer->start();
+        m_hoveredItem = KFileItem();
+        return;

     }
     }

+
+    cancelRequest();
+
+    m_hoveredItem = item;
+    m_infoTimer->start();

 }
 
 bool InformationPanel::urlChanged()
 }
 
 bool InformationPanel::urlChanged()


@@ -111,7 +104,6 @@ bool InformationPanel::urlChanged()
 
     if (!isEqualToShownUrl(url())) {
         m_shownUrl = url();
 
     if (!isEqualToShownUrl(url())) {
         m_shownUrl = url();

-        m_fileItem = KFileItem();

 
         // Update the content with a delay. This gives
         // the directory lister the chance to show the content
 
         // Update the content with a delay. This gives
         // the directory lister the chance to show the content


@@ -123,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()) {


@@ -139,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;


@@ -148,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);


@@ -158,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));


@@ -187,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;
     }


@@ -196,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,39 +220,42 @@ void InformationPanel::showItemInfo()
     }
 
     cancelRequest();
     }
 
     cancelRequest();

+    //qDebug() << "showItemInfo" << m_fileItem;

 
 

-    if (m_fileItem.isNull() && (m_selection.count() > 1)) {
+    if (m_hoveredItem.isNull() && (m_selection.count() > 1)) {

         // The information for a selection of items should be shown
         m_content->showItems(m_selection);
     } else {
         // The information for exactly one item should be shown
         KFileItem item;
         // The information for a selection of items should be shown
         m_content->showItems(m_selection);
     } else {
         // The information for exactly one item should be shown
         KFileItem item;

-        if (!m_fileItem.isNull()) {
-            item = m_fileItem;
+        if (!m_hoveredItem.isNull() && InformationPanelSettings::showHovered()) {
+            item = m_hoveredItem;

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

-        if (item.isNull()) {
-            // No item is hovered and no selection has been done: provide
-            // an item for the currently shown directory.
-            m_folderStatJob = KIO::statDetails(url(), KIO::StatJob::SourceSide, KIO::StatDefaultDetails | KIO::StatRecursiveSize, KIO::HideProgressInfo);
-            if (m_folderStatJob->uiDelegate()) {
-                KJobWidgets::setWindow(m_folderStatJob, this);
-            }
-            connect(m_folderStatJob, &KIO::Job::result,
-                    this, &InformationPanel::slotFolderStatFinished);
-        } else {
+        if (!item.isNull()) {
+            m_shownUrl = item.url();

             m_content->showItem(item);
             m_content->showItem(item);

+            return;

         }
         }

+
+        // No item is hovered and no selection has been done: provide
+        // an item for the currently shown directory.
+        m_shownUrl = url();
+        m_folderStatJob = KIO::stat(m_shownUrl, KIO::StatJob::SourceSide, KIO::StatDefaultDetails | KIO::StatRecursiveSize, KIO::HideProgressInfo);
+        if (m_folderStatJob->uiDelegate()) {
+            KJobWidgets::setWindow(m_folderStatJob, this);
+        }
+        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,19 +275,18 @@ void InformationPanel::reset()
         // the content to show the directory URL.
         m_selection.clear();
         m_shownUrl = url();
         // the content to show the directory URL.
         m_selection.clear();
         m_shownUrl = url();

-        m_fileItem = KFileItem();

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

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

 {
 {

-    if (m_shownUrl == QUrl::fromUserInput(source)) {
-        m_shownUrl = QUrl::fromUserInput(dest);
-        m_fileItem = KFileItem(m_shownUrl);
+    auto sourceUrl = QUrl::fromUserInput(source);
+    if (m_shownUrl == sourceUrl) {
+        auto destUrl = QUrl::fromUserInput(dest);

 
 

-        if ((m_selection.count() == 1) && (m_selection[0].url() == QUrl::fromLocalFile(source))) {
-            m_selection[0] = m_fileItem;
+        if ((m_selection.count() == 1) && (m_selection[0].url() == sourceUrl)) {
+            m_selection[0] = KFileItem(destUrl);

             // Implementation note: Updating the selection is only required if exactly one
             // 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
             // Implementation note: Updating the selection is only required if exactly one
             // 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


@@ -293,19 +297,26 @@ void InformationPanel::slotFileRenamed(const QString& source, const QString& des
     }
 }
 
     }
 }
 

-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,
         // the signal filesAdded("trash:/") will be emitted.
 {
     if (m_shownUrl == QUrl::fromUserInput(directory)) {
         // If the 'trash' icon changes because the trash has been emptied or got filled,
         // the signal filesAdded("trash:/") will be emitted.

-        KFileItem item(QUrl::fromUserInput(directory));
-        requestDelayedItemInfo(item);
+        requestDelayedItemInfo(KFileItem());

     }
 }
 
     }
 }
 

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

 {
 {

-    for (const QString& fileName : files) {
+    const auto item = changedFileItems.findByUrl(m_shownUrl);
+    if (!item.isNull()) {
+        showItemInfo();
+    }
+}
+
+void InformationPanel::slotFilesChanged(const QStringList &files)
+{
+    for (const QString &fileName : files) {

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


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


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

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

 {
 {

-    if (m_shownUrl == QUrl::fromUserInput(directory)) {
-        KFileItem item(QUrl::fromUserInput(directory));
-        requestDelayedItemInfo(item);
-    }
+    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


@@ -359,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);
 }


@@ -370,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);


@@ -404,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"