X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bc1a99bd11f4e1c054e55c8fde957ce0de89f989..e19aa49a082076d5ae69931893c1d47b98f85e30:/src/panels/information/informationpanel.cpp diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp index a864cb005..31617bb5e 100644 --- a/src/panels/information/informationpanel.cpp +++ b/src/panels/information/informationpanel.cpp @@ -1,30 +1,16 @@ -/*************************************************************************** - * Copyright (C) 2006-2009 by Peter Penz * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2006-2009 Peter Penz + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "informationpanel.h" #include "informationpanelcontent.h" +#include #include -#include #include -#include #include #include @@ -36,7 +22,6 @@ #include #include "dolphin_informationpanelsettings.h" -#include "filemetadataconfigurationdialog.h" InformationPanel::InformationPanel(QWidget* parent) : Panel(parent), @@ -47,7 +32,7 @@ InformationPanel::InformationPanel(QWidget* parent) : m_shownUrl(), m_urlCandidate(), m_invalidUrlCandidate(), - m_fileItem(), + m_hoveredItem(), m_selection(), m_folderStatJob(nullptr), m_content(nullptr) @@ -61,7 +46,6 @@ InformationPanel::~InformationPanel() void InformationPanel::setSelection(const KFileItemList& selection) { m_selection = selection; - m_fileItem = KFileItem(); if (!isVisible()) { return; @@ -73,6 +57,7 @@ void InformationPanel::setSelection(const KFileItemList& selection) m_shownUrl = url(); showItemInfo(); } + m_infoTimer->stop(); } else { if ((count == 1) && !selection.first().url().isEmpty()) { m_urlCandidate = selection.first().url(); @@ -83,7 +68,7 @@ void InformationPanel::setSelection(const KFileItemList& selection) void InformationPanel::requestDelayedItemInfo(const KFileItem& item) { - if (!isVisible() || (item.isNull() && m_fileItem.isNull())) { + if (!isVisible()) { return; } @@ -93,21 +78,15 @@ void InformationPanel::requestDelayedItemInfo(const KFileItem& item) 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() @@ -125,7 +104,6 @@ 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 @@ -168,7 +146,8 @@ void InformationPanel::contextMenuEvent(QContextMenuEvent* event) Panel::contextMenuEvent(event); } -void InformationPanel::showContextMenu(const QPoint &pos) { +void InformationPanel::showContextMenu(const QPoint &pos) +{ QMenu popup(this); QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview")); @@ -176,8 +155,16 @@ void InformationPanel::showContextMenu(const QPoint &pos) { previewAction->setCheckable(true); previewAction->setChecked(InformationPanelSettings::previewsShown()); + 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...")); configureAction->setIcon(QIcon::fromTheme(QStringLiteral("configure"))); + if (m_inConfigurationMode) { + configureAction->setEnabled(false); + } QAction* dateformatAction = popup.addAction(i18nc("@action:inmenu", "Condensed Date")); dateformatAction->setIcon(QIcon::fromTheme(QStringLiteral("change-date-symbolic"))); @@ -185,7 +172,8 @@ void InformationPanel::showContextMenu(const QPoint &pos) { dateformatAction->setChecked(InformationPanelSettings::dateFormat() == static_cast(Baloo::DateFormats::ShortFormat)); popup.addSeparator(); - foreach (QAction* action, customContextMenuActions()) { + const auto actions = customContextMenuActions(); + for (QAction *action : actions) { popup.addAction(action); } @@ -198,22 +186,20 @@ void InformationPanel::showContextMenu(const QPoint &pos) { const bool isChecked = action->isChecked(); if (action == previewAction) { - m_content->setPreviewVisible(isChecked); InformationPanelSettings::setPreviewsShown(isChecked); + m_content->refreshPreview(); } else if (action == configureAction) { - FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog(this); - dialog->setDescription(i18nc("@label::textbox", - "Select which data should be shown in the information panel:")); - dialog->setItems(m_content->items()); - dialog->setAttribute(Qt::WA_DeleteOnClose); - dialog->show(); - connect(dialog, &FileMetaDataConfigurationDialog::destroyed, m_content, &InformationPanelContent::refreshMetaData); + m_inConfigurationMode = true; + m_content->configureShownProperties(); } if (action == dateformatAction) { int dateFormat = static_cast(isChecked ? Baloo::DateFormats::ShortFormat : Baloo::DateFormats::LongFormat); InformationPanelSettings::setDateFormat(dateFormat); m_content->refreshMetaData(); + } else if (action == previewAutoPlayAction) { + InformationPanelSettings::setPreviewsAutoPlay(isChecked); + m_content->setPreviewAutoPlay(isChecked); } } @@ -224,32 +210,36 @@ void InformationPanel::showItemInfo() } 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()) { + 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::stat(url(), 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::statDetails(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); } } @@ -276,23 +266,24 @@ void InformationPanel::reset() // 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) { - if (m_shownUrl == QUrl::fromLocalFile(source)) { - m_shownUrl = QUrl::fromLocalFile(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 // performance bottlenecks when renaming several hundreds of files. + } else { + m_hoveredItem = KFileItem(destUrl); } showItemInfo(); @@ -301,18 +292,25 @@ void InformationPanel::slotFileRenamed(const QString& source, const QString& des void InformationPanel::slotFilesAdded(const QString& directory) { - if (m_shownUrl == QUrl::fromLocalFile(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::fromLocalFile(directory)); - requestDelayedItemInfo(item); + requestDelayedItemInfo(KFileItem()); + } +} + +void InformationPanel::slotFilesItemChanged(const KFileItemList &changedFileItems) +{ + const auto item = changedFileItems.findByUrl(m_shownUrl); + if (!item.isNull()) { + showItemInfo(); } } void InformationPanel::slotFilesChanged(const QStringList& files) { - foreach (const QString& fileName, files) { - if (m_shownUrl == QUrl::fromLocalFile(fileName)) { + for (const QString& fileName : files) { + if (m_shownUrl == QUrl::fromUserInput(fileName)) { showItemInfo(); break; } @@ -321,8 +319,8 @@ void InformationPanel::slotFilesChanged(const QStringList& files) void InformationPanel::slotFilesRemoved(const QStringList& files) { - foreach (const QString& fileName, files) { - if (m_shownUrl == QUrl::fromLocalFile(fileName)) { + for (const QString& fileName : files) { + if (m_shownUrl == QUrl::fromUserInput(fileName)) { // the currently shown item has been removed, show // the parent directory as fallback markUrlAsInvalid(); @@ -333,15 +331,12 @@ void InformationPanel::slotFilesRemoved(const QStringList& files) void InformationPanel::slotEnteredDirectory(const QString& directory) { - if (m_shownUrl == QUrl::fromLocalFile(directory)) { - KFileItem item(QUrl::fromLocalFile(directory)); - requestDelayedItemInfo(item); - } + Q_UNUSED(directory) } void InformationPanel::slotLeftDirectory(const QString& directory) { - if (m_shownUrl == QUrl::fromLocalFile(directory)) { + if (m_shownUrl == QUrl::fromUserInput(directory)) { // The signal 'leftDirectory' is also emitted when a media // has been unmounted. In this case no directory change will be // done in Dolphin, but the Information Panel must be updated to @@ -410,6 +405,8 @@ void InformationPanel::init() 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::contextMenuRequested, this, &InformationPanel::showContextMenu); QVBoxLayout* layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0);