diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h --- a/src/panels/information/informationpanel.h +++ b/src/panels/information/informationpanel.h @@ -131,6 +131,7 @@ void init(); private: + QWidget *m_parent; bool m_initialized; QTimer* m_infoTimer; QTimer* m_urlChangedTimer; diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp --- a/src/panels/information/informationpanel.cpp +++ b/src/panels/information/informationpanel.cpp @@ -26,13 +26,21 @@ #include #include +#include + #include #include #include #include +#include +#include + +#include "dolphin_informationpanelsettings.h" +#include "filemetadataconfigurationdialog.h" InformationPanel::InformationPanel(QWidget* parent) : Panel(parent), + m_parent(parent), m_initialized(false), m_infoTimer(nullptr), m_urlChangedTimer(nullptr), @@ -157,8 +165,53 @@ void InformationPanel::contextMenuEvent(QContextMenuEvent* event) { - // TODO: Move code from InformationPanelContent::configureSettings() here - m_content->configureSettings(customContextMenuActions(), event->globalPos()); + QMenu popup(m_parent); + + QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview")); + previewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-preview"))); + previewAction->setCheckable(true); + previewAction->setChecked(InformationPanelSettings::previewsShown()); + + QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure...")); + configureAction->setIcon(QIcon::fromTheme(QStringLiteral("configure"))); + + 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(Baloo::DateFormats::ShortFormat)); + + popup.addSeparator(); + foreach (QAction* action, customContextMenuActions()) { + popup.addAction(action); + } + + // Open the popup and adjust the settings for the + // selected action. + QAction* action = popup.exec(event->globalPos()); + if (!action) { + return; + } + + const bool isChecked = action->isChecked(); + if (action == previewAction) { + InformationPanelSettings::setPreviewsShown(isChecked); + m_content->refreshMetaData(); + } 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); + } + if (action == dateformatAction) { + int dateFormat = static_cast(isChecked ? Baloo::DateFormats::ShortFormat : Baloo::DateFormats::LongFormat); + + InformationPanelSettings::setDateFormat(dateFormat); + m_content->refreshMetaData(); + } + Panel::contextMenuEvent(event); } diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h --- a/src/panels/information/informationpanelcontent.h +++ b/src/panels/information/informationpanelcontent.h @@ -72,17 +72,18 @@ */ void showItems(const KFileItemList& items); - /** - * Opens a menu which allows to configure which meta information - * should be shown. - * - * TODO: Move this code to the class InformationPanel - */ - void configureSettings(const QList& customContextMenuActions, const QPointF& pos); + const KFileItemList items(); signals: void urlActivated( const QUrl& url ); +public slots: + /** + * Is invoked after the file meta data configuration dialog has been + * closed and refreshes the visibility of the meta data. + */ + void refreshMetaData(); + protected: /** @see QObject::eventFilter() */ bool eventFilter(QObject* obj, QEvent* event) override; @@ -108,12 +109,6 @@ void slotHasVideoChanged(bool hasVideo); - /** - * Is invoked after the file meta data configuration dialog has been - * closed and refreshes the visibility of the meta data. - */ - void refreshMetaData(); - private: /** * Sets the text for the label \a m_nameLabel and assures that the diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -48,7 +47,6 @@ #include #include "dolphin_informationpanelsettings.h" -#include "filemetadataconfigurationdialog.h" #include "phononwidget.h" #include "pixmapviewer.h" @@ -149,66 +147,66 @@ m_previewJob->kill(); } - const QUrl itemUrl = item.url(); - const bool isSearchUrl = itemUrl.scheme().contains(QStringLiteral("search")) && item.localPath().isEmpty(); - setNameLabelText(item.text()); - if (isSearchUrl) { - // in the case of a search-URL the URL is not readable for humans - // (at least not useful to show in the Information Panel) - m_preview->setPixmap( - QIcon::fromTheme(QStringLiteral("nepomuk")).pixmap(KIconLoader::SizeEnormous, KIconLoader::SizeEnormous) - ); - } else { - // try to get a preview pixmap from the item... - - // Mark the currently shown preview as outdated. This is done - // with a small delay to prevent a flickering when the next preview - // can be shown within a short timeframe. This timer is not started - // for directories, as directory previews might fail and return the - // same icon. - if (!item.isDir()) { - m_outdatedPreviewTimer->start(); - } + if (InformationPanelSettings::previewsShown()) { + m_preview->show(); + + const QUrl itemUrl = item.url(); + const bool isSearchUrl = itemUrl.scheme().contains(QStringLiteral("search")) && item.localPath().isEmpty(); + setNameLabelText(item.text()); + if (isSearchUrl) { + // in the case of a search-URL the URL is not readable for humans + // (at least not useful to show in the Information Panel) + m_preview->setPixmap( + QIcon::fromTheme(QStringLiteral("nepomuk")).pixmap(KIconLoader::SizeEnormous, KIconLoader::SizeEnormous) + ); + } else { + // try to get a preview pixmap from the item... + + // Mark the currently shown preview as outdated. This is done + // with a small delay to prevent a flickering when the next preview + // can be shown within a short timeframe. This timer is not started + // for directories, as directory previews might fail and return the + // same icon. + if (!item.isDir()) { + m_outdatedPreviewTimer->start(); + } - QStringList plugins = KIO::PreviewJob::availablePlugins(); - m_previewJob = new KIO::PreviewJob(KFileItemList() << item, - QSize(m_preview->width(), m_preview->height()), - &plugins); - m_previewJob->setScaleType(KIO::PreviewJob::Unscaled); - m_previewJob->setIgnoreMaximumSize(item.isLocalFile()); - if (m_previewJob->uiDelegate()) { - KJobWidgets::setWindow(m_previewJob, this); - } + QStringList plugins = KIO::PreviewJob::availablePlugins(); + m_previewJob = new KIO::PreviewJob(KFileItemList() << item, + QSize(m_preview->width(), m_preview->height()), + &plugins); + m_previewJob->setScaleType(KIO::PreviewJob::Unscaled); + m_previewJob->setIgnoreMaximumSize(item.isLocalFile()); + if (m_previewJob->uiDelegate()) { + KJobWidgets::setWindow(m_previewJob, this); + } - connect(m_previewJob.data(), &KIO::PreviewJob::gotPreview, - this, &InformationPanelContent::showPreview); - connect(m_previewJob.data(), &KIO::PreviewJob::failed, - this, &InformationPanelContent::showIcon); - } + connect(m_previewJob.data(), &KIO::PreviewJob::gotPreview, + this, &InformationPanelContent::showPreview); + connect(m_previewJob.data(), &KIO::PreviewJob::failed, + this, &InformationPanelContent::showIcon); - if (m_metaDataWidget) { - m_metaDataWidget->setDateFormat(static_cast(InformationPanelSettings::dateFormat())); - m_metaDataWidget->show(); - m_metaDataWidget->setItems(KFileItemList() << item); - } - - if (InformationPanelSettings::previewsShown()) { - const QString mimeType = item.mimetype(); - const bool usePhonon = mimeType.startsWith(QLatin1String("audio/")) || mimeType.startsWith(QLatin1String("video/")); - if (usePhonon) { - m_phononWidget->show(); - m_phononWidget->setUrl(item.targetUrl()); - if (m_preview->isVisible()) { + const QString mimeType = item.mimetype(); + const bool usePhonon = mimeType.startsWith(QLatin1String("audio/")) || mimeType.startsWith(QLatin1String("video/")); + if (usePhonon) { + m_phononWidget->show(); + m_phononWidget->setUrl(item.targetUrl()); m_phononWidget->setVideoSize(m_preview->size()); + } else { + m_phononWidget->hide(); } - } else { - m_phononWidget->hide(); - m_preview->setVisible(true); } } else { + m_preview->hide(); m_phononWidget->hide(); } + if (m_metaDataWidget) { + m_metaDataWidget->setDateFormat(static_cast(InformationPanelSettings::dateFormat())); + m_metaDataWidget->show(); + m_metaDataWidget->setItems(KFileItemList() << item); + } + m_item = item; } @@ -264,54 +262,8 @@ return QWidget::eventFilter(obj, event); } -void InformationPanelContent::configureSettings(const QList& customContextMenuActions, const QPointF& pos) -{ - QMenu popup(this); - - QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview")); - previewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-preview"))); - previewAction->setCheckable(true); - previewAction->setChecked(InformationPanelSettings::previewsShown()); - - QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure...")); - configureAction->setIcon(QIcon::fromTheme(QStringLiteral("configure"))); - - 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(Baloo::DateFormats::ShortFormat)); - - popup.addSeparator(); - foreach (QAction* action, customContextMenuActions) { - popup.addAction(action); - } - - // Open the popup and adjust the settings for the - // selected action. - QAction* action = popup.exec(pos.toPoint()); - if (!action) { - return; - } - - const bool isChecked = action->isChecked(); - if (action == previewAction) { - m_preview->setVisible(isChecked); - InformationPanelSettings::setPreviewsShown(isChecked); - } 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_metaDataWidget->items()); - dialog->setAttribute(Qt::WA_DeleteOnClose); - dialog->show(); - connect(dialog, &FileMetaDataConfigurationDialog::destroyed, this, &InformationPanelContent::refreshMetaData); - } - if (action == dateformatAction) { - int dateFormat = static_cast(isChecked ? Baloo::DateFormats::ShortFormat : Baloo::DateFormats::LongFormat); - - InformationPanelSettings::setDateFormat(dateFormat); - refreshMetaData(); - } +const KFileItemList InformationPanelContent::items() { + return m_metaDataWidget->items(); } void InformationPanelContent::showIcon(const KFileItem& item) @@ -344,7 +296,7 @@ void InformationPanelContent::slotHasVideoChanged(bool hasVideo) { - m_preview->setVisible(!hasVideo); + m_preview->setVisible(InformationPanelSettings::previewsShown() && !hasVideo); } void InformationPanelContent::refreshMetaData()