#include "informationpanelcontent.h"
+#include <KDirNotify>
#include <KIO/Job>
-#include <KIO/JobUiDelegate>
#include <KJobWidgets>
-#include <KDirNotify>
#include <KLocalizedString>
#include <Baloo/FileMetaDataWidget>
#include <QApplication>
+#include <QMenu>
#include <QShowEvent>
-#include <QVBoxLayout>
#include <QTimer>
-#include <QMenu>
+#include <QVBoxLayout>
#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)
{
}
{
}
-void InformationPanel::setSelection(const KFileItemList& selection)
+void InformationPanel::setSelection(const KFileItemList &selection)
{
m_selection = selection;
- m_fileItem = KFileItem();
if (!isVisible()) {
return;
m_shownUrl = url();
showItemInfo();
}
+ m_infoTimer->stop();
} 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;
}
- cancelRequest();
-
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()
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
return true;
}
-void InformationPanel::showEvent(QShowEvent* event)
+void InformationPanel::showEvent(QShowEvent *event)
{
Panel::showEvent(event);
if (!event->spontaneous()) {
}
}
-void InformationPanel::resizeEvent(QResizeEvent* event)
+void InformationPanel::resizeEvent(QResizeEvent *event)
{
if (isVisible()) {
m_urlCandidate = m_shownUrl;
Panel::resizeEvent(event);
}
-void InformationPanel::contextMenuEvent(QContextMenuEvent* event)
+void InformationPanel::contextMenuEvent(QContextMenuEvent *event)
{
showContextMenu(event->globalPos());
Panel::contextMenuEvent(event);
{
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());
- 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());
- 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);
}
- 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));
// 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 == 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);
}
}
}
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;
- 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();
}
- 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);
+ 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;
- 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));
}
// the content to show the directory URL.
m_selection.clear();
m_shownUrl = url();
- m_fileItem = KFileItem();
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
}
}
-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.
- 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;
}
}
-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
}
}
-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
m_urlCandidate.clear();
}
-bool InformationPanel::isEqualToShownUrl(const QUrl& url) const
+bool InformationPanel::isEqualToShownUrl(const QUrl &url) const
{
return m_shownUrl.matches(url, QUrl::StripTrailingSlash);
}
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);
- 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);
- 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());
- 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);
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);
- QVBoxLayout* layout = new QVBoxLayout(this);
+ QVBoxLayout *layout = new QVBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(m_content);
m_initialized = true;
}
-
projects / dolphin.git / blobdiff