X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b4c2bc9e062a8df4fe44dc39a8322831575ae607..846b21edf57e7aeb83e84ee68e9f61c5981fbacd:/src/infosidebarpage.cpp diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index 1a3e67e1c..30c4467b4 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -19,7 +19,7 @@ #include "infosidebarpage.h" -#include +#include #include #include @@ -48,9 +48,11 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : SidebarPage(parent), m_pendingPreview(false), - m_timer(0), + m_shownUrl(), + m_urlCandidate(), + m_fileItem(), m_preview(0), - m_name(0), + m_nameLabel(0), m_infoLabel(0), m_metadataWidget(0) { @@ -66,19 +68,21 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : // preview m_preview = new PixmapViewer(this); - m_preview->setMinimumWidth(K3Icon::SizeEnormous); - m_preview->setFixedHeight(K3Icon::SizeEnormous); + m_preview->setMinimumWidth(KIconLoader::SizeEnormous); + m_preview->setMinimumHeight(KIconLoader::SizeEnormous); // name - m_name = new QLabel(this); - m_name->setTextFormat(Qt::RichText); - m_name->setAlignment(m_name->alignment() | Qt::AlignHCenter); - m_name->setWordWrap(true); + 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->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); m_infoLabel->setTextFormat(Qt::RichText); + m_infoLabel->setWordWrap(true); + m_infoLabel->setFont(KGlobalSettings::smallestReadableFont()); if (MetaDataWidget::metaDataAvailable()) { m_metadataWidget = new MetaDataWidget(this); @@ -86,11 +90,11 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : layout->addItem(new QSpacerItem(spacing, spacing, QSizePolicy::Preferred, QSizePolicy::Fixed)); layout->addWidget(m_preview); - layout->addWidget(m_name); + layout->addWidget(m_nameLabel); layout->addWidget(new KSeparator(this)); layout->addWidget(m_infoLabel); - layout->addWidget(new KSeparator(this)); - if (m_metadataWidget) { + if (m_metadataWidget != 0) { + layout->addWidget(new KSeparator(this)); layout->addWidget(m_metadataWidget); } // ensure that widgets in the information side bar are aligned towards the top @@ -102,6 +106,13 @@ InfoSidebarPage::~InfoSidebarPage() { } +QSize InfoSidebarPage::sizeHint() const +{ + QSize size = SidebarPage::sizeHint(); + size.setWidth(minimumSizeHint().width()); + return size; +} + void InfoSidebarPage::setUrl(const KUrl& url) { if (url.isValid() && !m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { @@ -114,16 +125,28 @@ 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_timer->start(TimerDelay); } -void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url) +void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item) { cancelRequest(); - if (!url.isEmpty() && (selection().size() <= 1)) { - m_urlCandidate = url; - m_timer->start(TimerDelay); + m_fileItem = KFileItem(); + + if (!item.isNull() && (selection().size() <= 1)) { + const KUrl url = item.url(); + if (!url.isEmpty()) { + m_urlCandidate = url; + m_fileItem = item; + m_timer->start(TimerDelay); + } } } @@ -138,11 +161,20 @@ void InfoSidebarPage::showEvent(QShowEvent* event) void InfoSidebarPage::resizeEvent(QResizeEvent* event) { - // If the item name cannot get wrapped, 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 + // 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. - m_name->setMaximumWidth(event->size().width() - KDialog::spacingHint() * 4); + 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)); + m_urlCandidate = m_shownUrl; // reset the URL candidate if a resizing is done + m_timer->start(TimerDelay); + SidebarPage::resizeEvent(event); } @@ -157,20 +189,23 @@ void InfoSidebarPage::showItemInfo() const KFileItemList& selectedItems = selection(); KUrl file; - const int itemCount = selectedItems.count(); - if (selectedItems.count() == 0) { + if (selectedItems.isEmpty()) { file = m_shownUrl; } else { - file = selectedItems[0]->url(); + file = selectedItems[0].url(); } + if (!file.isValid()) { + return; + } + const int itemCount = selectedItems.count(); if (itemCount > 1) { KIconLoader iconLoader; - QPixmap icon = iconLoader.loadIcon("exec", - K3Icon::NoGroup, - K3Icon::SizeEnormous); + QPixmap icon = iconLoader.loadIcon("system-run", + KIconLoader::NoGroup, + m_preview->width()); m_preview->setPixmap(icon); - m_name->setText(i18n("%1 items selected", selectedItems.count())); - } else if (!applyBookmark(file)) { + m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected", selectedItems.count())); + } else if (!applyPlace(file)) { // try to get a preview pixmap from the item... KUrl::List list; list.append(file); @@ -180,7 +215,7 @@ void InfoSidebarPage::showItemInfo() KIO::PreviewJob* job = KIO::filePreview(list, m_preview->width(), - K3Icon::SizeEnormous, + m_preview->height(), 0, 0, true, @@ -195,7 +230,7 @@ void InfoSidebarPage::showItemInfo() QString text(""); text.append(file.fileName()); text.append(""); - m_name->setText(text); + m_nameLabel->setText(text); } showMetaInfo(); @@ -210,8 +245,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)); } } @@ -225,7 +260,7 @@ void InfoSidebarPage::showPreview(const KFileItem& item, } } -bool InfoSidebarPage::applyBookmark(const KUrl& url) +bool InfoSidebarPage::applyPlace(const KUrl& url) { KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel(); int count = placesModel->rowCount(); @@ -237,7 +272,7 @@ bool InfoSidebarPage::applyBookmark(const KUrl& url) QString text(""); text.append(placesModel->text(index)); text.append(""); - m_name->setText(text); + m_nameLabel->setText(text); m_preview->setPixmap(placesModel->icon(index).pixmap(128, 128)); return true; @@ -259,21 +294,31 @@ void InfoSidebarPage::showMetaInfo() const KFileItemList& selectedItems = selection(); if (selectedItems.size() <= 1) { - KFileItem fileItem(S_IFDIR, KFileItem::Unknown, m_shownUrl); - fileItem.refresh(); + KFileItem fileItem; + if (m_fileItem.isNull()) { + // no pending request is ongoing + fileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_shownUrl); + fileItem.refresh(); + } else { + fileItem = m_fileItem; + } if (fileItem.isDir()) { - addInfoLine(text, i18n("Type:"), i18n("Folder")); + addInfoLine(text, i18nc("@label", "Type:"), i18nc("@label", "Folder")); } else { - addInfoLine(text, i18n("Type:"), fileItem.mimeComment()); - - QString sizeText(KIO::convertSize(fileItem.size())); - addInfoLine(text, i18n("Size:"), sizeText); - addInfoLine(text, i18n("Modified:"), fileItem.timeString()); - - // TODO: deactivate showing additional meta information, as the system - // hangs when retrieving the meta information of a zipped file - /*const KFileMetaInfo metaInfo(fileItem.url()); + addInfoLine(text, i18nc("@label", "Type:"), fileItem.mimeComment()); + + addInfoLine(text, i18nc("@label", "Size:"), KIO::convertSize(fileItem.size())); + 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::WhatFlags flags = KFileMetaInfo::Fastest | + KFileMetaInfo::TechnicalInfo | + KFileMetaInfo::ContentInfo | + KFileMetaInfo::Thumbnail; + const QString path = fileItem.url().url(); + const KFileMetaInfo metaInfo(path, QString(), flags); if (metaInfo.isValid()) { const QHash& items = metaInfo.items(); QHash::const_iterator it = items.constBegin(); @@ -287,7 +332,7 @@ void InfoSidebarPage::showMetaInfo() } ++it; } - }*/ + } } if (MetaDataWidget::metaDataAvailable()) { @@ -295,16 +340,22 @@ void InfoSidebarPage::showMetaInfo() } } else { if (MetaDataWidget::metaDataAvailable()) { - m_metadataWidget->setFiles(selectedItems.urlList()); + KUrl::List urls; + foreach (const KFileItem& item, selectedItems) { + urls.append(item.url()); + } + 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(); + foreach (const KFileItem& item, selectedItems) { + // Only count the size of files, not dirs; to match what + // DolphinViewContainer::selectionStatusBarText does. + if (!item.isDir() && !item.isLink()) { + totalSize += item.size(); + } } - addInfoLine(text, i18n("Total size:"), KIO::convertSize(totalSize)); + addInfoLine(text, i18nc("@label", "Total size:"), KIO::convertSize(totalSize)); } m_infoLabel->setText(text); } @@ -313,7 +364,7 @@ void InfoSidebarPage::addInfoLine(QString& text, const QString& labelText, const QString& infoText) { - if (!infoText.isEmpty()) { + if (!text.isEmpty()) { text += "
"; } text += QString("%1 %2").arg(labelText).arg(infoText);