X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7eef5ebec2ceaebb4088629093ecd3f0c2635816..13b2fc55704fbc734cd4f9cbae56cfc2ef3ec0ce:/src/infosidebarpage.cpp diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index b7490625f..b384f24e6 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -21,21 +21,23 @@ #include +#include +#include #include #include #include #include #include -#include #include #include -#include +#include #include #include #include #include #include +#include #include #include #include @@ -43,112 +45,123 @@ #include "dolphinsettings.h" #include "metadatawidget.h" +#include "metatextlabel.h" #include "pixmapviewer.h" InfoSidebarPage::InfoSidebarPage(QWidget* parent) : SidebarPage(parent), + m_initialized(false), m_pendingPreview(false), - m_timer(0), - m_preview(0), + m_shownUrl(), + m_urlCandidate(), + m_fileItem(), + m_selection(), m_nameLabel(0), - m_infoLabel(0), - m_metadataWidget(0) + m_preview(0), + 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); - - // preview - m_preview = new PixmapViewer(this); - m_preview->setMinimumWidth(K3Icon::SizeEnormous); - m_preview->setFixedHeight(K3Icon::SizeEnormous); - - // name - m_nameLabel = new QLabel(this); - m_nameLabel->setTextFormat(Qt::RichText); - m_nameLabel->setAlignment(m_nameLabel->alignment() | Qt::AlignHCenter); - m_nameLabel->setWordWrap(true); - - // general information - m_infoLabel = new QLabel(this); - m_infoLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); - m_infoLabel->setTextFormat(Qt::RichText); - - if (MetaDataWidget::metaDataAvailable()) { - m_metadataWidget = new MetaDataWidget(this); - } - - layout->addItem(new QSpacerItem(spacing, spacing, QSizePolicy::Preferred, QSizePolicy::Fixed)); - layout->addWidget(m_preview); - layout->addWidget(m_nameLabel); - layout->addWidget(new KSeparator(this)); - layout->addWidget(m_infoLabel); - layout->addWidget(new KSeparator(this)); - if (m_metadataWidget) { - layout->addWidget(m_metadataWidget); - } - // ensure that widgets in the information side bar are aligned towards the top - layout->addStretch(1); - setLayout(layout); } InfoSidebarPage::~InfoSidebarPage() { } +QSize InfoSidebarPage::sizeHint() const +{ + QSize size = SidebarPage::sizeHint(); + size.setWidth(minimumSizeHint().width()); + return size; +} + void InfoSidebarPage::setUrl(const KUrl& url) { + SidebarPage::setUrl(url); if (url.isValid() && !m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { - cancelRequest(); - m_shownUrl = url; - showItemInfo(); + if (m_initialized) { + cancelRequest(); + m_shownUrl = url; + showItemInfo(); + } else { + m_shownUrl = url; + } } } void InfoSidebarPage::setSelection(const KFileItemList& selection) { - SidebarPage::setSelection(selection); - m_timer->start(TimerDelay); + if (!m_initialized) { + return; + } + + m_selection = selection; + + const int count = selection.count(); + if (count == 0) { + m_shownUrl = url(); + showItemInfo(); + } else { + if ((count == 1) && !selection.first().url().isEmpty()) { + m_urlCandidate = selection.first().url(); + } + m_timer->start(TimerDelay); + } } void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item) { + if (!m_initialized) { + return; + } + cancelRequest(); - if (!item.isNull() && (selection().size() <= 1)) { - const KUrl url = item.url(); - if (!url.isEmpty()) { - m_urlCandidate = url; + m_fileItem = KFileItem(); + if (item.isNull()) { + // The cursor is above the viewport. If files are selected, + // show information regarding the selection. + if (m_selection.size() > 0) { + m_pendingPreview = false; m_timer->start(TimerDelay); } + } else if (!item.url().isEmpty()) { + m_urlCandidate = item.url(); + m_fileItem = item; + m_timer->start(TimerDelay); } } void InfoSidebarPage::showEvent(QShowEvent* event) { SidebarPage::showEvent(event); - if (event->spontaneous()) { - return; + 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(); } - 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); - m_infoLabel->setMaximumWidth(maxWidth); + if (m_initialized) { + // 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); + } + SidebarPage::resizeEvent(event); } @@ -160,36 +173,33 @@ void InfoSidebarPage::showItemInfo() cancelRequest(); - const KFileItemList& selectedItems = selection(); - - KUrl file; - if (selectedItems.isEmpty()) { - file = m_shownUrl; - } else { - file = selectedItems[0]->url(); - } + const KUrl file = (!m_fileItem.isNull() || m_selection.isEmpty()) ? m_shownUrl : m_selection[0].url(); if (!file.isValid()) { return; } - const int itemCount = selectedItems.count(); - if (itemCount > 1) { + + const int selectionCount = m_selection.count(); + if (m_fileItem.isNull() && (selectionCount > 1)) { KIconLoader iconLoader; - QPixmap icon = iconLoader.loadIcon("exec", - K3Icon::NoGroup, - K3Icon::SizeEnormous); + 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", selectedItems.count())); - } else if (!applyBookmark(file)) { + 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; - m_preview->setPixmap(QPixmap()); + + 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(), - K3Icon::SizeEnormous, + m_preview->height(), 0, 0, true, @@ -201,10 +211,7 @@ void InfoSidebarPage::showItemInfo() connect(job, SIGNAL(failed(const KFileItem&)), this, SLOT(showIcon(const KFileItem&))); - QString text(""); - text.append(file.fileName()); - text.append(""); - m_nameLabel->setText(text); + m_nameLabel->setText(file.fileName()); } showMetaInfo(); @@ -219,8 +226,8 @@ void InfoSidebarPage::slotTimeout() void InfoSidebarPage::showIcon(const KFileItem& item) { m_pendingPreview = false; - if (!applyBookmark(item.url())) { - m_preview->setPixmap(item.pixmap(K3Icon::SizeEnormous)); + if (!applyPlace(item.url())) { + m_preview->setPixmap(item.pixmap(KIconLoader::SizeEnormous)); } } @@ -234,7 +241,70 @@ void InfoSidebarPage::showPreview(const KFileItem& item, } } -bool InfoSidebarPage::applyBookmark(const KUrl& url) +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(); int count = placesModel->rowCount(); @@ -243,11 +313,7 @@ bool InfoSidebarPage::applyBookmark(const KUrl& url) QModelIndex index = placesModel->index(i, 0); if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) { - QString text(""); - text.append(placesModel->text(index)); - text.append(""); - m_nameLabel->setText(text); - + m_nameLabel->setText(placesModel->text(index)); m_preview->setPixmap(placesModel->icon(index).pixmap(128, 128)); return true; } @@ -259,73 +325,79 @@ bool InfoSidebarPage::applyBookmark(const KUrl& url) void InfoSidebarPage::cancelRequest() { m_timer->stop(); - m_pendingPreview = false; } void InfoSidebarPage::showMetaInfo() { - QString text; - - const KFileItemList& selectedItems = selection(); - if (selectedItems.size() <= 1) { - KFileItem fileItem(S_IFDIR, KFileItem::Unknown, m_shownUrl); - fileItem.refresh(); + 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()) { - addInfoLine(text, i18nc("@label", "Type:"), i18nc("@info", "Folder")); + m_metaTextLabel->add(i18nc("@label", "Type:"), i18nc("@label", "Folder")); + m_metaTextLabel->add(i18nc("@label", "Modified:"), fileItem.timeString()); } else { - addInfoLine(text, i18nc("@label", "Type:"), fileItem.mimeComment()); - - QString sizeText(KIO::convertSize(fileItem.size())); - addInfoLine(text, i18nc("@label", "Size:"), sizeText); - addInfoLine(text, i18nc("@label", "Modified:"), fileItem.timeString()); - - // TODO: See convertMetaInfo below, find a way to display only interesting information - // in a readable way - const KFileMetaInfo metaInfo(fileItem.url()); - if (metaInfo.isValid()) { - const QHash& items = metaInfo.items(); - QHash::const_iterator it = items.constBegin(); - const QHash::const_iterator end = items.constEnd(); - QString labelText; - while (it != end) { - const KFileMetaInfoItem& metaInfo = it.value(); - const QVariant& value = metaInfo.value(); - if (value.isValid() && convertMetaInfo(metaInfo.name(), labelText)) { - addInfoLine(text, labelText, value.toString()); + 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()); + + if (fileItem.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 = fileItem.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; } - ++it; } } } - if (MetaDataWidget::metaDataAvailable()) { - m_metadataWidget->setFile(fileItem.url()); + if (m_metaDataWidget != 0) { + m_metaDataWidget->setFile(fileItem.targetUrl()); } } else { - if (MetaDataWidget::metaDataAvailable()) { - m_metadataWidget->setFiles(selectedItems.urlList()); + if (m_metaDataWidget != 0) { + KUrl::List urls; + foreach (const KFileItem& item, m_selection) { + urls.append(item.targetUrl()); + } + m_metaDataWidget->setFiles(urls); } - unsigned long int totalSize = 0; - foreach (KFileItem* item, selectedItems) { - // TODO: what to do with directories (same with the one-item-selected-code)?, - // item->size() does not return the size of the content : not very instinctive for users - totalSize += item->size(); + quint64 totalSize = 0; + foreach (const KFileItem& item, m_selection) { + // Only count the size of files, not dirs to match what + // DolphinViewContainer::selectionStatusBarText() does. + if (!item.isDir() && !item.isLink()) { + totalSize += item.size(); + } } - addInfoLine(text, i18nc("@label", "Total size:"), KIO::convertSize(totalSize)); - } - m_infoLabel->setText(text); -} - -void InfoSidebarPage::addInfoLine(QString& text, - const QString& labelText, - const QString& infoText) -{ - if (!infoText.isEmpty()) { - text += "
"; + m_metaTextLabel->add(i18nc("@label", "Total size:"), KIO::convertSize(totalSize)); } - text += QString("%1 %2").arg(labelText).arg(infoText); } bool InfoSidebarPage::convertMetaInfo(const QString& key, QString& text) const @@ -366,4 +438,67 @@ bool InfoSidebarPage::convertMetaInfo(const QString& key, QString& text) const return false; } +void InfoSidebarPage::init() +{ + 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); + 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"