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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9602272ca..93225c5c8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,62 +1,71 @@
-
-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} )
+macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
+configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
+
+include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
 
 if (Nepomuk_FOUND)
   # Yes, Soprano includes is what we need here
   include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_INCLUDE_DIR} )
 endif (Nepomuk_FOUND)
 
+add_subdirectory(tests)
+
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS
+    kitemviews/kfileitemlistview.cpp
+    kitemviews/kfileitemlistwidget.cpp
+    kitemviews/kfileitemmodel.cpp
+    kitemviews/kfileitemmodelrolesupdater.cpp
+    kitemviews/kitemlistcontainer.cpp
+    kitemviews/kitemlistcontroller.cpp
+    kitemviews/kitemlistgroupheader.cpp
+    kitemviews/kitemlistheader.cpp
+    kitemviews/kitemlistkeyboardsearchmanager.cpp
+    kitemviews/kitemlistrubberband.cpp
+    kitemviews/kitemlistselectionmanager.cpp
+    kitemviews/kitemlistsizehintresolver.cpp
+    kitemviews/kitemlistsmoothscroller.cpp
+    kitemviews/kitemliststyleoption.cpp
+    kitemviews/kitemlistview.cpp
+    kitemviews/kitemlistviewanimation.cpp
+    kitemviews/kitemlistviewlayouter.cpp
+    kitemviews/kitemlistwidget.cpp
+    kitemviews/kitemmodelbase.cpp
+    kitemviews/kpixmapmodifier.cpp
     settings/additionalinfodialog.cpp
     settings/applyviewpropsjob.cpp
     settings/dolphinsettings.cpp
-    settings/filemetadataconfigurationdialog.cpp
     settings/viewpropertiesdialog.cpp
     settings/viewpropsprogressinfo.cpp
-    tooltips/filemetadatatooltip.cpp
-    tooltips/tooltipmanager.cpp
-    versioncontrol/pendingthreadsmaintainer.cpp
-    versioncontrol/updateitemstatesthread.cpp
-    versioncontrol/versioncontrolobserver.cpp
     views/additionalinfoaccessor.cpp
-    views/dolphincategorydrawer.cpp
     views/dolphindirlister.cpp
+    views/dolphinfileitemlistwidget.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/dolphinnewmenuobserver.cpp
+    views/dolphinitemlistcontainer.cpp
+    views/dolphinnewfilemenuobserver.cpp
     views/dolphinremoteencoding.cpp
-    views/dolphinsortfilterproxymodel.cpp
     views/dolphinviewactionhandler.cpp
     views/dolphinviewautoscroller.cpp
-    views/dolphinviewcontroller.cpp
     views/draganddrophelper.cpp
     views/folderexpander.cpp
-    views/selectiontoggle.cpp
-    views/selectionmanager.cpp
     views/renamedialog.cpp
-    views/viewextensionsfactory.cpp
+    views/tooltips/filemetadatatooltip.cpp
+    views/tooltips/tooltipmanager.cpp
+    views/versioncontrol/updateitemstatesthread.cpp
+    views/versioncontrol/versioncontrolobserver.cpp
     views/viewmodecontroller.cpp
     views/viewproperties.cpp
     views/zoomlevelinfo.cpp
 )
 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
-    settings/dolphin_columnmodesettings.kcfgc
+    settings/dolphin_compactmodesettings.kcfgc
     settings/dolphin_directoryviewpropertysettings.kcfgc
     settings/dolphin_detailsmodesettings.kcfgc
     settings/dolphin_iconsmodesettings.kcfgc
@@ -66,10 +75,14 @@ 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})
+target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${KDE4_KNEWSTUFF3_LIBS})
 if (Nepomuk_FOUND)
-  target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES} ${NEPOMUK_QUERY_LIBRARIES} ${SOPRANO_LIBRARIES})
+  target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES} ${NEPOMUK_QUERY_LIBRARIES} nepomukutils ${SOPRANO_LIBRARIES})
 endif (Nepomuk_FOUND)
+if(X11_Xrender_FOUND)
+  target_link_libraries(dolphinprivate ${X11_Xrender_LIB} )
+endif(X11_Xrender_FOUND)
+
 
 
 set_target_properties(dolphinprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
@@ -90,21 +103,23 @@ install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR})
 
 install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart)
 install(FILES dolphinpart.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
+    dolphindockwidget.cpp
     dolphinmainwindow.cpp
-    dolphinnewmenu.cpp
+    dolphinnewfilemenu.cpp
     dolphinviewcontainer.cpp
     dolphincontextmenu.cpp
     filterbar/filterbar.cpp
     main.cpp
-    pixmapviewer.cpp
+    panels/information/filemetadataconfigurationdialog.cpp
     panels/information/informationpanel.cpp
     panels/information/informationpanelcontent.cpp
+    panels/information/pixmapviewer.cpp
     panels/information/phononwidget.cpp
     panels/folders/ktreeview.cpp
     panels/places/placespanel.cpp
@@ -113,7 +128,9 @@ set(dolphin_SRCS
     panels/folders/folderspanel.cpp
     panels/folders/paneltreeview.cpp
     search/dolphinsearchbox.cpp
+    search/dolphinsearchinformation.cpp
     settings/general/behaviorsettingspage.cpp
+    settings/general/configurepreviewplugindialog.cpp
     settings/general/contextmenusettingspage.cpp
     settings/general/generalsettingspage.cpp
     settings/general/previewssettingspage.cpp
@@ -122,25 +139,25 @@ set(dolphin_SRCS
     settings/navigation/navigationsettingspage.cpp
     settings/services/servicessettingspage.cpp
     settings/settingspagebase.cpp
+    settings/serviceitemdelegate.cpp
+    settings/servicemodel.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
+    settings/viewmodes/viewsettingstab.cpp
     statusbar/dolphinstatusbar.cpp
     statusbar/statusbarspaceinfo.cpp
-    statusbar/statusbarmessagelabel.cpp
-    views/dolphindirlister.cpp
     views/zoomlevelinfo.cpp
 )
 
 kde4_add_kcfg_files(dolphin_SRCS
     panels/folders/dolphin_folderspanelsettings.kcfgc
     panels/information/dolphin_informationpanelsettings.kcfgc
+    settings/dolphin_compactmodesettings.kcfgc
+    settings/dolphin_detailsmodesettings.kcfgc
+    settings/dolphin_generalsettings.kcfgc
+    settings/dolphin_iconsmodesettings.kcfgc
     search/dolphin_searchsettings.kcfgc
     settings/dolphin_versioncontrolsettings.kcfgc
 )
@@ -148,27 +165,14 @@ kde4_add_kcfg_files(dolphin_SRCS
 if(Nepomuk_FOUND)
     set(dolphin_SRCS
         ${dolphin_SRCS}
-        search/filters/abstractsearchfilterwidget.cpp
-        search/filters/datesearchfilterwidget.cpp
-        search/filters/ratingsearchfilterwidget.cpp
-        search/filters/tagsearchfilterwidget.cpp
+        panels/search/searchpanel.cpp
     )
-    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")
 endif(Nepomuk_FOUND)
 
 if(NOT WIN32)
    set(dolphin_SRCS ${dolphin_SRCS} panels/terminal/terminalpanel.cpp)
 endif(NOT WIN32)
 
-qt4_add_dbus_adaptor(dolphin_SRCS
-   org.kde.dolphin.Application.xml
-   dolphinapplication.h DolphinApplication)
-qt4_add_dbus_adaptor(dolphin_SRCS
-   org.kde.dolphin.MainWindow.xml
-   dolphinmainwindow.h DolphinMainWindow)
-
 kde4_add_app_icon(dolphin_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/system-file-manager.png")
 
 kde4_add_kdeinit_executable(dolphin ${dolphin_SRCS})
@@ -176,6 +180,7 @@ kde4_add_kdeinit_executable(dolphin ${dolphin_SRCS})
 target_link_libraries(kdeinit_dolphin
     ${KDE4_KDEPRINT_LIBS}
     ${KDE4_KFILE_LIBS}
+    ${KDE4_KPARTS_LIBS}
     ${KDE4_KCMUTILS_LIBRARY}
     konq
     dolphinprivate
@@ -188,6 +193,7 @@ if (Nepomuk_FOUND)
         ${NEPOMUK_LIBRARIES}
         ${SOPRANO_LIBRARIES}
         ${NEPOMUK_QUERY_LIBRARIES}
+        nepomukutils
     )
 endif (Nepomuk_FOUND)
 
@@ -197,14 +203,9 @@ install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 ##########################################
 
 set(kcm_dolphinviewmodes_PART_SRCS
-    pixmapviewer.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
+    settings/viewmodes/viewsettingstab.cpp
     views/zoomlevelinfo.cpp)
 
 set(kcm_dolphinnavigation_PART_SRCS
@@ -215,17 +216,22 @@ set(kcm_dolphinnavigation_PART_SRCS
 set(kcm_dolphinservices_PART_SRCS
     settings/kcm/kcmdolphinservices.cpp
     settings/services/servicessettingspage.cpp
-    settings/settingspagebase.cpp)
+    settings/settingspagebase.cpp
+    settings/serviceitemdelegate.cpp
+    settings/servicemodel.cpp)
 
 set(kcm_dolphingeneral_PART_SRCS
     settings/kcm/kcmdolphingeneral.cpp
     settings/general/behaviorsettingspage.cpp
     settings/general/previewssettingspage.cpp
+    settings/general/configurepreviewplugindialog.cpp
     settings/general/contextmenusettingspage.cpp
-    settings/settingspagebase.cpp)
+    settings/settingspagebase.cpp
+    settings/serviceitemdelegate.cpp
+    settings/servicemodel.cpp)
 
 kde4_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS
-    settings/dolphin_columnmodesettings.kcfgc
+    settings/dolphin_compactmodesettings.kcfgc
     settings/dolphin_directoryviewpropertysettings.kcfgc
     settings/dolphin_detailsmodesettings.kcfgc
     settings/dolphin_iconsmodesettings.kcfgc
@@ -274,10 +280,10 @@ install(TARGETS kio_filenamesearch DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### install files ###############
 
-install( FILES dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
                settings/dolphin_generalsettings.kcfg
-               settings/dolphin_columnmodesettings.kcfg
+               settings/dolphin_compactmodesettings.kcfg
                settings/dolphin_iconsmodesettings.kcfg
                settings/dolphin_detailsmodesettings.kcfg
                settings/dolphin_versioncontrolsettings.kcfg