┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt35
-rw-r--r--src/panels/information/informationpanelcontent.cpp8
-rw-r--r--src/panels/information/informationpanelcontent.h9
-rw-r--r--src/settings/kcm/kcmdolphinnavigation.desktop1
-rw-r--r--src/views/tooltips/filemetadatatooltip.cpp8
-rw-r--r--src/views/tooltips/filemetadatatooltip.h9
6 files changed, 56 insertions, 14 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a0beafa80..4b31ab6a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,17 +5,25 @@ set_package_properties(NepomukCore PROPERTIES DESCRIPTION "Nepomuk Core librarie
PURPOSE "For adding desktop-wide tagging support to dolphin"
)
-macro_bool_to_01(NepomukCore_FOUND HAVE_NEPOMUK)
-configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
-
macro_optional_find_package(NepomukWidgets)
+set_package_properties(NepomukWidgets PROPERTIES DESCRIPTION "Nepomuk Widgets"
+ URL "http://www.kde.org"
+ TYPE OPTIONAL
+ PURPOSE "For adding desktop-wide tagging support to dolphin"
+ )
+
+if(NepomukCore_FOUND AND 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)
configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
include_directories( ${KACTIVITIES_INCLUDE_DIRS} )
-if (NepomukCore_FOUND)
+if(HAVE_NEPOMUK)
find_package(Soprano 2.7.56)
set_package_properties(Soprano PROPERTIES DESCRIPTION "Qt-based RDF storage and parsing solution"
URL "http://soprano.sourceforge.net"
@@ -23,9 +31,8 @@ if (NepomukCore_FOUND)
PURPOSE "Required for everything (storage and general data management)"
)
- # Yes, Soprano includes is what we need here
include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_CORE_INCLUDE_DIR} ${NEPOMUK_WIDGETS_INCLUDE_DIR} )
-endif (NepomukCore_FOUND)
+endif()
add_subdirectory(tests)
@@ -87,12 +94,12 @@ set(dolphinprivate_LIB_SRCS
views/zoomlevelinfo.cpp
)
-if (NepomukCore_FOUND)
+if(HAVE_NEPOMUK)
set(dolphinprivate_LIB_SRCS
${dolphinprivate_LIB_SRCS}
kitemviews/private/knepomukrolesprovider.cpp
)
-endif (NepomukCore_FOUND)
+endif()
kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
settings/dolphin_compactmodesettings.kcfgc
@@ -112,14 +119,14 @@ target_link_libraries(
${KDE4_KNEWSTUFF3_LIBS}
)
-if (NepomukCore_FOUND)
+if(HAVE_NEPOMUK)
target_link_libraries(
dolphinprivate
${NEPOMUK_CORE_LIBRARY}
${NEPOMUK_WIDGETS_LIBRARY}
${SOPRANO_LIBRARIES}
)
-endif (NepomukCore_FOUND)
+endif()
if(X11_Xrender_FOUND)
target_link_libraries(dolphinprivate ${X11_Xrender_LIB})
@@ -239,13 +246,13 @@ target_link_libraries(kdeinit_dolphin
${KDE4_PHONON_LIBS}
)
-if (NepomukCore_FOUND)
+if(HAVE_NEPOMUK)
target_link_libraries(kdeinit_dolphin
${NEPOMUK_CORE_LIBRARY}
${NEPOMUK_WIDGETS_LIBRARY}
${SOPRANO_LIBRARIES}
)
-endif (NepomukCore_FOUND)
+endif()
if (KActivities_FOUND)
target_link_libraries(
@@ -316,12 +323,12 @@ target_link_libraries(kcm_dolphinviewmodes ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS
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} ${KDE4_KNEWSTUFF3_LIBRARY} dolphinprivate)
target_link_libraries(kcm_dolphingeneral ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate)
-if (NepomukCore_FOUND)
+if(HAVE_NEPOMUK)
target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY})
target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY})
target_link_libraries(kcm_dolphinservices ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY})
target_link_libraries(kcm_dolphingeneral ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY})
-endif (NepomukCore_FOUND)
+endif()
install(TARGETS kcm_dolphinviewmodes DESTINATION ${PLUGIN_INSTALL_DIR} )
install(TARGETS kcm_dolphinnavigation DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 355a57196..85571befd 100644
--- 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 2a369bbbc..ed9200aef 100644
--- 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/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 26721b11c..69b6d6ed9 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -192,6 +192,7 @@ Name[lv]=Navigācija
Name[mai]=नेविगेशन
Name[mk]=Навигација
Name[ml]=നാവിഗേഷന്‍
+Name[mr]=संचारण पटल
Name[ms]=Navigasi
Name[nb]=Navigasjon
Name[nds]=Navigeren
diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp
index d0cba741e..77a07e268 100644
--- 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 aa7ce63ed..e7cb3f039 100644
--- 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
generated by cgit v1.3 (git 2.53.0) at 2026-04-19 07:09:17 +0000