X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7f2033899d72527c5fcb533644f4068eeb2f332a..d6488887ecf69d7f192b94de8dce34fae0b7eb76:/src/infosidebarpage.cpp diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index a9ffc7257..bed20b1f5 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -17,21 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include - #include "infosidebarpage.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include @@ -45,24 +33,31 @@ #include #include -#include "pixmapviewer.h" +#include +#include +#include +#include +#include +#include +#include + #include "dolphinsettings.h" #include "metadatawidget.h" +#include "pixmapviewer.h" InfoSidebarPage::InfoSidebarPage(QWidget* parent) : SidebarPage(parent), - m_multipleSelection(false), //TODO: check if I'm needed m_pendingPreview(false), m_timer(0), - m_currentSelection(KFileItemList()), m_preview(0), - m_name(0), - m_infos(0), + m_nameLabel(0), + m_infoLabel(0), m_metadataWidget(0) { const int spacing = KDialog::spacingHint(); m_timer = new QTimer(this); + m_timer->setSingleShot(true); connect(m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); @@ -71,25 +66,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->setFixedHeight(KIconLoader::SizeEnormous); // name - m_name = new QLabel(this); - m_name->setTextFormat(Qt::RichText); - m_name->setAlignment(m_name->alignment() | Qt::AlignHCenter); - QFontMetrics fontMetrics(m_name->font()); - m_name->setMinimumHeight(fontMetrics.height() * 3); - m_name->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum); - - KSeparator* sep1 = new KSeparator(this); + 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_infos = new QLabel(this); - m_infos->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); - m_infos->setTextFormat(Qt::RichText); - - KSeparator* sep2 = new KSeparator(this); + 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()); if (MetaDataWidget::metaDataAvailable()) { m_metadataWidget = new MetaDataWidget(this); @@ -97,13 +88,12 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : layout->addItem(new QSpacerItem(spacing, spacing, QSizePolicy::Preferred, QSizePolicy::Fixed)); layout->addWidget(m_preview); - layout->addWidget(m_name); - layout->addWidget(sep1); - layout->addWidget(m_infos); - layout->addWidget(sep2); - if (m_metadataWidget) { - layout->addWidget(m_metadataWidget); + layout->addWidget(m_nameLabel); + layout->addWidget(new KSeparator(this)); + layout->addWidget(m_infoLabel); + 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 layout->addStretch(1); @@ -111,11 +101,19 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : } InfoSidebarPage::~InfoSidebarPage() -{} +{ +} + +QSize InfoSidebarPage::sizeHint() const +{ + QSize size = SidebarPage::sizeHint(); + size.setWidth(minimumSizeHint().width()); + return size; +} void InfoSidebarPage::setUrl(const KUrl& url) { - if (!m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { + if (url.isValid() && !m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { cancelRequest(); m_shownUrl = url; showItemInfo(); @@ -124,48 +122,79 @@ void InfoSidebarPage::setUrl(const KUrl& url) void InfoSidebarPage::setSelection(const KFileItemList& selection) { - // TODO: deactivated the following code, as it has side effects. To - // reproduce start Dolphin and open a folder -> the URL navigator gets - // reset. First guess: it seems that a setUrl signal is emitted - // by the following code - - Q_UNUSED(selection); - /*cancelRequest(); - m_currentSelection = selection; - m_multipleSelection = (m_currentSelection.size() > 1); - showItemInfo();*/ + 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() && !m_multipleSelection) { - m_urlCandidate = url; - m_timer->setSingleShot(true); - m_timer->start(300); + if (!item.isNull() && (selection().size() <= 1)) { + const KUrl url = item.url(); + if (!url.isEmpty()) { + m_urlCandidate = url; + m_timer->start(TimerDelay); + } } } +void InfoSidebarPage::showEvent(QShowEvent* event) +{ + SidebarPage::showEvent(event); + if (event->spontaneous()) { + return; + } + 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); + SidebarPage::resizeEvent(event); +} + void InfoSidebarPage::showItemInfo() { + if (!isVisible()) { + return; + } + cancelRequest(); - KFileItemList selectedItems = m_currentSelection; + const KFileItemList& selectedItems = selection(); + KUrl file; - if (selectedItems.count() == 0) { + if (selectedItems.isEmpty()) { file = m_shownUrl; } else { - file = selectedItems[0]->url(); + file = selectedItems[0].url(); } - if (m_multipleSelection) { + 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, + KIconLoader::SizeEnormous); 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); @@ -175,7 +204,7 @@ void InfoSidebarPage::showItemInfo() KIO::PreviewJob* job = KIO::filePreview(list, m_preview->width(), - K3Icon::SizeEnormous, + KIconLoader::SizeEnormous, 0, 0, true, @@ -183,17 +212,17 @@ void InfoSidebarPage::showItemInfo() job->setIgnoreMaximumSize(true); connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), - this, SLOT(gotPreview(const KFileItem&, const QPixmap&))); + this, SLOT(showPreview(const KFileItem&, const QPixmap&))); connect(job, SIGNAL(failed(const KFileItem&)), - this, SLOT(slotPreviewFailed(const KFileItem&))); + this, SLOT(showIcon(const KFileItem&))); QString text(""); text.append(file.fileName()); text.append(""); - m_name->setText(text); + m_nameLabel->setText(text); } - createMetaInfo(); + showMetaInfo(); } void InfoSidebarPage::slotTimeout() @@ -202,16 +231,16 @@ void InfoSidebarPage::slotTimeout() showItemInfo(); } -void InfoSidebarPage::slotPreviewFailed(const KFileItem& item) +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)); } } -void InfoSidebarPage::gotPreview(const KFileItem& item, - const QPixmap& pixmap) +void InfoSidebarPage::showPreview(const KFileItem& item, + const QPixmap& pixmap) { Q_UNUSED(item); if (m_pendingPreview) { @@ -220,9 +249,9 @@ void InfoSidebarPage::gotPreview(const KFileItem& item, } } -bool InfoSidebarPage::applyBookmark(const KUrl& url) +bool InfoSidebarPage::applyPlace(const KUrl& url) { - KFilePlacesModel *placesModel = DolphinSettings::instance().placesModel(); + KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel(); int count = placesModel->rowCount(); for (int i = 0; i < count; ++i) { @@ -232,7 +261,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; @@ -248,89 +277,112 @@ void InfoSidebarPage::cancelRequest() m_pendingPreview = false; } -void InfoSidebarPage::createMetaInfo() +void InfoSidebarPage::showMetaInfo() { - beginInfoLines(); - if (m_currentSelection.size() == 0) { + QString text; + + const KFileItemList& selectedItems = selection(); + if (selectedItems.size() <= 1) { KFileItem fileItem(S_IFDIR, KFileItem::Unknown, m_shownUrl); fileItem.refresh(); if (fileItem.isDir()) { - addInfoLine(i18n("Type:"), i18n("Directory")); - } - if (MetaDataWidget::metaDataAvailable()) - m_metadataWidget->setFile(fileItem.url()); - } else if (m_currentSelection.count() == 1) { - KFileItem* fileItem = m_currentSelection.at(0); - addInfoLine(i18n("Type:"), fileItem->mimeComment()); - - QString sizeText(KIO::convertSize(fileItem->size())); - addInfoLine(i18n("Size:"), sizeText); - addInfoLine(i18n("Modified:"), fileItem->timeString()); - - const KFileMetaInfo& metaInfo = fileItem->metaInfo(); - if (metaInfo.isValid()) { - QStringList keys = metaInfo.supportedKeys(); - for (QStringList::Iterator it = keys.begin(); it != keys.end(); ++it) { - if (showMetaInfo(*it)) { - KFileMetaInfoItem metaInfoItem = metaInfo.item(*it); - addInfoLine(*it, metaInfoItem.value().toString()); + addInfoLine(text, i18nc("@label", "Type:"), i18nc("@label", "Folder")); + } 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::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(); + 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()); + } + ++it; } } } - if (MetaDataWidget::metaDataAvailable()) - m_metadataWidget->setFile(fileItem->url()); + + if (MetaDataWidget::metaDataAvailable()) { + m_metadataWidget->setFile(fileItem.url()); + } } else { - if (MetaDataWidget::metaDataAvailable()) - m_metadataWidget->setFiles(m_currentSelection.urlList()); - unsigned long int totSize = 0; - foreach(KFileItem* item, m_currentSelection) { - totSize += item->size(); //FIXME 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 + if (MetaDataWidget::metaDataAvailable()) { + KUrl::List urls; + foreach (const KFileItem& item, selectedItems) { + urls.append(item.url()); + } + m_metadataWidget->setFiles(urls); } - addInfoLine(i18n("Total size:"), KIO::convertSize(totSize)); - } - endInfoLines(); -} -void InfoSidebarPage::beginInfoLines() -{ - m_infoLines = QString(); + unsigned long int totalSize = 0; + foreach (const 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(); + } + addInfoLine(text, i18nc("@label", "Total size:"), KIO::convertSize(totalSize)); + } + m_infoLabel->setText(text); } -void InfoSidebarPage::endInfoLines() +void InfoSidebarPage::addInfoLine(QString& text, + const QString& labelText, + const QString& infoText) { - m_infos->setText(m_infoLines); + if (!text.isEmpty()) { + text += "
"; + } + text += QString("%1 %2").arg(labelText).arg(infoText); } -bool InfoSidebarPage::showMetaInfo(const QString& key) const +bool InfoSidebarPage::convertMetaInfo(const QString& key, QString& text) const { - // sorted list of keys, where it's data should be shown - static const char* keys[] = { - "Album", - "Artist", - "Author", - "Bitrate", - "Date", - "Dimensions", - "Genre", - "Length", - "Lines", - "Pages", - "Title", - "Words" - }; + // 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; + }; + + // sorted list of keys, where its data should be shown + static const MetaKey keys[] = { + { "audio.album", "Album:" }, + { "audio.artist", "Artist:" }, + { "audio.title", "Title:" }, + }; // do a binary search for the key... int top = 0; - int bottom = sizeof(keys) / sizeof(char*) - 1; - while (top < bottom) { + int bottom = sizeof(keys) / sizeof(MetaKey) - 1; + while (top <= bottom) { const int middle = (top + bottom) / 2; - const int result = key.compare(keys[middle]); + const int result = key.compare(keys[middle].key); if (result < 0) { bottom = middle - 1; } else if (result > 0) { top = middle + 1; } else { + text = keys[middle].text; return true; } } @@ -338,11 +390,4 @@ bool InfoSidebarPage::showMetaInfo(const QString& key) const return false; } -void InfoSidebarPage::addInfoLine(const QString& labelText, const QString& infoText) -{ - if (!m_infoLines.isEmpty()) - m_infoLines += "
"; - m_infoLines += QString("%1 %2").arg(labelText).arg(infoText); -} - #include "infosidebarpage.moc"