Unify the search interface for non-indexed and indexed folders

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c47abd8c1c9d447968c0ce90a055d40924259d57..cdfd4d7d2bce37be5917f39f436e876ecbce268f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,9 @@ endif (Nepomuk_FOUND)
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS
+    additionalinfoaccessor.cpp
     dolphindetailsview.cpp
+    dolphindetailsviewexpander.cpp
     dolphiniconsview.cpp
     dolphincolumnview.cpp
     dolphincolumnviewcontainer.cpp
@@ -31,7 +33,6 @@ set(dolphinprivate_LIB_SRCS
     dolphinviewautoscroller.cpp
     dolphinviewcontroller.cpp
     dolphinremoteencoding.cpp
-    dolphindetailsviewexpander.cpp
     draganddrophelper.cpp
     folderexpander.cpp
     renamedialog.cpp
@@ -113,7 +114,6 @@ set(dolphin_SRCS
     panels/folders/folderspanel.cpp
     panels/folders/paneltreeview.cpp
     search/dolphinsearchbox.cpp
-    search/searchoptiondialogbox.cpp
     settings/behaviorsettingspage.cpp
     settings/columnviewsettingspage.cpp
     settings/contextmenusettingspage.cpp
@@ -148,14 +148,11 @@ kde4_add_kcfg_files(dolphin_SRCS
 if(Nepomuk_FOUND)
     set(dolphin_SRCS
         ${dolphin_SRCS}
-        search/dolphinsearchoptionsconfigurator.cpp
-        search/searchcriteriondescription.cpp
-        search/searchcriterionselector.cpp
-        search/searchcriterionvalue.cpp
+        search/filters/abstractsearchfilterwidget.cpp
+        search/filters/datesearchfilterwidget.cpp
+        search/filters/ratingsearchfilterwidget.cpp
+        search/filters/tagsearchfilterwidget.cpp
     )
-endif(Nepomuk_FOUND)
-
-if(Nepomuk_FOUND)
     include(SopranoAddOntology)
     soprano_add_ontology(dolphin_SRCS ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig "NFO" "Nepomuk::Vocabulary" "trig")
     soprano_add_ontology(dolphin_SRCS ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig "NIE" "Nepomuk::Vocabulary" "trig")
@@ -179,7 +176,7 @@ kde4_add_kdeinit_executable(dolphin ${dolphin_SRCS})
 target_link_libraries(kdeinit_dolphin
     ${KDE4_KDEPRINT_LIBS}
     ${KDE4_KFILE_LIBS}
-    ${KDE4_KUTILS_LIBRARY}
+    ${KDE4_KCMUTILS_LIBRARY}
     konq
     dolphinprivate
     knewstuff3
@@ -267,6 +264,14 @@ install(TARGETS kcm_dolphinnavigation DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(TARGETS kcm_dolphinservices DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(TARGETS kcm_dolphingeneral DESTINATION ${PLUGIN_INSTALL_DIR} )
 
+#########################################
+
+set(kio_search_PART_SRCS
+    search/filenamesearchprotocol.cpp)
+kde4_add_plugin(kio_filenamesearch ${kio_search_PART_SRCS})
+target_link_libraries(kio_filenamesearch ${KDE4_KIO_LIBS})
+install(TARGETS kio_filenamesearch DESTINATION ${PLUGIN_INSTALL_DIR})
+
 ########### install files ###############
 
 install( FILES dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
@@ -278,11 +283,13 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
                settings/dolphin_versioncontrolsettings.kcfg
          DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
-install( FILES search/dolphinsearchcommands.desktop DESTINATION ${DATA_INSTALL_DIR}/dolphin )
-install( FILES kcm/kcmdolphinviewmodes.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES search/filenamesearch.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kcm/kcmdolphinviewmodes.desktop DESTINATION
+${SERVICES_INSTALL_DIR} )
 install( FILES kcm/kcmdolphinnavigation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES kcm/kcmdolphinservices.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES kcm/kcmdolphingeneral.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES khns/servicemenu.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
 install( PROGRAMS khns/servicemenuinstallation DESTINATION ${BIN_INSTALL_DIR} )
 install( PROGRAMS khns/servicemenudeinstallation DESTINATION ${BIN_INSTALL_DIR} )
+