X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a70fcc635377b48846451a99d2954220d79f9caa..ab39a5952001cdb3d1b9ca693da7f8e246558fb8:/src/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 829c7f034..0b759df75 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,10 @@
 
-add_subdirectory( pics )
-add_subdirectory( tests )
-
 find_package(QImageBlitz REQUIRED)
 
 macro_optional_find_package(Nepomuk)
+macro_log_feature(Nepomuk_FOUND "Nepomuk" "Nepomuk" "http://www.kde.org" FALSE "" "For adding desktop-wide tagging support to dolphin")
 macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK)
+configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
 
 include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${QIMAGEBLITZ_INCLUDES} )
 
@@ -21,42 +20,61 @@ set(dolphinprivate_LIB_SRCS
     dolphindetailsview.cpp
     dolphiniconsview.cpp
     dolphincolumnview.cpp
-    dolphincolumnwidget.cpp
-    dolphindropcontroller.cpp
-    dolphinsortfilterproxymodel.cpp
-    draganddrophelper.cpp
+    dolphincolumnviewcontainer.cpp
+    dolphindirlister.cpp
+    dolphinfileitemdelegate.cpp
     dolphinmodel.cpp
-    dolphinsettings.cpp
+    dolphinnewmenuobserver.cpp
+    dolphinsortfilterproxymodel.cpp
     dolphincategorydrawer.cpp
     dolphinview.cpp
     dolphinviewactionhandler.cpp
-    iconmanager.cpp
-    ktooltip.cpp
-    kballoontipdelegate.cpp
-    kformattedballoontipdelegate.cpp
+    dolphinviewautoscroller.cpp
+    dolphinremoteencoding.cpp
+    dolphindetailsviewexpander.cpp
+    draganddrophelper.cpp
+    folderexpander.cpp
     renamedialog.cpp
     selectiontoggle.cpp
     selectionmanager.cpp
-    tooltipmanager.cpp
+    settings/additionalinfodialog.cpp
+    settings/applyviewpropsjob.cpp
+    settings/dolphinsettings.cpp
+    settings/viewpropertiesdialog.cpp
+    settings/viewpropsprogressinfo.cpp
+    panels/information/kmetadatawidget.cpp
+    panels/information/kmetadataconfigurationdialog.cpp
+    tooltips/ktooltip.cpp
+    tooltips/ktooltipwindow.cpp
+    tooltips/tooltipmanager.cpp
+    versioncontrol/updateitemstatesthread.cpp
+    versioncontrol/versioncontrolobserver.cpp
+    viewextensionsfactory.cpp
     viewproperties.cpp
-    viewpropertiesdialog.cpp
-    viewpropsprogressinfo.cpp
-    additionalinfodialog.cpp
-    applyviewpropsjob.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
-    dolphin_columnmodesettings.kcfgc
-    dolphin_directoryviewpropertysettings.kcfgc
-    dolphin_detailsmodesettings.kcfgc
-    dolphin_iconsmodesettings.kcfgc
-    dolphin_generalsettings.kcfgc)
+    settings/dolphin_columnmodesettings.kcfgc
+    settings/dolphin_directoryviewpropertysettings.kcfgc
+    settings/dolphin_detailsmodesettings.kcfgc
+    settings/dolphin_iconsmodesettings.kcfgc
+    settings/dolphin_generalsettings.kcfgc)
 
 kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
 
-configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
-
-target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${QIMAGEBLITZ_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)
@@ -75,75 +93,95 @@ 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)
+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 dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS fileviewsvnplugin DESTINATION ${PLUGIN_INSTALL_DIR})
 
-install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart )
+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})
 
 ##########################################
 
 set(dolphin_SRCS
-    columnviewsettingspage.cpp
-    commentwidget.cpp
-    commenteditwidget.cpp
-    detailsviewsettingspage.cpp
     dolphinapplication.cpp
-    dolphinfontrequester.cpp
     dolphinmainwindow.cpp
     dolphinnewmenu.cpp
     dolphinviewcontainer.cpp
-    dolphinstatusbar.cpp
     dolphindirlister.cpp
     dolphincontextmenu.cpp
-    dolphinfileplacesview.cpp
-    dolphinsettingsdialog.cpp
-    draganddrophelper.cpp
     filterbar.cpp
-    generalsettingspage.cpp
-    generalviewsettingspage.cpp
-    iconsizedialog.cpp
-    iconsviewsettingspage.cpp
-    infosidebarpage.cpp
-	ktreeview.cpp
     main.cpp
-    metadatawidget.cpp
-    metatextlabel.cpp
     pixmapviewer.cpp
-    settingspagebase.cpp
-    sidebarpage.cpp
-    startupsettingspage.cpp
-    statusbarspaceinfo.cpp
-    statusbarmessagelabel.cpp
-    treeviewcontextmenu.cpp
-    treeviewsidebarpage.cpp
-    sidebartreeview.cpp
-    viewsettingspage.cpp
-    viewsettingspagebase.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
+    panels/panel.cpp
+    panels/folders/treeviewcontextmenu.cpp
+    panels/folders/folderspanel.cpp
+    panels/folders/paneltreeview.cpp
+    search/dolphinsearchbox.cpp
+    settings/behaviorsettingspage.cpp
+    settings/columnviewsettingspage.cpp
+    settings/contextmenusettingspage.cpp
+    settings/dolphinfontrequester.cpp
+    settings/dolphinsettingsdialog.cpp
+    settings/detailsviewsettingspage.cpp
+    settings/generalsettingspage.cpp
+    settings/iconsizegroupbox.cpp
+    settings/iconsviewsettingspage.cpp
+    settings/navigationsettingspage.cpp
+    settings/previewssettingspage.cpp
+    settings/servicessettingspage.cpp
+    settings/settingspagebase.cpp
+    settings/startupsettingspage.cpp
+    settings/statusbarsettingspage.cpp
+    settings/trashsettingspage.cpp
+    settings/viewsettingspage.cpp
+    settings/viewsettingspagebase.cpp
+    statusbar/dolphinstatusbar.cpp
+    statusbar/statusbarspaceinfo.cpp
+    statusbar/statusbarmessagelabel.cpp
+    zoomlevelinfo.cpp
+)
 
 kde4_add_kcfg_files(dolphin_SRCS
-    dolphin_folderspanelsettings.kcfgc)
-
-if(Nepomuk_FOUND)
-set(dolphin_SRCS
-  ${dolphin_SRCS}
-  nepomukmassupdatejob.cpp
-  tagcloud/tagcloud.cpp
-  tagcloud/resourcetaggingwidget.cpp
-  tagcloud/taggingpopup.cpp
-  tagcloud/newtagdialog.cpp
+    panels/folders/dolphin_folderspanelsettings.kcfgc
+    panels/information/dolphin_informationpanelsettings.kcfgc
+    search/dolphin_searchsettings.kcfgc
 )
-kde4_add_ui_files(dolphin_SRCS tagcloud/newtagdialog.ui)
 
+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
+    )
 endif(Nepomuk_FOUND)
 
 if(NOT WIN32)
-   set(dolphin_SRCS ${dolphin_SRCS} terminalsidebarpage.cpp)
+   set(dolphin_SRCS ${dolphin_SRCS} panels/terminal/terminalpanel.cpp)
 endif(NOT WIN32)
 
 qt4_add_dbus_adaptor(dolphin_SRCS
@@ -157,49 +195,115 @@ 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_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} konq dolphinprivate)
+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})
+    target_link_libraries(dolphin
+        ${NEPOMUK_LIBRARIES}
+        ${SOPRANO_LIBRARIES}
+        ${NEPOMUK_QUERY_LIBRARIES}
+    )
 endif (Nepomuk_FOUND)
 
 install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ##########################################
 
-set(kcm_dolphin_PART_SRCS
-    kcmdolphin.cpp
-    columnviewsettingspage.cpp
-    detailsviewsettingspage.cpp
-    dolphinfontrequester.cpp
-#    dolphinsettings.cpp
-    generalviewsettingspage.cpp
-    iconsizedialog.cpp
-    iconsviewsettingspage.cpp
+set(kcm_dolphinviewmodes_PART_SRCS
+    kcm/kcmdolphinviewmodes.cpp
     pixmapviewer.cpp
-    viewsettingspagebase.cpp
-#    viewproperties.cpp
-)
+    settings/columnviewsettingspage.cpp
+    settings/detailsviewsettingspage.cpp
+    settings/dolphinfontrequester.cpp
+    settings/iconsizegroupbox.cpp
+    settings/iconsviewsettingspage.cpp
+    settings/viewsettingspagebase.cpp
+    zoomlevelinfo.cpp)
+
+set(kcm_dolphinnavigation_PART_SRCS
+    kcm/kcmdolphinnavigation.cpp
+    settings/navigationsettingspage.cpp
+    settings/settingspagebase.cpp)
+
+set(kcm_dolphinservices_PART_SRCS
+    kcm/kcmdolphinservices.cpp
+    settings/servicessettingspage.cpp
+    settings/settingspagebase.cpp)
+
+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
+    settings/dolphin_directoryviewpropertysettings.kcfgc
+    settings/dolphin_detailsmodesettings.kcfgc
+    settings/dolphin_iconsmodesettings.kcfgc
+    settings/dolphin_generalsettings.kcfgc)
+
+kde4_add_kcfg_files(kcm_dolphinnavigation_PART_SRCS
+    settings/dolphin_generalsettings.kcfgc)
+
+kde4_add_kcfg_files(kcm_dolphinservices_PART_SRCS
+    settings/dolphin_generalsettings.kcfgc)
 
-kde4_add_kcfg_files(kcm_dolphin_PART_SRCS
-    dolphin_columnmodesettings.kcfgc
-    dolphin_directoryviewpropertysettings.kcfgc
-    dolphin_detailsmodesettings.kcfgc
-    dolphin_iconsmodesettings.kcfgc
-    dolphin_generalsettings.kcfgc)
+kde4_add_kcfg_files(kcm_dolphingeneral_PART_SRCS
+    settings/dolphin_generalsettings.kcfgc)
 
-kde4_add_plugin(kcm_dolphin ${kcm_dolphin_PART_SRCS})
+kde4_add_plugin(kcm_dolphinviewmodes ${kcm_dolphinviewmodes_PART_SRCS})
+kde4_add_plugin(kcm_dolphinnavigation ${kcm_dolphinnavigation_PART_SRCS})
+kde4_add_plugin(kcm_dolphinservices ${kcm_dolphinservices_PART_SRCS})
+kde4_add_plugin(kcm_dolphingeneral ${kcm_dolphingeneral_PART_SRCS})
 
-target_link_libraries(kcm_dolphin  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate)
+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} ${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_dolphin ${NEPOMUK_LIBRARIES})
+  target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_LIBRARIES})
+  target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_LIBRARIES})
+  target_link_libraries(kcm_dolphinservices ${NEPOMUK_LIBRARIES})
+  target_link_libraries(kcm_dolphingeneral ${NEPOMUK_LIBRARIES})
 endif (Nepomuk_FOUND)
 
-install(TARGETS kcm_dolphin DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kcm_dolphinviewmodes DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kcm_dolphinnavigation DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kcm_dolphinservices DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kcm_dolphingeneral DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 ########### install files ###############
 
 install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES  dolphin_directoryviewpropertysettings.kcfg dolphin_generalsettings.kcfg dolphin_columnmodesettings.kcfg dolphin_iconsmodesettings.kcfg dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+install( FILES  settings/dolphin_directoryviewpropertysettings.kcfg settings/dolphin_generalsettings.kcfg settings/dolphin_columnmodesettings.kcfg settings/dolphin_iconsmodesettings.kcfg settings/dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
-install( FILES kcmdolphin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES  search/dolphinsearchcommands.desktop DESTINATION ${DATA_INSTALL_DIR}/dolphin )
+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} )