#include <KDialog>
#include <KFileItem>
-#include <kfilemetadatawidget.h>
-#include <KFilePlacesModel>
#include <KGlobalSettings>
+#include <KIO/JobUiDelegate>
#include <KIO/PreviewJob>
+#include <KJobWidgets>
#include <KIconEffect>
#include <KIconLoader>
+#include <KIcon>
#include <KLocale>
#include <KMenu>
#include <kseparator.h>
#include <KStringHandler>
+#ifndef HAVE_BALOO
+#include <KFileMetaDataWidget>
+#else
+#include <baloo/filemetadatawidget.h>
+#endif
+
+#include <panels/places/placesitem.h>
+#include <panels/places/placesitemmodel.h>
+
#include <Phonon/BackendCapabilities>
#include <Phonon/MediaObject>
#include <Phonon/SeekSlider>
#include "dolphin_informationpanelsettings.h"
#include "filemetadataconfigurationdialog.h"
-#include "settings/dolphinsettings.h"
#include "phononwidget.h"
#include "pixmapviewer.h"
InformationPanelContent::InformationPanelContent(QWidget* parent) :
QWidget(parent),
m_item(),
- m_pendingPreview(false),
+ m_previewJob(0),
m_outdatedPreviewTimer(0),
m_preview(0),
m_phononWidget(0),
m_nameLabel(0),
m_metaDataWidget(0),
- m_metaDataArea(0)
+ m_metaDataArea(0),
+ m_placesItemModel(0)
{
parent->installEventFilter(this);
m_outdatedPreviewTimer = new QTimer(this);
m_outdatedPreviewTimer->setInterval(300);
m_outdatedPreviewTimer->setSingleShot(true);
- connect(m_outdatedPreviewTimer, SIGNAL(timeout()),
- this, SLOT(markOutdatedPreview()));
+ connect(m_outdatedPreviewTimer, &QTimer::timeout,
+ this, &InformationPanelContent::markOutdatedPreview);
QVBoxLayout* layout = new QVBoxLayout(this);
layout->setSpacing(KDialog::spacingHint());
m_phononWidget = new PhononWidget(parent);
m_phononWidget->hide();
m_phononWidget->setMinimumWidth(minPreviewWidth);
- connect(m_phononWidget, SIGNAL(playingStarted()),
- this, SLOT(slotPlayingStarted()));
- connect(m_phononWidget, SIGNAL(playingStopped()),
- this, SLOT(slotPlayingStopped()));
+ connect(m_phononWidget, &PhononWidget::hasVideoChanged,
+ this, &InformationPanelContent::slotHasVideoChanged);
// name
m_nameLabel = new QLabel(parent);
QFont font = m_nameLabel->font();
font.setBold(true);
m_nameLabel->setFont(font);
+ m_nameLabel->setTextFormat(Qt::PlainText);
m_nameLabel->setAlignment(Qt::AlignHCenter);
m_nameLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
const bool previewsShown = InformationPanelSettings::previewsShown();
m_preview->setVisible(previewsShown);
+#ifndef HAVE_BALOO
m_metaDataWidget = new KFileMetaDataWidget(parent);
+#else
+ m_metaDataWidget = new Baloo::FileMetaDataWidget(parent);
+#endif
m_metaDataWidget->setFont(KGlobalSettings::smallestReadableFont());
m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
- connect(m_metaDataWidget, SIGNAL(urlActivated(KUrl)), this, SIGNAL(urlActivated(KUrl)));
+ connect(m_metaDataWidget, &KFileMetaDataWidget::urlActivated, this, &InformationPanelContent::urlActivated);
// Encapsulate the MetaDataWidget inside a container that has a dummy widget
// at the bottom. This prevents that the meta data widget gets vertically stretched
layout->addWidget(m_nameLabel);
layout->addWidget(new KSeparator());
layout->addWidget(m_metaDataArea);
+
+ m_placesItemModel = new PlacesItemModel(this);
}
InformationPanelContent::~InformationPanelContent()
void InformationPanelContent::showItem(const KFileItem& item)
{
- m_pendingPreview = false;
+ // If there is a preview job, kill it to prevent that we have jobs for
+ // multiple items running, and thus a race condition (bug 250787).
+ if (m_previewJob) {
+ m_previewJob->kill();
+ }
const KUrl itemUrl = item.url();
- const bool isSearchUrl = itemUrl.protocol().contains("search") && item.nepomukUri().isEmpty();
+ const bool isSearchUrl = itemUrl.protocol().contains("search") && item.localPath().isEmpty();
if (!applyPlace(itemUrl)) {
setNameLabelText(item.text());
if (isSearchUrl) {
m_preview->setPixmap(icon);
} else {
// try to get a preview pixmap from the item...
- m_pendingPreview = true;
// Mark the currently shown preview as outdated. This is done
// with a small delay to prevent a flickering when the next preview
m_outdatedPreviewTimer->start();
}
- KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << item, QSize(m_preview->width(), m_preview->height()));
- job->setScaleType(KIO::PreviewJob::Unscaled);
+ m_previewJob = new KIO::PreviewJob(KFileItemList() << item, QSize(m_preview->width(), m_preview->height()));
+ m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);
+ m_previewJob->setIgnoreMaximumSize(item.isLocalFile());
+ if (m_previewJob->ui()) {
+ KJobWidgets::setWindow(m_previewJob, this);
+ }
- connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)),
- this, SLOT(showPreview(KFileItem,QPixmap)));
- connect(job, SIGNAL(failed(KFileItem)),
- this, SLOT(showIcon(KFileItem)));
+ connect(m_previewJob.data(), &KIO::PreviewJob::gotPreview,
+ this, &InformationPanelContent::showPreview);
+ connect(m_previewJob.data(), &KIO::PreviewJob::failed,
+ this, &InformationPanelContent::showIcon);
}
}
if (InformationPanelSettings::previewsShown()) {
const QString mimeType = item.mimetype();
- const bool usePhonon = Phonon::BackendCapabilities::isMimeTypeAvailable(mimeType) &&
- (mimeType != "image/png"); // TODO: workaround, as Phonon
- // thinks it supports PNG images
+ const bool usePhonon = mimeType.startsWith("audio/") || mimeType.startsWith("video/");
if (usePhonon) {
m_phononWidget->show();
- PhononWidget::Mode mode = mimeType.startsWith(QLatin1String("video"))
- ? PhononWidget::Video
- : PhononWidget::Audio;
- m_phononWidget->setMode(mode);
m_phononWidget->setUrl(item.targetUrl());
- if ((mode == PhononWidget::Video) && m_preview->isVisible()) {
+ if (m_preview->isVisible()) {
m_phononWidget->setVideoSize(m_preview->size());
}
} else {
void InformationPanelContent::showItems(const KFileItemList& items)
{
- m_pendingPreview = false;
+ // If there is a preview job, kill it to prevent that we have jobs for
+ // multiple items running, and thus a race condition (bug 250787).
+ if (m_previewJob) {
+ m_previewJob->kill();
+ }
KIconLoader iconLoader;
QPixmap icon = iconLoader.loadIcon("dialog-information",
KIconLoader::NoGroup,
KIconLoader::SizeEnormous);
m_preview->setPixmap(icon);
- setNameLabelText(i18ncp("@info", "%1 item selected", "%1 items selected", items.count()));
+ setNameLabelText(i18ncp("@label", "%1 item selected", "%1 items selected", items.count()));
if (m_metaDataWidget) {
m_metaDataWidget->setItems(items);
KMenu popup(this);
QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview"));
- previewAction->setIcon(KIcon("view-preview"));
+ previewAction->setIcon(QIcon::fromTheme("view-preview"));
previewAction->setCheckable(true);
previewAction->setChecked(InformationPanelSettings::previewsShown());
dialog->show();
dialog->raise();
dialog->activateWindow();
- connect(dialog, SIGNAL(destroyed()), this, SLOT(refreshMetaData()));
+ connect(dialog, &FileMetaDataConfigurationDialog::destroyed, this, &InformationPanelContent::refreshMetaData);
}
}
void InformationPanelContent::showIcon(const KFileItem& item)
{
m_outdatedPreviewTimer->stop();
- m_pendingPreview = false;
if (!applyPlace(item.targetUrl())) {
KIcon icon(item.iconName(), KIconLoader::global(), item.overlays());
m_preview->setPixmap(icon.pixmap(KIconLoader::SizeEnormous));
{
m_outdatedPreviewTimer->stop();
Q_UNUSED(item);
- if (m_pendingPreview) {
- QPixmap p = pixmap;
- KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);
- m_preview->setPixmap(p);
- m_pendingPreview = false;
- }
+
+ QPixmap p = pixmap;
+ KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);
+ m_preview->setPixmap(p);
}
void InformationPanelContent::markOutdatedPreview()
m_preview->setPixmap(disabledPixmap);
}
-void InformationPanelContent::slotPlayingStarted()
-{
- m_preview->setVisible(m_phononWidget->mode() != PhononWidget::Video);
-}
-
-void InformationPanelContent::slotPlayingStopped()
+void InformationPanelContent::slotHasVideoChanged(bool hasVideo)
{
- m_preview->setVisible(true);
+ m_preview->setVisible(!hasVideo);
}
void InformationPanelContent::refreshMetaData()
{
- if (!m_item.isNull() && m_item.nepomukUri().isValid()) {
+ if (!m_item.isNull()) {
showItem(m_item);
}
}
bool InformationPanelContent::applyPlace(const KUrl& url)
{
- KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
- int count = placesModel->rowCount();
-
+ const int count = m_placesItemModel->count();
for (int i = 0; i < count; ++i) {
- QModelIndex index = placesModel->index(i, 0);
-
- if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) {
- setNameLabelText(placesModel->text(index));
- m_preview->setPixmap(placesModel->icon(index).pixmap(128, 128));
+ const PlacesItem* item = m_placesItemModel->placesItem(i);
+ if (item->url().equals(url, KUrl::CompareWithoutTrailingSlash)) {
+ setNameLabelText(item->text());
+ m_preview->setPixmap(KIcon(item->icon()).pixmap(128, 128));
return true;
}
}
// try to increase the preview as large as possible
m_preview->setSizeHint(QSize(maxWidth, maxWidth));
- if (m_phononWidget->isVisible() && (m_phononWidget->mode() == PhononWidget::Video)) {
+ if (m_phononWidget->isVisible()) {
// assure that the size of the video player is the same as the preview size
m_phononWidget->setVideoSize(QSize(maxWidth, maxWidth));
}
projects / dolphin.git / blobdiff