X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5252c12db4929886dbe502013e0a1fee6500f568..20195315bb8c637f28d892323e6cdc43604d38ae:/src/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 648fa96ae..d07886a1b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,62 +2,69 @@
 add_subdirectory( pics )
 add_subdirectory( servicemenus )
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
+include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
 
 
 ########### next target ###############
 
-set(dolphin_SRCS 
-   main.cpp 
-   dolphin.cpp 
-   dolphinview.cpp 
-   urlnavigator.cpp 
-   urlnavigatorbutton.cpp 
-   viewpropertiesdialog.cpp 
-   dolphinstatusbar.cpp 
-   dolphindirlister.cpp 
-   viewproperties.cpp 
-   dolphindetailsview.cpp 
-   dolphiniconsview.cpp 
-   dolphinsettings.cpp 
-   bookmarkselector.cpp 
-   urlbutton.cpp 
-   itemeffectsmanager.cpp 
-   dolphincontextmenu.cpp 
-   undomanager.cpp 
-   progressindicator.cpp 
-   iconsviewsettingspage.cpp 
-   pixmapviewer.cpp 
-   dolphinsettingsdialog.cpp 
-   viewsettingspage.cpp 
-   detailsviewsettingspage.cpp 
-   statusbarmessagelabel.cpp 
-   generalsettingspage.cpp 
-   bookmarkssettingspage.cpp 
-   editbookmarkdialog.cpp 
-   settingspagebase.cpp 
-   sidebar.cpp 
-   sidebarpage.cpp 
-   bookmarkssidebarpage.cpp 
-   infosidebarpage.cpp 
-   statusbarspaceinfo.cpp 
-   renamedialog.cpp 
-   filterbar.cpp 
-   protocolcombo.cpp )
+set(dolphin_SRCS
+   applyviewpropsjob.cpp
+   bookmarkselector.cpp
+   bookmarkssettingspage.cpp
+   bookmarkssidebarpage.cpp
+   detailsviewsettingspage.cpp
+   dolphinapplication.cpp
+   dolphincontroller.cpp
+   dolphinmainwindow.cpp
+   dolphinnewmenu.cpp
+   dolphinview.cpp
+   dolphinstatusbar.cpp
+   dolphindirlister.cpp
+   dolphindetailsview.cpp
+   dolphiniconsview.cpp
+   dolphinsettings.cpp
+   dolphincontextmenu.cpp
+   dolphinsortfilterproxymodel.cpp
+   dolphinsettingsdialog.cpp
+   editbookmarkdialog.cpp
+   filterbar.cpp
+   generalsettingspage.cpp
+   generalviewsettingspage.cpp
+   iconsviewsettingspage.cpp
+   infosidebarpage.cpp
+   main.cpp
+   protocolcombo.cpp
+   pixmapviewer.cpp
+   renamedialog.cpp
+   settingspagebase.cpp
+   sidebarpage.cpp
+   statusbarspaceinfo.cpp
+   statusbarmessagelabel.cpp
+   urlbutton.cpp
+   urlnavigator.cpp
+   urlnavigatorbutton.cpp
+   viewpropertiesdialog.cpp
+   viewproperties.cpp
+   viewsettingspage.cpp
+   viewpropsprogressinfo.cpp )
 
 kde4_automoc(${dolphin_SRCS})
 
-kde4_add_kcfg_files(dolphin_SRCS 
-   directoryviewpropertysettings.kcfgc
-   generalsettings.kcfgc
-   iconsmodesettings.kcfgc
-   detailsmodesettings.kcfgc
-   previewsmodesettings.kcfgc
-   sidebarsettings.kcfgc )
-
+kde4_add_kcfg_files(dolphin_SRCS
+   dolphin_directoryviewpropertysettings.kcfgc
+   dolphin_generalsettings.kcfgc
+   dolphin_iconsmodesettings.kcfgc
+   dolphin_detailsmodesettings.kcfgc )
+
+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_executable(dolphin ${dolphin_SRCS})
 
-target_link_libraries(dolphin  ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} )
+target_link_libraries(dolphin  ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} konq )
 
 install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 
@@ -65,76 +72,7 @@ install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 ########### install files ###############
 
 install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_DIR} )
-install( FILES  directoryviewpropertysettings.kcfg generalsettings.kcfg  				iconsmodesettings.kcfg detailsmodesettings.kcfg previewsmodesettings.kcfg  				sidebarsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+install( FILES  dolphin_directoryviewpropertysettings.kcfg dolphin_generalsettings.kcfg dolphin_iconsmodesettings.kcfg dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
-install( FILES  DESTINATION ${APPLNK_INSTALL_DIR}/System )
 
 kde4_install_icons( ${ICON_INSTALL_DIR} )
-
-
-
-#original Makefile.am contents follow:
-
-### Makefile.am for dolphin
-#
-#SUBDIRS = pics servicemenus
-#
-## this is the program that gets installed.  it's name is used for all
-## of the other Makefile.am variables
-#bin_PROGRAMS = dolphin
-#
-## set the include path for X, qt and KDE
-#INCLUDES         = $(all_includes)
-#
-## the library search path.
-#dolphin_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-#
-## the libraries to link against.
-#dolphin_LDADD   = $(LIB_KFILE) $(LIB_KDEPRINT)
-#
-## which sources should be compiled for dolphin
-#dolphin_SOURCES = main.cpp dolphin.cpp dolphinview.cpp urlnavigator.cpp directoryviewpropertysettings.kcfgc \
-#		urlnavigatorbutton.cpp viewpropertiesdialog.cpp dolphinstatusbar.cpp dolphindirlister.cpp \
-#		viewproperties.cpp dolphindetailsview.cpp dolphiniconsview.cpp dolphinsettings.cpp \
-#		bookmarkselector.cpp urlbutton.cpp itemeffectsmanager.cpp \
-#		dolphincontextmenu.cpp undomanager.cpp progressindicator.cpp \
-#		iconsviewsettingspage.cpp pixmapviewer.cpp dolphinsettingsdialog.cpp \
-#		viewsettingspage.cpp detailsviewsettingspage.cpp statusbarmessagelabel.cpp \
-#		generalsettingspage.cpp bookmarkssettingspage.cpp \
-#		editbookmarkdialog.cpp settingspagebase.cpp sidebar.cpp sidebarpage.cpp \
-#		bookmarkssidebarpage.cpp infosidebarpage.cpp statusbarspaceinfo.cpp renamedialog.cpp \
-#		filterbar.cpp protocolcombo.cpp generalsettings.kcfgc iconsmodesettings.kcfgc \
-#		detailsmodesettings.kcfgc previewsmodesettings.kcfgc sidebarsettings.kcfgc
-#
-## these are the headers for your project
-#noinst_HEADERS = dolphin.h dolphinview.h urlnavigator.h urlnavigatorbutton.h \
-#		viewpropertiesdialog.h dolphinstatusbar.h dolphindirlister.h viewproperties.h \
-#		dolphindetailsview.h dolphiniconsview.h dolphinsettings.h bookmarkselector.h \
-#		urlbutton.h itemeffectsmanager.h dolphincontextmenu.h undomanager.h \
-#		iconsviewsettingspage.h pixmapviewer.h \
-#		dolphinsettingsdialog.h detailsviewsettingspage.h viewsettingspage.h statusbarmessagelabel.h \
-#		generalsettingspage.h bookmarkssettingspage.h editbookmarkdialog.h \
-#		settingspagebase.h statusbarspaceinfo.h renamedialog.h sidebar.h sidebarsettings.h sidebarpage.h \
-#		bookmarkssidebarpage.h infosidebarpage.h protocolcombo.h
-#		infosidebarpage.h filterbar.h protocolcombo.h
-#
-## let automoc handle all of the meta source files (moc)
-#METASOURCES = AUTO
-#
-#messages: rc.cpp
-#	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
-#	$(XGETTEXT) *.cpp -o $(podir)/dolphin.pot
-#
-## this is where the kdelnk file will go
-#kdelnkdir   = $(kde_appsdir)/System
-#xdg_apps_DATA = dolphin.desktop
-#
-## this is where the XML-GUI resource file goes
-#rcdir = $(kde_datadir)/dolphin
-#rc_DATA = dolphinui.rc
-#
-#kde_kcfg_DATA = directoryviewpropertysettings.kcfg generalsettings.kcfg \
-#				iconsmodesettings.kcfg detailsmodesettings.kcfg previewsmodesettings.kcfg \
-#				sidebarsettings.kcfg
-#
-#KDE_ICON = AUTO