X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5ab90e19e78faebaca3bbffb83f3379ccdfc37f0..148282e2d856b47ceb191eeef4c834118c8cdffd:/src/infosidebarpage.cpp diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index d2652e0d1..64d5d44c2 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -21,12 +21,13 @@ #include +#include +#include #include #include #include #include #include -#include #include #include #include @@ -39,6 +40,8 @@ #include #include #include +#include +#include #include #include @@ -49,7 +52,10 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : SidebarPage(parent), + m_initialized(false), m_pendingPreview(false), + m_infoTimer(0), + m_outdatedPreviewTimer(0), m_shownUrl(), m_urlCandidate(), m_fileItem(), @@ -59,51 +65,6 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : m_metaDataWidget(0), m_metaTextLabel(0) { - const int spacing = KDialog::spacingHint(); - - m_timer = new QTimer(this); - m_timer->setSingleShot(true); - connect(m_timer, SIGNAL(timeout()), - this, SLOT(slotTimeout())); - - QVBoxLayout* layout = new QVBoxLayout; - layout->setSpacing(spacing); - - // name - m_nameLabel = new QLabel(this); - QFont font = m_nameLabel->font(); - font.setBold(true); - m_nameLabel->setFont(font); - m_nameLabel->setAlignment(Qt::AlignHCenter); - m_nameLabel->setWordWrap(true); - - // preview - m_preview = new PixmapViewer(this); - m_preview->setMinimumWidth(KIconLoader::SizeEnormous + KIconLoader::SizeMedium); - m_preview->setMinimumHeight(KIconLoader::SizeEnormous); - - if (MetaDataWidget::metaDataAvailable()) { - // rating, comment and tags - m_metaDataWidget = new MetaDataWidget(this); - } - - // general meta text information - m_metaTextLabel = new MetaTextLabel(this); - m_metaTextLabel->setMinimumWidth(spacing); - - layout->addWidget(m_nameLabel); - layout->addWidget(new KSeparator(this)); - layout->addWidget(m_preview); - layout->addWidget(new KSeparator(this)); - if (m_metaDataWidget != 0) { - layout->addWidget(m_metaDataWidget); - layout->addWidget(new KSeparator(this)); - } - layout->addWidget(m_metaTextLabel); - - // ensure that widgets in the information side bar are aligned towards the top - layout->addStretch(1); - setLayout(layout); } InfoSidebarPage::~InfoSidebarPage() @@ -120,31 +81,53 @@ QSize InfoSidebarPage::sizeHint() const void InfoSidebarPage::setUrl(const KUrl& url) { SidebarPage::setUrl(url); - if (url.isValid() && !m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { - cancelRequest(); - m_shownUrl = url; - showItemInfo(); + if (url.isValid() && !isEqualToShownUrl(url)) { + if (isVisible()) { + cancelRequest(); + m_shownUrl = url; + showItemInfo(); + } else { + m_shownUrl = url; + } } } void InfoSidebarPage::setSelection(const KFileItemList& selection) { + if (!isVisible()) { + return; + } + + if ((selection.count() == 0) && (m_selection.count() == 0)) { + // The selection has not really changed, only the current index. + // QItemSelectionModel emits a signal in this case and it is less + // expensive doing the check this way instead of patching + // DolphinView::emitSelectionChanged(). + return; + } + m_selection = selection; const int count = selection.count(); if (count == 0) { - m_shownUrl = url(); - showItemInfo(); + if (!isEqualToShownUrl(url())) { + m_shownUrl = url(); + showItemInfo(); + } } else { if ((count == 1) && !selection.first().url().isEmpty()) { m_urlCandidate = selection.first().url(); } - m_timer->start(TimerDelay); + m_infoTimer->start(); } } void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item) { + if (!isVisible()) { + return; + } + cancelRequest(); m_fileItem = KFileItem(); @@ -153,12 +136,15 @@ void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item) // show information regarding the selection. if (m_selection.size() > 0) { m_pendingPreview = false; - m_timer->start(TimerDelay); + m_infoTimer->start(); } - } else if (!item.url().isEmpty()) { - m_urlCandidate = item.url(); - m_fileItem = item; - m_timer->start(TimerDelay); + } else { + const KUrl url = item.url(); + if (url.isValid() && !isEqualToShownUrl(url)) { + m_urlCandidate = item.url(); + m_fileItem = item; + m_infoTimer->start(); + } } } @@ -166,24 +152,32 @@ void InfoSidebarPage::showEvent(QShowEvent* event) { SidebarPage::showEvent(event); if (!event->spontaneous()) { + if (!m_initialized) { + // do a delayed initialization so that no performance + // penalty is given when Dolphin is started with a closed + // Information Panel + init(); + } showItemInfo(); } } void InfoSidebarPage::resizeEvent(QResizeEvent* event) { - // If the text inside the name label or the info label cannot - // get wrapped, then the maximum width of the label is increased - // so that the width of the information sidebar gets increased. - // To prevent this, the maximum width is adjusted to - // the current width of the sidebar. - const int maxWidth = event->size().width() - KDialog::spacingHint() * 4; - m_nameLabel->setMaximumWidth(maxWidth); - - // try to increase the preview as large as possible - m_preview->setSizeHint(QSize(maxWidth, maxWidth)); - m_urlCandidate = m_shownUrl; // reset the URL candidate if a resizing is done - m_timer->start(TimerDelay); + if (isVisible()) { + // If the text inside the name label or the info label cannot + // get wrapped, then the maximum width of the label is increased + // so that the width of the information sidebar gets increased. + // To prevent this, the maximum width is adjusted to + // the current width of the sidebar. + const int maxWidth = event->size().width() - KDialog::spacingHint() * 4; + m_nameLabel->setMaximumWidth(maxWidth); + + // try to increase the preview as large as possible + m_preview->setSizeHint(QSize(maxWidth, maxWidth)); + m_urlCandidate = m_shownUrl; // reset the URL candidate if a resizing is done + m_infoTimer->start(); + } SidebarPage::resizeEvent(event); } @@ -196,58 +190,65 @@ void InfoSidebarPage::showItemInfo() cancelRequest(); - const KUrl file = (!m_fileItem.isNull() || m_selection.isEmpty()) ? m_shownUrl : m_selection[0].url(); - if (!file.isValid()) { - return; - } - - const int selectionCount = m_selection.count(); - if (m_fileItem.isNull() && (selectionCount > 1)) { + if (showMultipleSelectionInfo()) { KIconLoader iconLoader; QPixmap icon = iconLoader.loadIcon("dialog-information", KIconLoader::NoGroup, KIconLoader::SizeEnormous); m_preview->setPixmap(icon); - m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected", selectionCount)); - } else if (!applyPlace(file)) { - // try to get a preview pixmap from the item... - KUrl::List list; - list.append(file); - - m_pendingPreview = true; - - KIconEffect iconEffect; - QPixmap disabledPixmap = iconEffect.apply(m_preview->pixmap(), KIconLoader::Desktop, KIconLoader::DisabledState); - m_preview->setPixmap(disabledPixmap); - - KIO::PreviewJob* job = KIO::filePreview(list, - m_preview->width(), - m_preview->height(), - 0, - 0, - true, - false); - job->setIgnoreMaximumSize(true); - - connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), - this, SLOT(showPreview(const KFileItem&, const QPixmap&))); - connect(job, SIGNAL(failed(const KFileItem&)), - this, SLOT(showIcon(const KFileItem&))); - - m_nameLabel->setText(file.fileName()); + setNameLabelText(i18ncp("@info", "%1 item selected", "%1 items selected", m_selection.count())); + m_shownUrl = KUrl(); + } else { + const KFileItem item = fileItem(); + const KUrl itemUrl = item.url(); + if (!applyPlace(itemUrl)) { + // 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 + // can be shown within a short timeframe. + m_outdatedPreviewTimer->start(); + + KIO::PreviewJob* job = KIO::filePreview(KUrl::List() << itemUrl, + m_preview->width(), + m_preview->height(), + 0, + 0, + true, + false); + job->setIgnoreMaximumSize(true); + + connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), + this, SLOT(showPreview(const KFileItem&, const QPixmap&))); + connect(job, SIGNAL(failed(const KFileItem&)), + this, SLOT(showIcon(const KFileItem&))); + + setNameLabelText(itemUrl.fileName()); + } } showMetaInfo(); } -void InfoSidebarPage::slotTimeout() +void InfoSidebarPage::slotInfoTimeout() { m_shownUrl = m_urlCandidate; showItemInfo(); } +void InfoSidebarPage::markOutdatedPreview() +{ + KIconEffect iconEffect; + QPixmap disabledPixmap = iconEffect.apply(m_preview->pixmap(), + KIconLoader::Desktop, + KIconLoader::DisabledState); + m_preview->setPixmap(disabledPixmap); +} + void InfoSidebarPage::showIcon(const KFileItem& item) { + m_outdatedPreviewTimer->stop(); m_pendingPreview = false; if (!applyPlace(item.url())) { m_preview->setPixmap(item.pixmap(KIconLoader::SizeEnormous)); @@ -257,6 +258,8 @@ void InfoSidebarPage::showIcon(const KFileItem& item) void InfoSidebarPage::showPreview(const KFileItem& item, const QPixmap& pixmap) { + m_outdatedPreviewTimer->stop(); + Q_UNUSED(item); if (m_pendingPreview) { m_preview->setPixmap(pixmap); @@ -264,6 +267,69 @@ void InfoSidebarPage::showPreview(const KFileItem& item, } } +void InfoSidebarPage::slotFileRenamed(const QString& source, const QString& dest) +{ + if (m_shownUrl == KUrl(source)) { + // the currently shown file has been renamed, hence update the item information + // for the renamed file + KFileItem item(KFileItem::Unknown, KFileItem::Unknown, KUrl(dest)); + requestDelayedItemInfo(item); + } +} + +void InfoSidebarPage::slotFilesAdded(const QString& directory) +{ + if (m_shownUrl == KUrl(directory)) { + // If the 'trash' icon changes because the trash has been emptied or got filled, + // the signal filesAdded("trash:/") will be emitted. + KFileItem item(KFileItem::Unknown, KFileItem::Unknown, KUrl(directory)); + requestDelayedItemInfo(item); + } +} + +void InfoSidebarPage::slotFilesChanged(const QStringList& files) +{ + foreach (const QString& fileName, files) { + if (m_shownUrl == KUrl(fileName)) { + showItemInfo(); + break; + } + } +} + +void InfoSidebarPage::slotFilesRemoved(const QStringList& files) +{ + foreach (const QString& fileName, files) { + if (m_shownUrl == KUrl(fileName)) { + // the currently shown item has been removed, show + // the parent directory as fallback + m_shownUrl = url(); + showItemInfo(); + break; + } + } +} + +void InfoSidebarPage::slotEnteredDirectory(const QString& directory) +{ + if (m_shownUrl == KUrl(directory)) { + KFileItem item(KFileItem::Unknown, KFileItem::Unknown, KUrl(directory)); + requestDelayedItemInfo(item); + } +} + +void InfoSidebarPage::slotLeftDirectory(const QString& directory) +{ + if (m_shownUrl == KUrl(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 + // indicate an invalid directory. + m_shownUrl = url(); + showItemInfo(); + } +} + bool InfoSidebarPage::applyPlace(const KUrl& url) { KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel(); @@ -273,7 +339,7 @@ bool InfoSidebarPage::applyPlace(const KUrl& url) QModelIndex index = placesModel->index(i, 0); if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) { - m_nameLabel->setText(placesModel->text(index)); + setNameLabelText(placesModel->text(index)); m_preview->setPixmap(placesModel->icon(index).pixmap(128, 128)); return true; } @@ -284,61 +350,14 @@ bool InfoSidebarPage::applyPlace(const KUrl& url) void InfoSidebarPage::cancelRequest() { - m_timer->stop(); + m_infoTimer->stop(); } void InfoSidebarPage::showMetaInfo() { m_metaTextLabel->clear(); - if ((m_selection.size() <= 1) || !m_fileItem.isNull()) { - KFileItem fileItem; - if (m_fileItem.isNull()) { - // no pending request is ongoing - const KUrl url = (m_selection.size() == 1) ? m_selection.first().url() : m_shownUrl; - fileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, url); - fileItem.refresh(); - } else { - fileItem = m_fileItem; - } - - if (fileItem.isDir()) { - m_metaTextLabel->add(i18nc("@label", "Type:"), i18nc("@label", "Folder")); - m_metaTextLabel->add(i18nc("@label", "Modified:"), fileItem.timeString()); - } else { - m_metaTextLabel->add(i18nc("@label", "Type:"), fileItem.mimeComment()); - - m_metaTextLabel->add(i18nc("@label", "Size:"), KIO::convertSize(fileItem.size())); - m_metaTextLabel->add(i18nc("@label", "Modified:"), fileItem.timeString()); - - // TODO: See convertMetaInfo below, find a way to display only interesting information - // in a readable way - const KFileMetaInfo::WhatFlags flags = KFileMetaInfo::Fastest | - KFileMetaInfo::TechnicalInfo | - KFileMetaInfo::ContentInfo | - KFileMetaInfo::Thumbnail; - const QString path = fileItem.url().url(); - const KFileMetaInfo fileMetaInfo(path, QString(), flags); - if (fileMetaInfo.isValid()) { - const QHash& items = fileMetaInfo.items(); - QHash::const_iterator it = items.constBegin(); - const QHash::const_iterator end = items.constEnd(); - QString labelText; - while (it != end) { - const KFileMetaInfoItem& metaInfoItem = it.value(); - const QVariant& value = metaInfoItem.value(); - if (value.isValid() && convertMetaInfo(metaInfoItem.name(), labelText)) { - m_metaTextLabel->add(labelText, value.toString()); - } - ++it; - } - } - } - - if (m_metaDataWidget != 0) { - m_metaDataWidget->setFile(fileItem.targetUrl()); - } - } else { + if (showMultipleSelectionInfo()) { if (m_metaDataWidget != 0) { KUrl::List urls; foreach (const KFileItem& item, m_selection) { @@ -347,7 +366,7 @@ void InfoSidebarPage::showMetaInfo() m_metaDataWidget->setFiles(urls); } - unsigned long int totalSize = 0; + quint64 totalSize = 0; foreach (const KFileItem& item, m_selection) { // Only count the size of files, not dirs to match what // DolphinViewContainer::selectionStatusBarText() does. @@ -356,26 +375,66 @@ void InfoSidebarPage::showMetaInfo() } } m_metaTextLabel->add(i18nc("@label", "Total size:"), KIO::convertSize(totalSize)); + } else { + const KFileItem item = fileItem(); + if (item.isDir()) { + m_metaTextLabel->add(i18nc("@label", "Type:"), i18nc("@label", "Folder")); + m_metaTextLabel->add(i18nc("@label", "Modified:"), item.timeString()); + } else { + m_metaTextLabel->add(i18nc("@label", "Type:"), item.mimeComment()); + + m_metaTextLabel->add(i18nc("@label", "Size:"), KIO::convertSize(item.size())); + m_metaTextLabel->add(i18nc("@label", "Modified:"), item.timeString()); + + if (item.isLocalFile()) { + // TODO: See convertMetaInfo below, find a way to display only interesting information + // in a readable way + const KFileMetaInfo::WhatFlags flags = KFileMetaInfo::Fastest | + KFileMetaInfo::TechnicalInfo | + KFileMetaInfo::ContentInfo; + const QString path = item.url().path(); + const KFileMetaInfo fileMetaInfo(path, QString(), flags); + if (fileMetaInfo.isValid()) { + const QHash& items = fileMetaInfo.items(); + QHash::const_iterator it = items.constBegin(); + const QHash::const_iterator end = items.constEnd(); + QString labelText; + while (it != end) { + const KFileMetaInfoItem& metaInfoItem = it.value(); + const QVariant& value = metaInfoItem.value(); + if (value.isValid() && convertMetaInfo(metaInfoItem.name(), labelText)) { + m_metaTextLabel->add(labelText, value.toString()); + } + ++it; + } + } + } + } + + if (m_metaDataWidget != 0) { + m_metaDataWidget->setFile(item.targetUrl()); + } } } bool InfoSidebarPage::convertMetaInfo(const QString& key, QString& text) const { - // TODO: This code prevents that interesting meta information might be hidden - // and only bypasses the current problem that not all the meta information should - // be shown to the user. Check whether it's possible with Nepomuk to show - // all "user relevant" information in a readable way... - struct MetaKey { const char* key; - const char* text; + QString text; }; // sorted list of keys, where its data should be shown static const MetaKey keys[] = { - { "audio.album", "Album:" }, - { "audio.artist", "Artist:" }, - { "audio.title", "Title:" }, + { "http://freedesktop.org/standards/xesam/1.0/core#album", i18nc("@label", "Album:") }, + { "http://freedesktop.org/standards/xesam/1.0/core#artist", i18nc("@label", "Artist:") }, + { "http://freedesktop.org/standards/xesam/1.0/core#genre", i18nc("@label", "Genre:") }, + { "http://freedesktop.org/standards/xesam/1.0/core#height", i18nc("@label", "Height:") }, + { "http://freedesktop.org/standards/xesam/1.0/core#lineCount", i18nc("@label", "Lines:") }, + { "http://freedesktop.org/standards/xesam/1.0/core#title", i18nc("@label", "Title:") }, + { "http://freedesktop.org/standards/xesam/1.0/core#type", i18nc("@label", "Type:") }, + { "http://freedesktop.org/standards/xesam/1.0/core#trackNumber", i18nc("@label", "Track:") }, + { "http://freedesktop.org/standards/xesam/1.0/core#width", i18nc("@label", "Width:") } }; // do a binary search for the key... @@ -397,4 +456,133 @@ bool InfoSidebarPage::convertMetaInfo(const QString& key, QString& text) const return false; } +KFileItem InfoSidebarPage::fileItem() const +{ + if (!m_fileItem.isNull()) { + return m_fileItem; + } + + if (!m_selection.isEmpty()) { + Q_ASSERT(m_selection.count() == 1); + return m_selection.first(); + } + + // no item is hovered and no selection has been done: provide + // an item for the directory represented by m_shownUrl + KFileItem item(KFileItem::Unknown, KFileItem::Unknown, m_shownUrl); + item.refresh(); + return item; +} + +bool InfoSidebarPage::showMultipleSelectionInfo() const +{ + return m_fileItem.isNull() && (m_selection.count() > 1); +} + +bool InfoSidebarPage::isEqualToShownUrl(const KUrl& url) const +{ + return m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash); +} + +void InfoSidebarPage::setNameLabelText(const QString& text) +{ + QTextOption textOption; + textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); + + QTextLayout textLayout(text); + textLayout.setFont(m_nameLabel->font()); + textLayout.setTextOption(textOption); + + QString wrappedText; + wrappedText.reserve(text.length()); + + // wrap the text to fit into the width of m_nameLabel + textLayout.beginLayout(); + QTextLine line = textLayout.createLine(); + while (line.isValid()) { + line.setLineWidth(m_nameLabel->width()); + wrappedText += text.mid(line.textStart(), line.textLength()); + + line = textLayout.createLine(); + if (line.isValid()) { + wrappedText += QChar::LineSeparator; + } + } + textLayout.endLayout(); + + m_nameLabel->setText(wrappedText); +} + +void InfoSidebarPage::init() +{ + const int spacing = KDialog::spacingHint(); + + m_infoTimer = new QTimer(this); + m_infoTimer->setInterval(300); + m_infoTimer->setSingleShot(true); + connect(m_infoTimer, SIGNAL(timeout()), + this, SLOT(slotInfoTimeout())); + + // Initialize timer for disabling an outdated preview with a small + // delay. This prevents flickering if the new preview can be generated + // within a very small timeframe. + m_outdatedPreviewTimer = new QTimer(this); + m_outdatedPreviewTimer->setInterval(300); + m_outdatedPreviewTimer->setSingleShot(true); + connect(m_outdatedPreviewTimer, SIGNAL(timeout()), + this, SLOT(markOutdatedPreview())); + + QVBoxLayout* layout = new QVBoxLayout; + layout->setSpacing(spacing); + + // name + m_nameLabel = new QLabel(this); + QFont font = m_nameLabel->font(); + font.setBold(true); + m_nameLabel->setFont(font); + m_nameLabel->setAlignment(Qt::AlignHCenter); + m_nameLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + + // preview + m_preview = new PixmapViewer(this); + m_preview->setMinimumWidth(KIconLoader::SizeEnormous + KIconLoader::SizeMedium); + m_preview->setMinimumHeight(KIconLoader::SizeEnormous); + + if (MetaDataWidget::metaDataAvailable()) { + // rating, comment and tags + m_metaDataWidget = new MetaDataWidget(this); + m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + } + + // general meta text information + m_metaTextLabel = new MetaTextLabel(this); + m_metaTextLabel->setMinimumWidth(spacing); + m_metaTextLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + + layout->addWidget(m_nameLabel); + layout->addWidget(new KSeparator(this)); + layout->addWidget(m_preview); + layout->addWidget(new KSeparator(this)); + if (m_metaDataWidget != 0) { + layout->addWidget(m_metaDataWidget); + layout->addWidget(new KSeparator(this)); + } + layout->addWidget(m_metaTextLabel); + + // ensure that widgets in the information side bar are aligned towards the top + layout->addStretch(1); + setLayout(layout); + + org::kde::KDirNotify* dirNotify = new org::kde::KDirNotify(QString(), QString(), + QDBusConnection::sessionBus(), this); + connect(dirNotify, SIGNAL(FileRenamed(QString, QString)), SLOT(slotFileRenamed(QString, QString))); + connect(dirNotify, SIGNAL(FilesAdded(QString)), SLOT(slotFilesAdded(QString))); + connect(dirNotify, SIGNAL(FilesChanged(QStringList)), SLOT(slotFilesChanged(QStringList))); + connect(dirNotify, SIGNAL(FilesRemoved(QStringList)), SLOT(slotFilesRemoved(QStringList))); + connect(dirNotify, SIGNAL(enteredDirectory(QString)), SLOT(slotEnteredDirectory(QString))); + connect(dirNotify, SIGNAL(leftDirectory(QString)), SLOT(slotLeftDirectory(QString))); + + m_initialized = true; +} + #include "infosidebarpage.moc"