Restore the "Edit->Selection" menu from Konqueror 3 for file

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e44334d51127933b5b2437a3ee05132fb39ce250..0b759df75f25476c10f5b24c5a8c18a5c33529ca 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,6 +31,7 @@ set(dolphinprivate_LIB_SRCS
     dolphinviewactionhandler.cpp
     dolphinviewautoscroller.cpp
     dolphinremoteencoding.cpp
+    dolphindetailsviewexpander.cpp
     draganddrophelper.cpp
     folderexpander.cpp
     renamedialog.cpp
@@ -51,17 +52,17 @@ set(dolphinprivate_LIB_SRCS
     viewextensionsfactory.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
-)
+    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
@@ -73,7 +74,7 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
 
 kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
 
-target_link_libraries(dolphinprivate ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} konq knewstuff2 ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES})
+target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq knewstuff2 ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES})
 if(X11_Xrender_FOUND)
   target_link_libraries(dolphinprivate ${X11_Xrender_LIB} )
 endif(X11_Xrender_FOUND)
@@ -99,8 +100,8 @@ set(fileviewsvnplugin_SRCS
 kde4_add_plugin(dolphinpart ${dolphinpart_SRCS})
 kde4_add_plugin(fileviewsvnplugin ${fileviewsvnplugin_SRCS})
 
-target_link_libraries(dolphinpart dolphinprivate konq ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS})
-target_link_libraries(fileviewsvnplugin ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${KDE4_KIO_LIBS} konq)
+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})
@@ -134,10 +135,6 @@ set(dolphin_SRCS
     panels/folders/folderspanel.cpp
     panels/folders/paneltreeview.cpp
     search/dolphinsearchbox.cpp
-    search/dolphinsearchoptionsconfigurator.cpp
-    search/searchcriteriondescription.cpp
-    search/searchcriterionselector.cpp
-    search/searchcriterionvalue.cpp
     settings/behaviorsettingspage.cpp
     settings/columnviewsettingspage.cpp
     settings/contextmenusettingspage.cpp
@@ -160,11 +157,13 @@ set(dolphin_SRCS
     statusbar/statusbarspaceinfo.cpp
     statusbar/statusbarmessagelabel.cpp
     zoomlevelinfo.cpp
-    )
+)
 
 kde4_add_kcfg_files(dolphin_SRCS
     panels/folders/dolphin_folderspanelsettings.kcfgc
-    panels/information/dolphin_informationpanelsettings.kcfgc)
+    panels/information/dolphin_informationpanelsettings.kcfgc
+    search/dolphin_searchsettings.kcfgc
+)
 
 if(Nepomuk_FOUND)
     set(dolphin_SRCS
@@ -174,6 +173,10 @@ if(Nepomuk_FOUND)
         panels/information/kloadmetadatathread.cpp
         panels/information/nepomukmassupdatejob.cpp
         panels/information/ktaggingwidget.cpp
+        search/dolphinsearchoptionsconfigurator.cpp
+        search/searchcriteriondescription.cpp
+        search/searchcriterionselector.cpp
+        search/searchcriterionvalue.cpp
     )
 endif(Nepomuk_FOUND)
 
@@ -192,10 +195,22 @@ kde4_add_app_icon(dolphin_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/system-fi
 
 kde4_add_executable(dolphin ${dolphin_SRCS})
 
-target_link_libraries(dolphin ${KDE4_KIO_LIBS}  ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KUTILS_LIBRARY} konq dolphinprivate ${KDE4_PHONON_LIBS})
+target_link_libraries(dolphin
+    ${KDE4_KDEPRINT_LIBS}
+    ${KDE4_KFILE_LIBS}
+    ${KDE4_KUTILS_LIBRARY}
+    konq
+    dolphinprivate
+    knewstuff2
+    ${KDE4_PHONON_LIBS}
+)
 
 if (Nepomuk_FOUND)
-  target_link_libraries(dolphin ${NEPOMUK_LIBRARIES} ${SOPRANO_LIBRARIES})
+    target_link_libraries(dolphin
+        ${NEPOMUK_LIBRARIES}
+        ${SOPRANO_LIBRARIES}
+        ${NEPOMUK_QUERY_LIBRARIES}
+    )
 endif (Nepomuk_FOUND)
 
 install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -265,7 +280,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_dolphinservices  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF2_LIBRARY} 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})