X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/eaeee9f7d68d120b1982f24e73d8183db3418261..a0d3cf4aa8ffa76ed22a67efa4ea156eb2ef9f68:/src/panels/information/informationpanelcontent.cpp diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 1d95c0013..889a0272f 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -19,8 +19,6 @@ #include "informationpanelcontent.h" -#include - #include #include #include @@ -38,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -47,36 +46,19 @@ #include "dolphin_informationpanelsettings.h" #include "settings/dolphinsettings.h" -#include "metadatawidget.h" +#include "kmetadatawidget.h" +#include "kmetadataconfigurationdialog.h" #include "phononwidget.h" #include "pixmapviewer.h" -#ifdef HAVE_NEPOMUK -#define DISABLE_NEPOMUK_LEGACY -#include -#include -#include -#endif - -/** - * Helper function for sorting items with qSort() in - * InformationPanelContent::contextMenu(). - */ -bool lessThan(const QAction* action1, const QAction* action2) -{ - return action1->text() < action2->text(); -} - - InformationPanelContent::InformationPanelContent(QWidget* parent) : Panel(parent), m_item(), m_pendingPreview(false), m_outdatedPreviewTimer(0), - m_nameLabel(0), m_preview(0), - m_previewSeparator(0), m_phononWidget(0), + m_nameLabel(0), m_metaDataWidget(0), m_metaDataArea(0) { @@ -94,15 +76,6 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) : QVBoxLayout* layout = new QVBoxLayout; layout->setSpacing(KDialog::spacingHint()); - // name - m_nameLabel = new QLabel(parent); - QFont font = m_nameLabel->font(); - font.setBold(true); - m_nameLabel->setFont(font); - m_nameLabel->setAlignment(Qt::AlignHCenter); - m_nameLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - m_nameLabel->setMaximumWidth(KIconLoader::SizeEnormous); - // preview const int minPreviewWidth = KIconLoader::SizeEnormous + KIconLoader::SizeMedium; @@ -117,16 +90,35 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) : connect(m_phononWidget, SIGNAL(playingStopped()), this, SLOT(slotPlayingStopped())); - m_previewSeparator = new KSeparator(parent); + // name + m_nameLabel = new QLabel(parent); + QFont font = m_nameLabel->font(); + font.setBold(true); + m_nameLabel->setFont(font); + m_nameLabel->setAlignment(Qt::AlignHCenter); + m_nameLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); const bool showPreview = InformationPanelSettings::showPreview(); m_preview->setVisible(showPreview); - m_previewSeparator->setVisible(showPreview); - m_metaDataWidget = new MetaDataWidget(parent); + m_metaDataWidget = new KMetaDataWidget(parent); + m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); + connect(m_metaDataWidget, SIGNAL(urlActivated(KUrl)), this, SIGNAL(urlActivated(KUrl))); + + // Encapsulate the MetaDataWidget inside a container that has a dummy widget + // at the bottom. This prevents that the meta data widget gets vertically stretched + // in the case where the height of m_metaDataArea > m_metaDataWidget. + QWidget* metaDataWidgetContainer = new QWidget(parent); + QVBoxLayout* containerLayout = new QVBoxLayout(metaDataWidgetContainer); + containerLayout->setContentsMargins(0, 0, 0, 0); + containerLayout->setSpacing(0); + containerLayout->addWidget(m_metaDataWidget); + QWidget* stretchWidget = new QWidget(metaDataWidgetContainer); + stretchWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); + containerLayout->addWidget(stretchWidget); m_metaDataArea = new QScrollArea(parent); - //m_metaDataArea->setWidget(m_metaDataArea); + m_metaDataArea->setWidget(metaDataWidgetContainer); m_metaDataArea->setWidgetResizable(true); m_metaDataArea->setFrameShape(QFrame::NoFrame); @@ -137,14 +129,10 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) : palette.setColor(viewport->backgroundRole(), QColor(Qt::transparent)); viewport->setPalette(palette); - layout->addWidget(m_nameLabel); - layout->addWidget(new KSeparator(this)); layout->addWidget(m_preview); layout->addWidget(m_phononWidget); - layout->addWidget(m_previewSeparator); - if (m_metaDataWidget != 0) { - layout->addWidget(m_metaDataWidget); - } + layout->addWidget(m_nameLabel); + layout->addWidget(new KSeparator()); layout->addWidget(m_metaDataArea); parent->setLayout(layout); } @@ -159,61 +147,54 @@ void InformationPanelContent::showItem(const KFileItem& item) m_pendingPreview = false; const KUrl itemUrl = item.url(); + const bool isNepomukSearchUrl = (itemUrl.protocol() == "nepomuksearch") && item.nepomukUri().isEmpty(); if (!applyPlace(itemUrl)) { - // try to get a preview pixmap from the item... - m_pendingPreview = true; - - // Mark the currently shown preview as outdated. This is done - // with a small delay to prevent a flickering when the next preview - // can be shown within a short timeframe. This timer is not started - // for directories, as directory previews might fail and return the - // same icon. - if (!item.isDir()) { - m_outdatedPreviewTimer->start(); - } - - KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << item, - m_preview->width(), - m_preview->height(), - 0, - 0, - false, - true); + if (isNepomukSearchUrl) { + // in the case of a Nepomuk query-URL the URL is not readable for humans + // (at least not useful to show in the Information Panel) + KIconLoader iconLoader; + QPixmap icon = iconLoader.loadIcon("nepomuk", + KIconLoader::NoGroup, + KIconLoader::SizeEnormous); + m_preview->setPixmap(icon); + setNameLabelText(QString()); + } else { + // try to get a preview pixmap from the item... + m_pendingPreview = true; + + // Mark the currently shown preview as outdated. This is done + // with a small delay to prevent a flickering when the next preview + // can be shown within a short timeframe. This timer is not started + // for directories, as directory previews might fail and return the + // same icon. + if (!item.isDir()) { + m_outdatedPreviewTimer->start(); + } - connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), - this, SLOT(showPreview(const KFileItem&, const QPixmap&))); - connect(job, SIGNAL(failed(const KFileItem&)), - this, SLOT(showIcon(const KFileItem&))); + KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << item, + m_preview->width(), + m_preview->height(), + 0, + 0, + false, + true); - setNameLabelText(itemUrl.fileName()); - } + connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), + this, SLOT(showPreview(const KFileItem&, const QPixmap&))); + connect(job, SIGNAL(failed(const KFileItem&)), + this, SLOT(showIcon(const KFileItem&))); -/* TODO: move to MetaDataWidget - if (!item.isDir() && item.nepomukUri().isValid()) { - KConfig config("kmetainformationrc", KConfig::NoGlobals); - KConfigGroup settings = config.group("Show"); - initMetaInfoSettings(settings); - - Nepomuk::Resource res(item.url()); - - QHash properties = res.properties(); - QHash::const_iterator it = properties.constBegin(); - while (it != properties.constEnd()) { - Nepomuk::Types::Property prop(it.key()); - if (settings.readEntry(prop.name(), true)) { - // TODO #1: use Nepomuk::formatValue(res, prop) if available - // instead of it.value().toString() - // TODO #2: using tunedLabel() is a workaround for KDE 4.3 until - // we get translated labels - m_metaTextLabel->add(tunedLabel(prop.label()) + ':', it.value().toString()); - } - ++it; + setNameLabelText(item.text()); } } -*/ if (m_metaDataWidget != 0) { - m_metaDataWidget->setItem(item); + if (isNepomukSearchUrl) { + m_metaDataWidget->hide(); + } else { + m_metaDataWidget->show(); + m_metaDataWidget->setItem(item); + } } if (InformationPanelSettings::showPreview()) { @@ -269,7 +250,7 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event) if (obj == m_metaDataArea->viewport()) { // The size of the meta text area has changed. Adjust the fixed // width in a way that no horizontal scrollbar needs to be shown. - //m_metaDataWidget->setFixedWidth(resizeEvent->size().width()); + m_metaDataWidget->setFixedWidth(resizeEvent->size().width()); } else if (obj == parent()) { // If the text inside the name label or the info label cannot // get wrapped, then the maximum width of the label is increased @@ -282,7 +263,7 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event) // The metadata widget also contains a text widget which may return // a large preferred width. if (m_metaDataWidget != 0) { - //m_metaDataWidget->setMaximumWidth(maxWidth); + m_metaDataWidget->setMaximumWidth(maxWidth); } // try to increase the preview as large as possible @@ -299,12 +280,6 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event) void InformationPanelContent::configureSettings() { -#ifdef HAVE_NEPOMUK - if (m_item.isNull() || - !m_item.nepomukUri().isValid()) { - return; - } - KMenu popup(this); QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview")); @@ -312,80 +287,8 @@ void InformationPanelContent::configureSettings() previewAction->setCheckable(true); previewAction->setChecked(InformationPanelSettings::showPreview()); - const bool metaDataAvailable = true; // MetaDataWidget::metaDataAvailable(); TODO - - QAction* ratingAction = popup.addAction(i18nc("@action:inmenu", "Rating")); - ratingAction->setIcon(KIcon("rating")); - ratingAction->setCheckable(true); - ratingAction->setChecked(InformationPanelSettings::showRating()); - ratingAction->setEnabled(metaDataAvailable); - - QAction* commentAction = popup.addAction(i18nc("@action:inmenu", "Comment")); - commentAction->setIcon(KIcon("text-plain")); - commentAction->setCheckable(true); - commentAction->setChecked(InformationPanelSettings::showComment()); - commentAction->setEnabled(metaDataAvailable); - - QAction* tagsAction = popup.addAction(i18nc("@action:inmenu", "Tags")); - tagsAction->setCheckable(true); - tagsAction->setChecked(InformationPanelSettings::showTags()); - tagsAction->setEnabled(metaDataAvailable); - - KConfig config("kmetainformationrc", KConfig::NoGlobals); - KConfigGroup settings = config.group("Show"); - initMetaInfoSettings(settings); - - QList actions; - - // Get all meta information labels that are available for - // the currently shown file item and add them to the popup. - Nepomuk::Resource res(m_item.url()); - QHash properties = res.properties(); - QHash::const_iterator it = properties.constBegin(); - while (it != properties.constEnd()) { - Nepomuk::Types::Property prop(it.key()); - const QString key = prop.name(); - - // Meta information provided by Nepomuk that is already - // available from KFileItem should not be configurable. - bool skip = (key == "fileExtension") || - (key == "name") || - (key == "sourceModified") || - (key == "size") || - (key == "mime type"); - if (!skip) { - // Check whether there is already a meta information - // having the same label. In this case don't show it - // twice in the menu. - foreach (const QAction* action, actions) { - if (action->data().toString() == key) { - skip = true; - break; - } - } - } - - if (!skip) { - const QString label = tunedLabel(prop.label()); - QAction* action = new QAction(label, &popup); - action->setCheckable(true); - action->setChecked(settings.readEntry(key, true)); - action->setData(key); - actions.append(action); - } - - ++it; - } - - if (!actions.isEmpty()) { - popup.addSeparator(); - - // add all items alphabetically sorted to the popup - qSort(actions.begin(), actions.end(), lessThan); - foreach (QAction* action, actions) { - popup.addAction(action); - } - } + QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure...")); + configureAction->setIcon(KIcon("configure")); // Open the popup and adjust the settings for the // selected action. @@ -397,31 +300,18 @@ void InformationPanelContent::configureSettings() const bool isChecked = action->isChecked(); if (action == previewAction) { m_preview->setVisible(isChecked); - m_previewSeparator->setVisible(isChecked); InformationPanelSettings::setShowPreview(isChecked); - } else if (action == ratingAction) { - //m_metaDataWidget->setRatingVisible(isChecked); - InformationPanelSettings::setShowRating(isChecked); - } else if (action == commentAction) { - //m_metaDataWidget->setCommentVisible(isChecked); - InformationPanelSettings::setShowComment(isChecked); - } else if (action == tagsAction) { - //m_metaDataWidget->setTagsVisible(isChecked); - InformationPanelSettings::setShowTags(isChecked); - } else { - settings.writeEntry(action->data().toString(), action->isChecked()); - settings.sync(); + } else if (action == configureAction) { + QPointer dialog = new KMetaDataConfigurationDialog(m_metaDataWidget, this, Qt::Dialog); + dialog->setDescription(i18nc("@label::textbox", + "Configure which data should be shown in the Information Panel.")); + dialog->exec(); + delete dialog; } - /*if (m_metaDataWidget != 0) { - const bool visible = m_metaDataWidget->isRatingVisible() || - m_metaDataWidget->isCommentVisible() || - m_metaDataWidget->areTagsVisible(); - m_metaDataSeparator->setVisible(visible); - }*/ - - showItem(m_item); -#endif + if (!m_item.isNull() && m_item.nepomukUri().isValid()) { + showItem(m_item); + } } void InformationPanelContent::showIcon(const KFileItem& item) @@ -511,52 +401,4 @@ void InformationPanelContent::setNameLabelText(const QString& text) m_nameLabel->setText(wrappedText); } -void InformationPanelContent::initMetaInfoSettings(KConfigGroup& group) -{ - if (!group.readEntry("initialized", false)) { - // The resource file is read the first time. Assure - // that some meta information is disabled per default. - - static const char* disabledProperties[] = { - "asText", "contentSize", "depth", "fileExtension", - "fileName", "fileSize", "isPartOf", "mimetype", "name", - "parentUrl", "plainTextContent", "sourceModified", - "size", "url", - 0 // mandatory last entry - }; - - int i = 0; - while (disabledProperties[i] != 0) { - group.writeEntry(disabledProperties[i], false); - ++i; - } - - // mark the group as initialized - group.writeEntry("initialized", true); - } -} - -QString InformationPanelContent::tunedLabel(const QString& label) const -{ - QString tunedLabel; - const int labelLength = label.length(); - if (labelLength > 0) { - tunedLabel.reserve(labelLength); - tunedLabel = label[0].toUpper(); - for (int i = 1; i < labelLength; ++i) { - if (label[i].isUpper() && !label[i - 1].isSpace() && !label[i - 1].isUpper()) { - tunedLabel += ' '; - tunedLabel += label[i].toLower(); - } else { - tunedLabel += label[i]; - } - } - } - return tunedLabel; -} - -void InformationPanelContent::init() -{ -} - #include "informationpanelcontent.moc"