From kde-commits Mon Jul 23 19:26:01 2007 From: Eva Brucherseifer Date: Mon, 23 Jul 2007 19:26:01 +0000 To: kde-commits Subject: playground/pim/kcall/kcall Message-Id: <1185218761.066924.7635.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=118521877207532 SVN commit 691496 by eva: - added dbus service definition for KCall parts and enabled them in the code - added first version of kontact plugin enabling the dbus definition breaks cmake here unfortunately... M +9 -4 CMakeLists.txt M +1 -1 kcall.rc A kcall_options.h [License: no copyright] M +9 -3 kcall_part.cpp M +1 -0 kcall_part.h M +7 -0 kcallcore.cpp M +2 -0 kcallcore.h M +10 -4 kcallmainwindow.cpp M +1 -0 kcallmainwindow.h A kontactplugin (directory) A kontactplugin/CMakeLists.txt A kontactplugin/kcall_plugin.cpp [License: GPL (v2+) (+Qt exception)] A kontactplugin/kcall_plugin.h [License: GPL (v2+) (+Qt exception)] A kontactplugin/kcallplugin.desktop [TRAILING SPACE] A kontactplugin/uniqueapphandler.h [License: LGPL (v2+)] M +1 -7 main.cpp A org.kde.KCall.Core.xml --- trunk/playground/pim/kcall/kcall/CMakeLists.txt #691495:691496 @@ -2,7 +2,6 @@ add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) #SET(QT_USE_QT3SUPPORT ON) -#SET(KDE4_USE_KDE3SUPPORT ON) INCLUDE(${QT_USE_FILE}) @@ -45,6 +44,8 @@ Decibel/Types ) +QT4_ADD_DBUS_INTERFACE(kcall_LIB_SRCS org.kde.KCall.Core.xml kcallcore_interface ) + kde4_add_kcfg_files( kcall_LIB_SRCS kcallsettings.kcfgc ) KDE4_ADD_UI_FILES(kcall_LIB_SRCS keypad.ui kcallview.ui vcardview.ui) @@ -71,7 +72,7 @@ kcallmainwindow.cpp ) -#qt4_add_dbus_adaptor(kaddressbook_bin_SRCS org.kde.KAddressbook.Core.xml kaddressbookmain.h KAddressBookMain kaddressbookadaptor ) +qt4_add_dbus_adaptor(kcall_bin_SRCS org.kde.KCall.Core.xml kcallmainwindow.h KCallMainWindow kcalladaptor ) kde4_add_executable(kcall_bin ${kcall_bin_SRCS}) set_target_properties(kcall_bin PROPERTIES OUTPUT_NAME kcall) @@ -87,9 +88,8 @@ set(kcallpart_PART_SRCS kcall_part.cpp ) -#qt4_add_dbus_adaptor(kcallpart_PART_SRCS org.kde.KCall.Core.xml kcall_part.h KCallPart kcallpartadaptor ) +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 ) @@ -110,4 +110,9 @@ INSTALL(FILES de.basyskom.kcallgui.streamchannel.component DESTINATION ${COMPONENT_SEARCH_DIR} ) +install( FILES org.kde.KCall.Core.xml DESTINATION ${DBUS_INTERFACES_DIR} ) +############# + +ADD_SUBDIRECTORY(kontactplugin) + --- trunk/playground/pim/kcall/kcall/kcall.rc #691495:691496 @@ -1,5 +1,5 @@ - + &File --- trunk/playground/pim/kcall/kcall/kcall_part.cpp #691495:691496 @@ -31,7 +31,8 @@ #include #include - +#include +#include "kcallpartadaptor.h" #include "kcallcore.h" #include "kcall_part.h" @@ -63,8 +64,8 @@ setXMLFile( "kcall_part.rc" ); -// new CoreAdaptor( this ); -// QDBusConnection::sessionBus().registerObject( "/KCall", this, QDBusConnection::ExportAdaptors ); + new CoreAdaptor( this ); + QDBusConnection::sessionBus().registerObject( "/KCall", this, QDBusConnection::ExportAdaptors ); } KCallPart::~KCallPart() @@ -86,6 +87,11 @@ // mCore->save(); } +bool KCallPart::newCall( const QString &number ) +{ + return mCore->newCall(number); +} + void KCallPart::exit() { mCore->queryClose(); --- trunk/playground/pim/kcall/kcall/kcall_part.h #691495:691496 @@ -40,6 +40,7 @@ public slots: virtual void save(); virtual void exit(); + virtual bool newCall( const QString &number ); virtual bool openURL( const KUrl &url ); virtual bool handleCommandLine(); --- trunk/playground/pim/kcall/kcall/kcallcore.cpp #691495:691496 @@ -71,7 +71,14 @@ { } +bool KCallCore::newCall(const QString& number) +{ + // TODO: external api + return false; +} + + KAboutData *KCallCore::createAboutData() { KAboutData *about = new KAboutData( "KCall", 0, ki18n( "KCall" ), --- trunk/playground/pim/kcall/kcall/kcallcore.h #691495:691496 @@ -64,6 +64,8 @@ bool queryClose(); bool handleCommandLine(); + + bool newCall(const QString& number); // Addressbook: KABC::AddressBook * const addressBook() const; --- trunk/playground/pim/kcall/kcall/kcallmainwindow.cpp #691495:691496 @@ -33,6 +33,9 @@ #include "decibelchannelhandler.h" #include "kcallcore.h" +#include +#include "kcalladaptor.h" + #include "kcallmainwindow.h" @@ -65,10 +68,8 @@ resize( 400, 300 ); // initial size setAutoSaveSettings(); -/* QDBusConnection::sessionBus().registerService(Decibel::organisation_name + '.' + - "kcall"); - QDBusConnection::sessionBus().registerObject("/StreamChannelHandler", - &channel_handler);*/ + new CoreAdaptor( this ); + QDBusConnection::sessionBus().registerObject("/KCall", this, QDBusConnection::ExportAdaptors); } KCallMainWindow::~KCallMainWindow() @@ -81,6 +82,11 @@ close(); } +bool KCallMainWindow::newCall(const QString& number) +{ + return mCore->newCall( number ); +} + bool KCallMainWindow::handleCommandLine() { return mCore->handleCommandLine(); --- trunk/playground/pim/kcall/kcall/kcallmainwindow.h #691495:691496 @@ -39,6 +39,7 @@ public slots: void exit(); bool handleCommandLine(); + bool newCall(const QString& number); protected: void initActions(); --- trunk/playground/pim/kcall/kcall/main.cpp #691495:691496 @@ -39,16 +39,10 @@ #include #include "kcallmainwindow.h" -//#include "kaddressbook_options.h" +#include "kcall_options.h" #include "kcallcore.h" -static KCmdLineOptions kcall_options () -{ - KCmdLineOptions options; -// options.add("+[URI]", ki18n("Calendar files or urls. Unless -i, -o or -m is explicitly specified, the user will be asked whether to import, merge or open in a separate window.")); - return options; -} class KCallApp : public KUniqueApplication { public: