allow to set a custom description for the KMetaDataConfigurationDialog

svn path=/trunk/KDE/kdebase/apps/; revision=1045712

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 831a6e78bcafa6bf5cd74fbf7aab6fee86bc80a9..40d5c9cbc98f28926d11a60569b7f2c816ec5232 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -38,6 +38,7 @@
 #include <QEvent>
 #include <QLabel>
 #include <QPixmap>
+#include <QPointer>
 #include <QResizeEvent>
 #include <QScrollArea>
 #include <QTextLayout>
@@ -292,8 +293,11 @@ void InformationPanelContent::configureSettings()
         m_previewSeparator->setVisible(isChecked);
         InformationPanelSettings::setShowPreview(isChecked);
     } else if (action == configureAction) {
-        KMetaDataConfigurationDialog dialog(m_metaDataWidget, this, Qt::Dialog);
-        dialog.exec();
+        QPointer<KMetaDataConfigurationDialog> 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_item.isNull() && m_item.nepomukUri().isValid()) {

diff --git a/src/panels/information/kmetadataconfigurationdialog.cpp b/src/panels/information/kmetadataconfigurationdialog.cpp
index bbe4371396f605e4961f40e29bfd3619386c9306..7a7159297f9e0e159b830c041a7dcc79d8555ef2 100644 (file)
--- a/src/panels/information/kmetadataconfigurationdialog.cpp
+++ b/src/panels/information/kmetadataconfigurationdialog.cpp
@@ -44,6 +44,7 @@ public:
     QString tunedLabel(const QString& label) const;
 
     int m_visibleDataTypes;
+    QLabel* m_descriptionLabel;
     KMetaDataWidget* m_metaDataWidget;
     QListWidget* m_metaDataList;
 
@@ -65,14 +66,15 @@ KMetaDataConfigurationDialog::Private::Private(KMetaDataConfigurationDialog* par
     QWidget* mainWidget = new QWidget(q);
     QVBoxLayout* topLayout = new QVBoxLayout(mainWidget);
 
-    QLabel* label = new QLabel(i18nc("@label:textbox",
-                                     "Configure which data should "
-                                     "be shown."), q);
+    m_descriptionLabel = new QLabel(i18nc("@label::textbox",
+                                          "Configure which data should"
+                                          "be shown"), q);
+    m_descriptionLabel->setWordWrap(true);
 
     m_metaDataList = new QListWidget(q);
     m_metaDataList->setSelectionMode(QAbstractItemView::NoSelection);
 
-    topLayout->addWidget(label);
+    topLayout->addWidget(m_descriptionLabel);
     topLayout->addWidget(m_metaDataList);
 
     q->setMainWidget(mainWidget);
@@ -280,4 +282,14 @@ void KMetaDataConfigurationDialog::slotButtonClicked(int button)
     }
 }
 
+void KMetaDataConfigurationDialog::setDescription(const QString& description)
+{
+    d->m_descriptionLabel->setText(description);
+}
+
+QString KMetaDataConfigurationDialog::description() const
+{
+    return d->m_descriptionLabel->text();
+}
+
 #include "kmetadataconfigurationdialog.moc"

diff --git a/src/panels/information/kmetadataconfigurationdialog.h b/src/panels/information/kmetadataconfigurationdialog.h
index 1f0ae2201ad5d23e319b79caf6f3fc2638a6122d..02ac11d59ddcb7d5f03a09ed8120270ea681fd73 100644 (file)
--- a/src/panels/information/kmetadataconfigurationdialog.h
+++ b/src/panels/information/kmetadataconfigurationdialog.h
@@ -49,6 +49,14 @@ public:
                                  QWidget* parent = 0,
                                  Qt::WFlags flags = 0);
 
+    /**
+     * Sets the description that is shown above the list
+     * of meta data. Per default the translated text for
+     * "Configure which data should be shown." is set.
+     */
+    void setDescription(const QString& description);
+    QString description() const;
+
     virtual ~KMetaDataConfigurationDialog();
 
 protected slots:

diff --git a/src/settings/behaviorsettingspage.cpp b/src/settings/behaviorsettingspage.cpp
index fd76f155f28412661521b78abbd467ed33fe354b..2e558b7cbf0069894c0613337bff2d38918e6cab 100644 (file)
--- a/src/settings/behaviorsettingspage.cpp
+++ b/src/settings/behaviorsettingspage.cpp
@@ -195,6 +195,8 @@ void BehaviorSettingsPage::updateConfigureButton()
 void BehaviorSettingsPage::configureToolTips()
 {
     KMetaDataConfigurationDialog* dialog = new KMetaDataConfigurationDialog();
+    dialog->setDescription(i18nc("@label::textbox",
+                                 "Configure which data should be shown in the tooltip."));
     dialog->setAttribute(Qt::WA_DeleteOnClose);
     dialog->show();
     dialog->raise();