SVN commit 691460 by eva: - added code for kcall_part M +8 -1 CMakeLists.txt M +17 -1 kcall/CMakeLists.txt A kcall/kcall.rc A kcall/kcall_part.cpp [License: LGPL (v2.1+)] A kcall/kcall_part.desktop A kcall/kcall_part.h [License: LGPL (v2.1)] A kcall/kcall_part.rc M +3 -13 kcall/kcallmainwindow.cpp M +1 -2 kcall/kcallmainwindow.h --- trunk/playground/pim/kcall/CMakeLists.txt #691459:691460 @@ -4,12 +4,19 @@ SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) FIND_PACKAGE(Qt4 REQUIRED) -FIND_PACKAGE(KDE4 REQUIRED) + +# search packages used by KDE +find_package (KDE4 REQUIRED) +include(KDE4Defaults) +include(MacroLibrary) +include(MacroOptionalAddSubdirectory) + FIND_PACKAGE(KdepimLibs REQUIRED) INCLUDE(FindPkgConfig REQUIRED) INCLUDE(FindDoxygen) INCLUDE(Qt4DBusMacros) + PKG_SEARCH_MODULE(DECIBEL REQUIRED Decibel) IF (APPLE) --- trunk/playground/pim/kcall/kcall/CMakeLists.txt #691459:691460 @@ -83,11 +83,27 @@ install(TARGETS kcall_bin DESTINATION ${BIN_INSTALL_DIR} ) +########### next target ############### + +set(kcallpart_PART_SRCS kcall_part.cpp ) + +#qt4_add_dbus_adaptor(kcallpart_PART_SRCS org.kde.KCall.Core.xml kcall_part.h KCallPart kcallpartadaptor ) + + +kde4_add_plugin(kcallpart WITH_PREFIX ${kcallpart_PART_SRCS}) + +target_link_libraries(kcallpart ${KDE4_KDECORE_LIBS} kcall ) + +install(TARGETS kcallpart DESTINATION ${PLUGIN_INSTALL_DIR}) + + ########### install files ############### -# install( FILES kcall.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +#install( FILES kcall.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install( FILES kcall.rc kcall_part.rc DESTINATION ${DATA_INSTALL_DIR}/kaddressbook) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE} DESTINATION ${DBUS_SERVICES_INSTALL_DIR} ) --- trunk/playground/pim/kcall/kcall/kcallmainwindow.cpp #691459:691460 @@ -60,13 +60,13 @@ setStandardToolBarMenuEnabled( true ); -// createGUI( "kaddressbookui.rc" ); + createGUI( "kcall.rc" ); resize( 400, 300 ); // initial size setAutoSaveSettings(); /* QDBusConnection::sessionBus().registerService(Decibel::organisation_name + '.' + - "kcallgui"); + "kcall"); QDBusConnection::sessionBus().registerObject("/StreamChannelHandler", &channel_handler);*/ } @@ -129,18 +129,8 @@ void KCallMainWindow::newToolbarConfig() { - createGUI( "kcallui.rc" ); + createGUI( "kcall.rc" ); applyMainWindowSettings( KGlobal::config()->group( "MainWindow" ) ); } #include "kcallmainwindow.moc" - - - - - - - - - - --- trunk/playground/pim/kcall/kcall/kcallmainwindow.h #691459:691460 @@ -1,6 +1,5 @@ /* - * Copyright (C) 2006-2007 by basyskom GmbH - * @author Mike Hauth + * Copyright (C) 2007 by basyskom GmbH * @author Eva Brucherseifer * * This library is free software; you can redistribute it and/or