X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4e370297de110dbb5c6c231dd460e2a7d46e496b..39f89141b06c:/src/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 37e24da11..f8dfc831b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,56 +16,46 @@ endif (Nepomuk_FOUND)
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS
-    dolphincontroller.cpp
-    dolphindetailsview.cpp
-    dolphiniconsview.cpp
-    dolphincolumnview.cpp
-    dolphincolumnviewcontainer.cpp
-    dolphindirlister.cpp
-    dolphinfileitemdelegate.cpp
-    dolphinmodel.cpp
-    dolphinnewmenuobserver.cpp
-    dolphinsortfilterproxymodel.cpp
-    dolphincategorydrawer.cpp
-    dolphinview.cpp
-    dolphinviewactionhandler.cpp
-    dolphinviewautoscroller.cpp
-    dolphinremoteencoding.cpp
-    dolphindetailsviewexpander.cpp
-    draganddrophelper.cpp
-    folderexpander.cpp
-    renamedialog.cpp
-    selectiontoggle.cpp
-    selectionmanager.cpp
     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/tooltipmanager.cpp
-    versioncontrol/updateitemstatesthread.cpp
-    versioncontrol/versioncontrolobserver.cpp
-    viewextensionsfactory.cpp
-    viewproperties.cpp
-    zoomlevelinfo.cpp
+    views/additionalinfoaccessor.cpp
+    views/dolphincategorydrawer.cpp
+    views/dolphindirlister.cpp
+    views/dolphinview.cpp
+    views/dolphindetailsview.cpp
+    views/dolphindetailsviewexpander.cpp
+    views/dolphinfileitemdelegate.cpp
+    views/dolphiniconsview.cpp
+    views/dolphincolumnview.cpp
+    views/dolphincolumnviewcontainer.cpp
+    views/dolphinmodel.cpp
+    views/dolphinnewfilemenuobserver.cpp
+    views/dolphinremoteencoding.cpp
+    views/dolphinsortfilterproxymodel.cpp
+    views/dolphintreeview.cpp
+    views/dolphinviewactionhandler.cpp
+    views/dolphinviewautoscroller.cpp
+    views/dolphinviewcontroller.cpp
+    views/draganddrophelper.cpp
+    views/folderexpander.cpp
+    views/renamedialog.cpp
+    views/selectiontoggle.cpp
+    views/selectionmanager.cpp
+    views/tooltips/filemetadatatooltip.cpp
+    views/tooltips/tooltipmanager.cpp
+    views/versioncontrol/pendingthreadsmaintainer.cpp
+    views/versioncontrol/updateitemstatesthread.cpp
+    views/versioncontrol/versioncontrolobserver.cpp
+    views/viewextensionsfactory.cpp
+    views/viewmodecontroller.cpp
+    views/viewproperties.cpp
+    views/zoomlevelinfo.cpp
 )
 
-if(Nepomuk_FOUND)
-    set(dolphinprivate_LIB_SRCS
-        ${dolphinprivate_LIB_SRCS}
-	panels/information/nfotranslator.cpp
-        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
@@ -93,40 +83,29 @@ 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})
+install(FILES views/versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
 
 ##########################################
 
 set(dolphin_SRCS
     dolphinapplication.cpp
     dolphinmainwindow.cpp
-    dolphinnewmenu.cpp
+    dolphinnewfilemenu.cpp
     dolphinviewcontainer.cpp
-    dolphindirlister.cpp
     dolphincontextmenu.cpp
-    filterbar.cpp
+    filterbar/filterbar.cpp
     main.cpp
-    pixmapviewer.cpp
     panels/information/informationpanel.cpp
     panels/information/informationpanelcontent.cpp
-    panels/information/kmetadatawidget.cpp
-    panels/information/kmetadataconfigurationdialog.cpp
+    panels/information/pixmapviewer.cpp
     panels/information/phononwidget.cpp
     panels/folders/ktreeview.cpp
     panels/places/placespanel.cpp
@@ -135,54 +114,44 @@ 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
-    settings/dolphinfontrequester.cpp
+    settings/general/behaviorsettingspage.cpp
+    settings/general/contextmenusettingspage.cpp
+    settings/general/generalsettingspage.cpp
+    settings/general/previewssettingspage.cpp
+    settings/general/statusbarsettingspage.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/navigation/navigationsettingspage.cpp
+    settings/services/servicessettingspage.cpp
     settings/settingspagebase.cpp
-    settings/startupsettingspage.cpp
-    settings/statusbarsettingspage.cpp
-    settings/trashsettingspage.cpp
-    settings/viewsettingspage.cpp
-    settings/viewsettingspagebase.cpp
+    settings/startup/startupsettingspage.cpp
+    settings/trash/trashsettingspage.cpp
+    settings/viewmodes/columnviewsettingspage.cpp
+    settings/viewmodes/detailsviewsettingspage.cpp
+    settings/viewmodes/dolphinfontrequester.cpp
+    settings/viewmodes/iconsizegroupbox.cpp
+    settings/viewmodes/iconsviewsettingspage.cpp
+    settings/viewmodes/viewsettingspage.cpp
+    settings/viewmodes/viewsettingspagebase.cpp
     statusbar/dolphinstatusbar.cpp
     statusbar/statusbarspaceinfo.cpp
-    statusbar/statusbarmessagelabel.cpp
-    zoomlevelinfo.cpp
+    views/zoomlevelinfo.cpp
 )
 
 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/nfotranslator.cpp
-        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")
@@ -201,12 +170,13 @@ 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_KPARTS_LIBS}
+    ${KDE4_KCMUTILS_LIBRARY}
     konq
     dolphinprivate
     knewstuff3
@@ -214,57 +184,44 @@ 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})
 
 ##########################################
 
 set(kcm_dolphinviewmodes_PART_SRCS
-    kcm/kcmdolphinviewmodes.cpp
-    pixmapviewer.cpp
-    settings/columnviewsettingspage.cpp
-    settings/detailsviewsettingspage.cpp
-    settings/dolphinfontrequester.cpp
-    settings/iconsizegroupbox.cpp
-    settings/iconsviewsettingspage.cpp
-    settings/viewsettingspagebase.cpp
-    zoomlevelinfo.cpp)
+    settings/kcm/kcmdolphinviewmodes.cpp
+    settings/viewmodes/columnviewsettingspage.cpp
+    settings/viewmodes/detailsviewsettingspage.cpp
+    settings/viewmodes/dolphinfontrequester.cpp
+    settings/viewmodes/iconsizegroupbox.cpp
+    settings/viewmodes/iconsviewsettingspage.cpp
+    settings/viewmodes/viewsettingspagebase.cpp
+    views/zoomlevelinfo.cpp)
 
 set(kcm_dolphinnavigation_PART_SRCS
-    kcm/kcmdolphinnavigation.cpp
-    settings/navigationsettingspage.cpp
+    settings/kcm/kcmdolphinnavigation.cpp
+    settings/navigation/navigationsettingspage.cpp
     settings/settingspagebase.cpp)
 
 set(kcm_dolphinservices_PART_SRCS
-    kcm/kcmdolphinservices.cpp
-    settings/servicessettingspage.cpp
+    settings/kcm/kcmdolphinservices.cpp
+    settings/services/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/kcm/kcmdolphingeneral.cpp
+    settings/general/behaviorsettingspage.cpp
+    settings/general/previewssettingspage.cpp
+    settings/general/contextmenusettingspage.cpp
     settings/settingspagebase.cpp)
-if (Nepomuk_FOUND)
-    set(kcm_dolphingeneral_PART_SRCS
-        ${kcm_dolphingeneral_PART_SRCS}
-	panels/information/nfotranslator.cpp
-        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 +236,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 +263,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 +282,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 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} )
+install( FILES search/filenamesearch.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION
+${SERVICES_INSTALL_DIR} )
+install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES settings/kcm/kcmdolphinservices.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES settings/services/servicemenu.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( PROGRAMS settings/services/servicemenuinstallation DESTINATION ${BIN_INSTALL_DIR} )
+install( PROGRAMS settings/services/servicemenudeinstallation DESTINATION ${BIN_INSTALL_DIR} )
+