Dolphin: Make Nepomuk Support Optional

Use the KFileMetadataWidget if Nepomuk is not present.

REVIEW: 108236

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b7aa5b3856510b141de6ac7548b8e4fa0207e604..13392b8307a778a23e7f092ebcdaf4835171d47b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,12 @@
 macro_optional_find_package(Soprano)
 macro_optional_find_package(NepomukCore)
 macro_optional_find_package(NepomukWidgets)
-macro_log_feature(NepomukCore_FOUND "Nepomuk" "Nepomuk" "http://www.kde.org" FALSE "" "For adding desktop-wide tagging support to dolphin")
-macro_bool_to_01(NepomukCore_FOUND HAVE_NEPOMUK)
+macro_log_feature(NepomukCore_FOUND "Nepomuk Core" "Nepomuk Core functionality" "http://www.kde.org" FALSE "" "For fetching additional file metadata in dolphin")
+macro_log_feature(NepomukWidgets_FOUND "Nepomuk Widgets" "Nepomuk Widgets" "http://www.kde.org" FALSE "" "For adding desktop-wide tagging support to dolphin")
+if( DEFINED NepomukCore_FOUND AND DEFINED NepomukWidgets_FOUND )
+    set(HAVE_NEPOMUK TRUE)
+endif()
+
 configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
 
 macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 355a571967d44b47bad72af9ebdad46a4eb9c91b..85571befd70a7660678cb62938f7e53615d4dbe8 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -31,7 +31,11 @@
 #include <kseparator.h>
 #include <KStringHandler>
 
+#ifndef HAVE_NEPOMUK
+#include <KFileMetaDataWidget>
+#else
 #include <nepomuk2/filemetadatawidget.h>
+#endif
 
 #include <panels/places/placesitem.h>
 #include <panels/places/placesitemmodel.h>
@@ -107,7 +111,11 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     const bool previewsShown = InformationPanelSettings::previewsShown();
     m_preview->setVisible(previewsShown);
 
+#ifndef HAVE_NEPOMUK
+    m_metaDataWidget = new KFileMetaDataWidget(parent);
+#else
     m_metaDataWidget = new Nepomuk2::FileMetaDataWidget(parent);
+#endif
     m_metaDataWidget->setFont(KGlobalSettings::smallestReadableFont());
     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
     connect(m_metaDataWidget, SIGNAL(urlActivated(KUrl)), this, SIGNAL(urlActivated(KUrl)));

diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index 2a369bbbc40fa6412107f074813af3836a254951..ed9200aef4cd0d1dbb175a6b769c1678ae3e96e8 100644 (file)
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -20,6 +20,7 @@
 #ifndef INFORMATIONPANELCONTENT_H
 #define INFORMATIONPANELCONTENT_H
 
+#include "config-nepomuk.h"
 #include <KConfig>
 #include <KFileItem>
 #include <KUrl>
@@ -34,9 +35,13 @@ class QString;
 class QLabel;
 class QScrollArea;
 
+#ifndef HAVE_NEPOMUK
+class KFileMetaDataWidget;
+#else
 namespace Nepomuk2 {
     class FileMetaDataWidget;
 }
+#endif
 
 /**
  * @brief Manages the widgets that display the meta information
@@ -136,7 +141,11 @@ private:
     PixmapViewer* m_preview;
     PhononWidget* m_phononWidget;
     QLabel* m_nameLabel;
+#ifndef HAVE_NEPOMUK
+    KFileMetaDataWidget* m_metaDataWidget;
+#else
     Nepomuk2::FileMetaDataWidget* m_metaDataWidget;
+#endif
     QScrollArea* m_metaDataArea;
 
     PlacesItemModel* m_placesItemModel;

diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp
index d0cba741ed10551297bd21f6cc3c99fae40d00b3..77a07e2680f71cbb92e4d75871a63b8b06eddf41 100644 (file)
--- a/src/views/tooltips/filemetadatatooltip.cpp
+++ b/src/views/tooltips/filemetadatatooltip.cpp
@@ -30,7 +30,11 @@
 #include <QStylePainter>
 #include <QVBoxLayout>
 
+#ifndef HAVE_NEPOMUK
+#include <KFileMetaDataWidget>
+#else
 #include <nepomuk2/filemetadatawidget.h>
+#endif
 
 // For the blurred tooltip background
 #include <plasma/windoweffects.h>
@@ -56,7 +60,11 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
     m_name->setFont(font);
 
     // Create widget for the meta data
+#ifndef HAVE_NEPOMUK
+    m_fileMetaDataWidget = new KFileMetaDataWidget(this);
+#else
     m_fileMetaDataWidget = new Nepomuk2::FileMetaDataWidget(this);
+#endif
     m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
     m_fileMetaDataWidget->setReadOnly(true);
     connect(m_fileMetaDataWidget, SIGNAL(metaDataRequestFinished(KFileItemList)),

diff --git a/src/views/tooltips/filemetadatatooltip.h b/src/views/tooltips/filemetadatatooltip.h
index aa7ce63ed5b6dfe143defacf3624064de146bcd3..e7cb3f0394d5f431b081c5be53611d3c9c36b62a 100644 (file)
--- a/src/views/tooltips/filemetadatatooltip.h
+++ b/src/views/tooltips/filemetadatatooltip.h
@@ -23,13 +23,18 @@
 #define FILEMETADATATOOLTIP_H
 
 #include <QWidget>
+#include "config-nepomuk.h"
 
 class KFileItemList;
 class QLabel;
 
+#ifndef HAVE_NEPOMUK
+class KFileMetaDataWidget;
+#else
 namespace Nepomuk2 {
     class FileMetaDataWidget;
 }
+#endif
 
 /**
  * @brief Tooltip, that shows the meta information and a preview of one
@@ -71,7 +76,11 @@ protected:
 private:
     QLabel* m_preview;
     QLabel* m_name;
+#ifndef HAVE_NEPOMUK
+    KFileMetaDataWidget* m_fileMetaDataWidget;
+#else
     Nepomuk2::FileMetaDataWidget* m_fileMetaDataWidget;
+#endif
 };
 
 #endif