]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/CMakeLists.txt
projects / dolphin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 1fc017a45db5c04d5d6774d3c94583798d84f469..cdfd4d7d2bce37be5917f39f436e876ecbce268f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,8 +16,9 @@ endif (Nepomuk_FOUND)
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS
-    dolphincontroller.cpp
+    additionalinfoaccessor.cpp
     dolphindetailsview.cpp
+    dolphindetailsviewexpander.cpp
     dolphiniconsview.cpp
     dolphincolumnview.cpp
     dolphincolumnviewcontainer.cpp
@@ -30,8 +31,8 @@ set(dolphinprivate_LIB_SRCS
     dolphinview.cpp
     dolphinviewactionhandler.cpp
     dolphinviewautoscroller.cpp
+    dolphinviewcontroller.cpp
     dolphinremoteencoding.cpp
-    dolphindetailsviewexpander.cpp
     draganddrophelper.cpp
     folderexpander.cpp
     renamedialog.cpp
@@ -40,31 +41,20 @@ set(dolphinprivate_LIB_SRCS
     settings/additionalinfodialog.cpp
     settings/applyviewpropsjob.cpp
     settings/dolphinsettings.cpp
+    settings/filemetadataconfigurationdialog.cpp
     settings/viewpropertiesdialog.cpp
     settings/viewpropsprogressinfo.cpp
-    panels/information/kmetadatawidget.cpp
-    panels/information/kmetadataconfigurationdialog.cpp
-    tooltips/ktooltip.cpp
-    tooltips/ktooltipwindow.cpp
+    tooltips/filemetadatatooltip.cpp
     tooltips/tooltipmanager.cpp
+    versioncontrol/pendingthreadsmaintainer.cpp
     versioncontrol/updateitemstatesthread.cpp
     versioncontrol/versioncontrolobserver.cpp
     viewextensionsfactory.cpp
+    viewmodecontroller.cpp
     viewproperties.cpp
     zoomlevelinfo.cpp
 )
 
-if(Nepomuk_FOUND)
-    set(dolphinprivate_LIB_SRCS
-        ${dolphinprivate_LIB_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(dolphinprivate_LIB_SRCS
     settings/dolphin_columnmodesettings.kcfgc
     settings/dolphin_directoryviewpropertysettings.kcfgc
@@ -76,10 +66,7 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
 
 kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
 
-target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${KDE4_KNEWSTUFF3_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES})
-if(X11_Xrender_FOUND)
-  target_link_libraries(dolphinprivate ${X11_Xrender_LIB} )
-endif(X11_Xrender_FOUND)
+target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${KDE4_KNEWSTUFF3_LIBS} ${QIMAGEBLITZ_LIBRARIES})
 if (Nepomuk_FOUND)
   target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES} ${NEPOMUK_QUERY_LIBRARIES} ${SOPRANO_LIBRARIES})
 endif (Nepomuk_FOUND)
@@ -95,22 +82,14 @@ set(dolphinpart_SRCS
    dolphinpart.cpp
 )
 
-set(fileviewsvnplugin_SRCS
-    versioncontrol/fileviewsvnplugin.cpp
-)
-
 kde4_add_plugin(dolphinpart ${dolphinpart_SRCS})
-kde4_add_plugin(fileviewsvnplugin ${fileviewsvnplugin_SRCS})
 
 target_link_libraries(dolphinpart dolphinprivate konq ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS})
-target_link_libraries(fileviewsvnplugin ${KDE4_KIO_LIBS} konq)
 
 install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR})
-install(TARGETS fileviewsvnplugin DESTINATION ${PLUGIN_INSTALL_DIR})
 
 install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart)
 install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install(FILES versioncontrol/fileviewsvnplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 install(FILES versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
 ##########################################
@@ -127,8 +106,6 @@ set(dolphin_SRCS
     pixmapviewer.cpp
     panels/information/informationpanel.cpp
     panels/information/informationpanelcontent.cpp
-    panels/information/kmetadatawidget.cpp
-    panels/information/kmetadataconfigurationdialog.cpp
     panels/information/phononwidget.cpp
     panels/folders/ktreeview.cpp
     panels/places/placespanel.cpp
@@ -137,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
@@ -166,24 +142,17 @@ kde4_add_kcfg_files(dolphin_SRCS
     panels/folders/dolphin_folderspanelsettings.kcfgc
     panels/information/dolphin_informationpanelsettings.kcfgc
     search/dolphin_searchsettings.kcfgc
+    settings/dolphin_versioncontrolsettings.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
-        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")
@@ -202,12 +171,12 @@ qt4_add_dbus_adaptor(dolphin_SRCS
 
 kde4_add_app_icon(dolphin_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/system-file-manager.png")
 
-kde4_add_executable(dolphin ${dolphin_SRCS})
+kde4_add_kdeinit_executable(dolphin ${dolphin_SRCS})
 
-target_link_libraries(dolphin
+target_link_libraries(kdeinit_dolphin
     ${KDE4_KDEPRINT_LIBS}
     ${KDE4_KFILE_LIBS}
-    ${KDE4_KUTILS_LIBRARY}
+    ${KDE4_KCMUTILS_LIBRARY}
     konq
     dolphinprivate
     knewstuff3
@@ -215,13 +184,14 @@ target_link_libraries(dolphin
 )
 
 if (Nepomuk_FOUND)
-    target_link_libraries(dolphin
+    target_link_libraries(kdeinit_dolphin
         ${NEPOMUK_LIBRARIES}
         ${SOPRANO_LIBRARIES}
         ${NEPOMUK_QUERY_LIBRARIES}
     )
 endif (Nepomuk_FOUND)
 
+install(TARGETS kdeinit_dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ##########################################
@@ -249,22 +219,10 @@ set(kcm_dolphinservices_PART_SRCS
 
 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)
-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
@@ -279,7 +237,8 @@ kde4_add_kcfg_files(kcm_dolphinnavigation_PART_SRCS
     settings/dolphin_generalsettings.kcfgc)
 
 kde4_add_kcfg_files(kcm_dolphinservices_PART_SRCS
-    settings/dolphin_generalsettings.kcfgc)
+    settings/dolphin_generalsettings.kcfgc
+    settings/dolphin_versioncontrolsettings.kcfgc)
 
 kde4_add_kcfg_files(kcm_dolphingeneral_PART_SRCS
     settings/dolphin_generalsettings.kcfgc)
@@ -305,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} )
@@ -316,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} )
+