allow to configure which meta data should be shown for tooltips

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4bac99705bb5d74fe3f5dee9f89e66d1c5a8e557..e44334d51127933b5b2437a3ee05132fb39ce250 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -167,14 +167,14 @@ kde4_add_kcfg_files(dolphin_SRCS
     panels/information/dolphin_informationpanelsettings.kcfgc)
 
 if(Nepomuk_FOUND)
     panels/information/dolphin_informationpanelsettings.kcfgc)
 
 if(Nepomuk_FOUND)

-set(dolphin_SRCS
-  ${dolphin_SRCS}
-  panels/information/kcommentwidget.cpp
-  panels/information/kedittagsdialog.cpp
-  panels/information/kloadmetadatathread.cpp
-  panels/information/nepomukmassupdatejob.cpp
-  panels/information/ktaggingwidget.cpp
-)
+    set(dolphin_SRCS
+        ${dolphin_SRCS}
+        panels/information/kcommentwidget.cpp
+        panels/information/kedittagsdialog.cpp
+        panels/information/kloadmetadatathread.cpp
+        panels/information/nepomukmassupdatejob.cpp
+        panels/information/ktaggingwidget.cpp
+    )

 endif(Nepomuk_FOUND)
 
 if(NOT WIN32)
 endif(Nepomuk_FOUND)
 
 if(NOT WIN32)


@@ -204,13 +204,13 @@ install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 set(kcm_dolphinviewmodes_PART_SRCS
     kcm/kcmdolphinviewmodes.cpp
 
 set(kcm_dolphinviewmodes_PART_SRCS
     kcm/kcmdolphinviewmodes.cpp

+    pixmapviewer.cpp

     settings/columnviewsettingspage.cpp
     settings/detailsviewsettingspage.cpp
     settings/dolphinfontrequester.cpp
     settings/iconsizegroupbox.cpp
     settings/iconsviewsettingspage.cpp
     settings/viewsettingspagebase.cpp
     settings/columnviewsettingspage.cpp
     settings/detailsviewsettingspage.cpp
     settings/dolphinfontrequester.cpp
     settings/iconsizegroupbox.cpp
     settings/iconsviewsettingspage.cpp
     settings/viewsettingspagebase.cpp

-    pixmapviewer.cpp

     zoomlevelinfo.cpp)
 
 set(kcm_dolphinnavigation_PART_SRCS
     zoomlevelinfo.cpp)
 
 set(kcm_dolphinnavigation_PART_SRCS


@@ -225,10 +225,22 @@ set(kcm_dolphinservices_PART_SRCS
 
 set(kcm_dolphingeneral_PART_SRCS
     kcm/kcmdolphingeneral.cpp
 
 set(kcm_dolphingeneral_PART_SRCS
     kcm/kcmdolphingeneral.cpp

+    panels/information/kmetadataconfigurationdialog.cpp
+    panels/information/kmetadatawidget.cpp

     settings/behaviorsettingspage.cpp
     settings/previewssettingspage.cpp
     settings/contextmenusettingspage.cpp
     settings/settingspagebase.cpp)
     settings/behaviorsettingspage.cpp
     settings/previewssettingspage.cpp
     settings/contextmenusettingspage.cpp
     settings/settingspagebase.cpp)

+if (Nepomuk_FOUND)
+    set(kcm_dolphingeneral_PART_SRCS
+        ${kcm_dolphingeneral_PART_SRCS}
+        panels/information/kcommentwidget.cpp
+        panels/information/kedittagsdialog.cpp
+        panels/information/kloadmetadatathread.cpp
+        panels/information/nepomukmassupdatejob.cpp
+        panels/information/ktaggingwidget.cpp
+    )
+endif (Nepomuk_FOUND)

 
 kde4_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS
     settings/dolphin_columnmodesettings.kcfgc
 
 kde4_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS
     settings/dolphin_columnmodesettings.kcfgc


@@ -254,7 +266,7 @@ kde4_add_plugin(kcm_dolphingeneral ${kcm_dolphingeneral_PART_SRCS})
 target_link_libraries(kcm_dolphinviewmodes  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate)
 target_link_libraries(kcm_dolphinnavigation  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate)
 target_link_libraries(kcm_dolphinservices  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate)
 target_link_libraries(kcm_dolphinviewmodes  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate)
 target_link_libraries(kcm_dolphinnavigation  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate)
 target_link_libraries(kcm_dolphinservices  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate)

-target_link_libraries(kcm_dolphingeneral ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate)
+target_link_libraries(kcm_dolphingeneral ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate)

 if (Nepomuk_FOUND)
   target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_LIBRARIES})
   target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_LIBRARIES})
 if (Nepomuk_FOUND)
   target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_LIBRARIES})
   target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_LIBRARIES})

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

-// TODO:
-// #include "nepomuk/metadataconfigurationdialog.h"
+#include "panels/information/kmetadataconfigurationdialog.h"

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


@@ -107,7 +106,7 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
 
     m_configureToolTips = new QLabel(toolTipContainer);
     connect(m_configureToolTips, SIGNAL(linkActivated(const QString&)),
 
     m_configureToolTips = new QLabel(toolTipContainer);
     connect(m_configureToolTips, SIGNAL(linkActivated(const QString&)),

-            this, SLOT(configureToolTips(const QString&)));
+            this, SLOT(configureToolTips()));

 
     toolTipsLayout->addWidget(m_showToolTips);
     toolTipsLayout->addWidget(m_configureToolTips, 1, Qt::AlignLeft);
 
     toolTipsLayout->addWidget(m_showToolTips);
     toolTipsLayout->addWidget(m_configureToolTips, 1, Qt::AlignLeft);


@@ -195,9 +194,11 @@ void BehaviorSettingsPage::updateConfigureButton()
 
 void BehaviorSettingsPage::configureToolTips()
 {
 
 void BehaviorSettingsPage::configureToolTips()
 {

-    // TODO:
-    //MetaDataConfigurationDialog dialog(KUrl(), this, Qt::Dialog);
-    //dialog.exec();
+    KMetaDataConfigurationDialog* dialog = new KMetaDataConfigurationDialog();
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
+    dialog->raise();
+    dialog->activateWindow();

 }
 
 void BehaviorSettingsPage::loadSettings()
 }
 
 void BehaviorSettingsPage::loadSettings()