X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/613a132a3697db603bca593a36f91ee3f9ccafdd..5ab90e19e78faebaca3bbffb83f3379ccdfc37f0:/src/infosidebarpage.cpp diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index 943033876..d2652e0d1 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -29,13 +29,14 @@ #include #include #include -#include +#include #include #include #include #include #include +#include #include #include #include @@ -43,6 +44,7 @@ #include "dolphinsettings.h" #include "metadatawidget.h" +#include "metatextlabel.h" #include "pixmapviewer.h" InfoSidebarPage::InfoSidebarPage(QWidget* parent) : @@ -51,10 +53,11 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : m_shownUrl(), m_urlCandidate(), m_fileItem(), - m_preview(0), + 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(); @@ -66,37 +69,38 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : QVBoxLayout* layout = new QVBoxLayout; layout->setSpacing(spacing); - // preview - m_preview = new PixmapViewer(this); - m_preview->setMinimumWidth(KIconLoader::SizeEnormous); - m_preview->setMinimumHeight(KIconLoader::SizeEnormous); - // name m_nameLabel = new QLabel(this); - m_nameLabel->setTextFormat(Qt::RichText); - m_nameLabel->setAlignment(m_nameLabel->alignment() | Qt::AlignHCenter); + QFont font = m_nameLabel->font(); + font.setBold(true); + m_nameLabel->setFont(font); + m_nameLabel->setAlignment(Qt::AlignHCenter); m_nameLabel->setWordWrap(true); - // general information - m_infoLabel = new QLabel(this); - m_infoLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); - m_infoLabel->setTextFormat(Qt::RichText); - m_infoLabel->setWordWrap(true); - m_infoLabel->setFont(KGlobalSettings::smallestReadableFont()); + // preview + m_preview = new PixmapViewer(this); + m_preview->setMinimumWidth(KIconLoader::SizeEnormous + KIconLoader::SizeMedium); + m_preview->setMinimumHeight(KIconLoader::SizeEnormous); if (MetaDataWidget::metaDataAvailable()) { - m_metadataWidget = new MetaDataWidget(this); + // rating, comment and tags + m_metaDataWidget = new MetaDataWidget(this); } - layout->addItem(new QSpacerItem(spacing, spacing, QSizePolicy::Preferred, QSizePolicy::Fixed)); - layout->addWidget(m_preview); + // 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_infoLabel); - if (m_metadataWidget != 0) { + 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_metadataWidget); } + layout->addWidget(m_metaTextLabel); + // ensure that widgets in the information side bar are aligned towards the top layout->addStretch(1); setLayout(layout); @@ -115,6 +119,7 @@ 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; @@ -124,14 +129,18 @@ void InfoSidebarPage::setUrl(const KUrl& url) void InfoSidebarPage::setSelection(const KFileItemList& selection) { - SidebarPage::setSelection(selection); - if (selection.size() == 1) { - const KUrl url = selection.first().url(); - if (!url.isEmpty()) { - m_urlCandidate = url; + 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); } - m_timer->start(TimerDelay); } void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item) @@ -139,24 +148,26 @@ void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item) cancelRequest(); m_fileItem = KFileItem(); - - if (!item.isNull() && (selection().size() <= 1)) { - const KUrl url = item.url(); - if (!url.isEmpty()) { - m_urlCandidate = url; - m_fileItem = item; + 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()) { + showItemInfo(); } - showItemInfo(); } void InfoSidebarPage::resizeEvent(QResizeEvent* event) @@ -168,21 +179,9 @@ void InfoSidebarPage::resizeEvent(QResizeEvent* event) // the current width of the sidebar. const int maxWidth = event->size().width() - KDialog::spacingHint() * 4; m_nameLabel->setMaximumWidth(maxWidth); - m_infoLabel->setMaximumWidth(maxWidth); // try to increase the preview as large as possible m_preview->setSizeHint(QSize(maxWidth, maxWidth)); - - // --- - // TODO: The following workaround was not necessary with Qt 4.3.x - // but is mandatory with the current Qt4.4 beta version. Check with - // Qt 4.4.0 whether the issue is Dolphin specific - // (see PixmapViewer::setSizeHint()) or a regression in Qt. - QVBoxLayout* vBox = static_cast(layout()); - vBox->removeWidget(m_preview); - vBox->insertWidget(0, m_preview); - // --- - m_urlCandidate = m_shownUrl; // reset the URL candidate if a resizing is done m_timer->start(TimerDelay); @@ -197,32 +196,29 @@ 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("system-run", + QPixmap icon = iconLoader.loadIcon("dialog-information", KIconLoader::NoGroup, - m_preview->width()); + KIconLoader::SizeEnormous); m_preview->setPixmap(icon); - m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected", selectedItems.count())); + 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(), @@ -238,10 +234,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(); @@ -280,11 +273,7 @@ bool InfoSidebarPage::applyPlace(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; } @@ -296,31 +285,31 @@ bool InfoSidebarPage::applyPlace(const KUrl& url) void InfoSidebarPage::cancelRequest() { m_timer->stop(); - m_pendingPreview = false; } void InfoSidebarPage::showMetaInfo() { - QString text; + m_metaTextLabel->clear(); - const KFileItemList& selectedItems = selection(); - if (selectedItems.size() <= 1) { + if ((m_selection.size() <= 1) || !m_fileItem.isNull()) { KFileItem fileItem; if (m_fileItem.isNull()) { // no pending request is ongoing - fileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_shownUrl); + 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("@label", "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()); + m_metaTextLabel->add(i18nc("@label", "Type:"), fileItem.mimeComment()); - addInfoLine(text, i18nc("@label", "Size:"), KIO::convertSize(fileItem.size())); - addInfoLine(text, i18nc("@label", "Modified:"), fileItem.timeString()); + 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 @@ -329,56 +318,45 @@ void InfoSidebarPage::showMetaInfo() KFileMetaInfo::ContentInfo | KFileMetaInfo::Thumbnail; const QString path = fileItem.url().url(); - const KFileMetaInfo metaInfo(path, QString(), flags); - if (metaInfo.isValid()) { - const QHash& items = metaInfo.items(); + 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& metaInfo = it.value(); - const QVariant& value = metaInfo.value(); - if (value.isValid() && convertMetaInfo(metaInfo.name(), labelText)) { - addInfoLine(text, labelText, value.toString()); + 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 (MetaDataWidget::metaDataAvailable()) { - m_metadataWidget->setFile(fileItem.url()); + if (m_metaDataWidget != 0) { + m_metaDataWidget->setFile(fileItem.targetUrl()); } } else { - if (MetaDataWidget::metaDataAvailable()) { + if (m_metaDataWidget != 0) { KUrl::List urls; - foreach (const KFileItem& item, selectedItems) { - urls.append(item.url()); + foreach (const KFileItem& item, m_selection) { + urls.append(item.targetUrl()); } - m_metadataWidget->setFiles(urls); + m_metaDataWidget->setFiles(urls); } unsigned long int totalSize = 0; - foreach (const KFileItem& item, selectedItems) { - // Only count the size of files, not dirs; to match what - // DolphinViewContainer::selectionStatusBarText does. + 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 (!text.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