X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2ed4d8dcc483ac6067149647eb457d46be7111c5..2b8e67d7f260847c803eac33712ba69b6785bd1d:/src/infosidebarpage.cpp diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index 07887e2bd..2ae3c4e1f 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -17,22 +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 "config-nepomuk.h" #include #include @@ -46,23 +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_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())); @@ -75,15 +70,15 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : m_preview->setFixedHeight(K3Icon::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_infos = new QLabel(this); - m_infos->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); - m_infos->setTextFormat(Qt::RichText); + 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); @@ -91,13 +86,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(m_nameLabel); layout->addWidget(new KSeparator(this)); - layout->addWidget(m_infos); + layout->addWidget(m_infoLabel); layout->addWidget(new KSeparator(this)); if (m_metadataWidget) { layout->addWidget(m_metadataWidget); - layout->addWidget(new KSeparator(this)); } // ensure that widgets in the information side bar are aligned towards the top layout->addStretch(1); @@ -110,7 +104,7 @@ InfoSidebarPage::~InfoSidebarPage() 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(); @@ -119,36 +113,39 @@ void InfoSidebarPage::setUrl(const KUrl& url) void InfoSidebarPage::setSelection(const KFileItemList& selection) { - cancelRequest(); SidebarPage::setSelection(selection); - m_multipleSelection = (selection.size() > 1); - showItemInfo(); + m_timer->start(TimerDelay); } void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url) { cancelRequest(); - if (!url.isEmpty() && !m_multipleSelection) { + if (!url.isEmpty() && (selection().size() <= 1)) { m_urlCandidate = url; - m_timer->setSingleShot(true); - m_timer->start(300); + m_timer->start(TimerDelay); } } void InfoSidebarPage::showEvent(QShowEvent* event) { SidebarPage::showEvent(event); + if (event->spontaneous()) { + return; + } showItemInfo(); } 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); SidebarPage::resizeEvent(event); } @@ -163,18 +160,19 @@ void InfoSidebarPage::showItemInfo() const KFileItemList& selectedItems = selection(); KUrl file; + const int itemCount = selectedItems.count(); if (selectedItems.count() == 0) { file = m_shownUrl; } else { file = selectedItems[0]->url(); } - if (m_multipleSelection) { + if (itemCount > 1) { KIconLoader iconLoader; QPixmap icon = iconLoader.loadIcon("exec", K3Icon::NoGroup, K3Icon::SizeEnormous); m_preview->setPixmap(icon); - m_name->setText(i18n("%1 items selected", selectedItems.count())); + m_nameLabel->setText(i18np("%1 item selected", "%1 items selected", selectedItems.count())); } else if (!applyBookmark(file)) { // try to get a preview pixmap from the item... KUrl::List list; @@ -200,10 +198,10 @@ void InfoSidebarPage::showItemInfo() QString text(""); text.append(file.fileName()); text.append(""); - m_name->setText(text); + m_nameLabel->setText(text); } - createMetaInfo(); + showMetaInfo(); } void InfoSidebarPage::slotTimeout() @@ -242,7 +240,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; @@ -258,94 +256,103 @@ void InfoSidebarPage::cancelRequest() m_pendingPreview = false; } -void InfoSidebarPage::createMetaInfo() +void InfoSidebarPage::showMetaInfo() { - beginInfoLines(); + QString text; + const KFileItemList& selectedItems = selection(); - if (selectedItems.size() == 0) { + 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 (selectedItems.count() == 1) { - KFileItem* fileItem = selectedItems.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, i18n("Type:"), i18n("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()); + 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()); + m_metadataWidget->setFile(fileItem.url()); } } else { if (MetaDataWidget::metaDataAvailable()) { m_metadataWidget->setFiles(selectedItems.urlList()); } - unsigned long int totSize = 0; - foreach(KFileItem* item, selectedItems) { - 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 + 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(); } - addInfoLine(i18n("Total size:"), KIO::convertSize(totSize)); + addInfoLine(text, i18n("Total size:"), KIO::convertSize(totalSize)); } - endInfoLines(); + m_infoLabel->setText(text); } -void InfoSidebarPage::beginInfoLines() +void InfoSidebarPage::addInfoLine(QString& text, + const QString& labelText, + const QString& infoText) { - m_infoLines = QString(); -} - -void InfoSidebarPage::endInfoLines() -{ - m_infos->setText(m_infoLines); + if (!infoText.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; } } @@ -353,12 +360,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"