prepare the behavior-settings dialog to configure the shown meta data for tooltips

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

diff --git a/src/panels/information/metadataconfigurationdialog.cpp b/src/panels/information/metadataconfigurationdialog.cpp
index a725e976fd867f2bf955f6dc7c6a31d0f0de9166..f3bb929da76f7bf7e275ee277acfc344d1a5e9a2 100644 (file)
--- a/src/panels/information/metadataconfigurationdialog.cpp
+++ b/src/panels/information/metadataconfigurationdialog.cpp
@@ -92,6 +92,11 @@ void MetaDataConfigurationDialog::Private::loadMetaData()
 #ifdef HAVE_NEPOMUK
     // Get all meta information labels that are available for
     // the currently shown file item and add them to the list.
 #ifdef HAVE_NEPOMUK
     // Get all meta information labels that are available for
     // the currently shown file item and add them to the list.

+    if (m_url.isEmpty()) {
+        // TODO: in this case all available meta data from the system
+        // should be added.
+        return;
+    }

     Nepomuk::Resource res(m_url);
     QHash<QUrl, Nepomuk::Variant> properties = res.properties();
     QHash<QUrl, Nepomuk::Variant>::const_iterator it = properties.constBegin();
     Nepomuk::Resource res(m_url);
     QHash<QUrl, Nepomuk::Variant> properties = res.properties();
     QHash<QUrl, Nepomuk::Variant>::const_iterator it = properties.constBegin();

diff --git a/src/panels/information/metadataconfigurationdialog.h b/src/panels/information/metadataconfigurationdialog.h
index 18f0ecde6ae99f50da162469697c966eeb160402..9dda9c19031ed79cb25798c4033b6698cf6f5d38 100644 (file)
--- a/src/panels/information/metadataconfigurationdialog.h
+++ b/src/panels/information/metadataconfigurationdialog.h
@@ -30,9 +30,17 @@ class MetaDataConfigurationDialog : public KDialog
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

+    /**
+     * @param url    URL for which should be configured what kind of meta data is
+     *               shown. If the URL is empty, the configuration dialog will contain
+     *               all available meta data from the system.
+     * @param parent Parent widget which opens the dialog.
+     * @param flags  Window flags for the dialog.
+     */

     MetaDataConfigurationDialog(const KUrl& url,
                                 QWidget* parent = 0,
                                 Qt::WFlags flags = 0);
     MetaDataConfigurationDialog(const KUrl& url,
                                 QWidget* parent = 0,
                                 Qt::WFlags flags = 0);

+

     virtual ~MetaDataConfigurationDialog();
 
 protected slots:
     virtual ~MetaDataConfigurationDialog();
 
 protected slots:

diff --git a/src/settings/behaviorsettingspage.cpp b/src/settings/behaviorsettingspage.cpp
index 0965b3e22449790178bf22861e39c8ed27840e29..80afd04f55214f72d3624f18ebfe9050b6eac127 100644 (file)
--- a/src/settings/behaviorsettingspage.cpp
+++ b/src/settings/behaviorsettingspage.cpp
@@ -23,6 +23,9 @@
 #include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 
 #include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 

+// TODO:
+// #include "nepomuk/metadataconfigurationdialog.h"
+

 #include <viewproperties.h>
 
 #include <kdialog.h>
 #include <viewproperties.h>
 
 #include <kdialog.h>


@@ -31,6 +34,7 @@
 
 #include <QCheckBox>
 #include <QGroupBox>
 
 #include <QCheckBox>
 #include <QGroupBox>

+#include <QHBoxLayout>

 #include <QLabel>
 #include <QRadioButton>
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QRadioButton>
 #include <QVBoxLayout>


@@ -47,6 +51,7 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
     m_confirmDelete(0),
     m_renameInline(0),
     m_showToolTips(0),
     m_confirmDelete(0),
     m_renameInline(0),
     m_showToolTips(0),

+    m_configureToolTips(0),

     m_showSelectionToggle(0),
     m_naturalSorting(0)
 {
     m_showSelectionToggle(0),
     m_naturalSorting(0)
 {


@@ -88,15 +93,30 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
     confirmBoxLayout->addWidget(m_confirmDelete);
     confirmBoxLayout->addWidget(m_confirmClosingMultipleTabs);
 
     confirmBoxLayout->addWidget(m_confirmDelete);
     confirmBoxLayout->addWidget(m_confirmClosingMultipleTabs);
 

+    // 'Rename inline'

     m_renameInline = new QCheckBox(i18nc("@option:check", "Rename inline"), vBox);
     connect(m_renameInline, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     m_renameInline = new QCheckBox(i18nc("@option:check", "Rename inline"), vBox);
     connect(m_renameInline, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 

-    m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), vBox);
+    // 'Show tooltips'
+    QWidget* toolTipContainer = new QWidget(vBox);
+    QHBoxLayout* toolTipsLayout = new QHBoxLayout(toolTipContainer);
+    toolTipsLayout->setMargin(0);
+    m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), toolTipContainer);

     connect(m_showToolTips, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
     connect(m_showToolTips, SIGNAL(toggled(bool)), this, SIGNAL(changed()));

+    connect(m_showToolTips, SIGNAL(toggled(bool)), this, SLOT(updateConfigureButton()));
+
+    m_configureToolTips = new QLabel(toolTipContainer);
+    connect(m_configureToolTips, SIGNAL(linkActivated(const QString&)),
+            this, SLOT(configureToolTips(const QString&)));
+
+    toolTipsLayout->addWidget(m_showToolTips);
+    toolTipsLayout->addWidget(m_configureToolTips, 1, Qt::AlignLeft);

 
 

+    // 'Show selection marker'

     m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker"), vBox);
     connect(m_showSelectionToggle, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker"), vBox);
     connect(m_showSelectionToggle, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 

+    // 'Natural sorting of items'

     m_naturalSorting = new QCheckBox(i18nc("option:check", "Natural sorting of items"), vBox);
     connect(m_naturalSorting, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     m_naturalSorting = new QCheckBox(i18nc("option:check", "Natural sorting of items"), vBox);
     connect(m_naturalSorting, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 


@@ -162,6 +182,24 @@ void BehaviorSettingsPage::restoreDefaults()
     m_confirmDelete->setChecked(CONFIRM_DELETE);
 }
 
     m_confirmDelete->setChecked(CONFIRM_DELETE);
 }
 

+void BehaviorSettingsPage::updateConfigureButton()
+{
+    if (m_showToolTips->isChecked()) {
+        m_configureToolTips->setText("<a href=\"configure\">" +
+                                     i18nc("@action:button", "Configure...") +
+                                     "</a>");
+    } else {
+        m_configureToolTips->setText(QString());
+    }
+}
+
+void BehaviorSettingsPage::configureToolTips()
+{
+    // TODO:
+    //MetaDataConfigurationDialog dialog(KUrl(), this, Qt::Dialog);
+    //dialog.exec();
+}
+

 void BehaviorSettingsPage::loadSettings()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
 void BehaviorSettingsPage::loadSettings()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();


@@ -181,6 +219,8 @@ void BehaviorSettingsPage::loadSettings()
     m_showToolTips->setChecked(settings->showToolTips());
     m_showSelectionToggle->setChecked(settings->showSelectionToggle());
     m_naturalSorting->setChecked(KGlobalSettings::naturalSorting());
     m_showToolTips->setChecked(settings->showToolTips());
     m_showSelectionToggle->setChecked(settings->showSelectionToggle());
     m_naturalSorting->setChecked(KGlobalSettings::naturalSorting());

+
+    updateConfigureButton();

 }
 
 #include "behaviorsettingspage.moc"
 }
 
 #include "behaviorsettingspage.moc"

diff --git a/src/settings/behaviorsettingspage.h b/src/settings/behaviorsettingspage.h
index 292a7957623da111c32a2899dec083c8569aaa75..331e458068f1077173c28f85428a32bdfe06b381 100644 (file)
--- a/src/settings/behaviorsettingspage.h
+++ b/src/settings/behaviorsettingspage.h
@@ -24,6 +24,7 @@
 #include <kurl.h>
 
 class QCheckBox;
 #include <kurl.h>
 
 class QCheckBox;

+class QLabel;

 class QRadioButton;
 
 /**
 class QRadioButton;
 
 /**


@@ -43,6 +44,19 @@ public:
     /** @see SettingsPageBase::restoreDefaults() */
     virtual void restoreDefaults();
 
     /** @see SettingsPageBase::restoreDefaults() */
     virtual void restoreDefaults();
 

+private slots:
+    /**
+     * Updates the visibility state of the configure
+     * button m_configureToolTips.
+     */
+    void updateConfigureButton();
+
+    /**
+     * Opens a dialog which allows the user to specify which
+     * meta data should be shown in the tooltip.
+     */
+    void configureToolTips();
+

 private:
     void loadSettings();
 
 private:
     void loadSettings();
 


@@ -58,6 +72,7 @@ private:
 
     QCheckBox* m_renameInline;
     QCheckBox* m_showToolTips;
 
     QCheckBox* m_renameInline;
     QCheckBox* m_showToolTips;

+    QLabel* m_configureToolTips;

     QCheckBox* m_showSelectionToggle;
     QCheckBox* m_naturalSorting;
 };
     QCheckBox* m_showSelectionToggle;
     QCheckBox* m_naturalSorting;
 };