[kmobiletools] KDE/kdepim

[Marco Gulino]

SVN commit 671065 by gulino:

Porting kmobiletools-kontact plugin.
Moving kmobiletools-kontact plugin to the right directory, and enabling it.


 D             kmobiletools/kmobiletools-kontact-plugin (directory)  
 M  +1 -0      kontact/plugins/CMakeLists.txt  
 A             kontact/plugins/kmobiletools (directory)   kmobiletools/kmobiletools-kontact-plugin#671023
 M  +1 -1      kontact/plugins/kmobiletools/CMakeLists.txt  
 M  +21 -19    kontact/plugins/kmobiletools/kmobiletools_plugin.cpp  
 M  +6 -7      kontact/plugins/kmobiletools/kmobiletools_plugin.h  


--- trunk/KDE/kdepim/kontact/plugins/CMakeLists.txt #671064:671065
@@ -12,6 +12,7 @@
 #add_subdirectory( newsticker ) 
 add_subdirectory( akregator ) 
 add_subdirectory( karm ) 
+add_subdirectory( kmobiletools ) 
 
 find_file(KWEATHER_INTERFACE_FILE_FOUND org.kde.kweather.service.xml PATHS ${DBUS_INTERFACES_DIR} )
 
--- trunk/KDE/kdepim/kontact/plugins/kmobiletools/CMakeLists.txt #671023:671065
@@ -1,5 +1,5 @@
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
+include_directories(  ${CMAKE_SOURCE_DIR}/kontact/interfaces ${CMAKE_SOURCE_DIR}/kmobiletools/src ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
 
 
 ########### next target ###############
--- trunk/KDE/kdepim/kontact/plugins/kmobiletools/kmobiletools_plugin.cpp #671023:671065
@@ -22,49 +22,51 @@
 #include <kgenericfactory.h>
 #include <kparts/componentfactory.h>
 #include <kaboutdata.h>
+#include <kactioncollection.h>
 
-#include <kontact/core.h>
-#include <kontact/plugin.h>
+#include <core.h>
 #include <kapplication.h>
-#include <dcopclient.h>
+// #include <dcopclient.h>
 #include <kaction.h>
 
 
-typedef KGenericFactory<KMmobileToolsPlugin, Kontact::Core> KMmobileToolsPluginFactory;
+typedef KGenericFactory<KMobileToolsPlugin, Kontact::Core> KMobileToolsPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libkontact_kmobiletools,
-                            KMmobileToolsPluginFactory( "kontact_kmobiletools" ) )
+                            KMobileToolsPluginFactory( "kontact_kmobiletools" ) )
 
-KMmobileToolsPlugin::KMmobileToolsPlugin( Kontact::Core *core, const char *, const QStringList& )
-    : Kontact::Plugin( core, core, "KMmobileTools" ), partLoaded(false)
+KMobileToolsPlugin::KMobileToolsPlugin( Kontact::Core *core, const QStringList& )
+    : Kontact::Plugin( core, core, "KMobileTools" ), partLoaded(false)
 {
-  kmtIface=0;
-  setInstance( KMmobileToolsPluginFactory::instance() );
-  insertNewAction( new KAction( i18n( "New SMS..." ), "newsms",
-                   CTRL+SHIFT+Key_S, this, SLOT( slotNewSMS() ), actionCollection(),
-                   "sms_new" ) );
+//   kmtIface=0;
+  setComponentData( KMobileToolsPluginFactory::componentData() );
+  KAction *newaction=new KAction(i18n( "New SMS..." ), this );
+  actionCollection()->addAction("newsms", newaction);
+  newaction->setShortcut(QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_S));
+  connect(newaction, SIGNAL(triggered(bool)),SLOT( slotNewSMS() ));
+  insertNewAction(newaction);
   setExecutableName("kmobiletools_bin");
-  kmtIface=new MainIFace_stub( "kmobiletools", "KMobileTools" );
+//   kmtIface=new MainIFace_stub( "kmobiletools", "KMobileTools" );
 }
 
-KMmobileToolsPlugin::~KMmobileToolsPlugin()
+KMobileToolsPlugin::~KMobileToolsPlugin()
 {
 }
 
-bool KMmobileToolsPlugin::isRunningStandalone()
+bool KMobileToolsPlugin::isRunningStandalone()
 {
-    return ( (!partLoaded) && kapp->dcopClient()->isApplicationRegistered("kmobiletools") );
+//     return ( (!partLoaded) && kapp->dcopClient()->isApplicationRegistered("kmobiletools") );
 }
 
-KParts::ReadOnlyPart* KMmobileToolsPlugin::createPart()
+KParts::ReadOnlyPart* KMobileToolsPlugin::createPart()
 {
   KParts::ReadOnlyPart* m_part=loadPart();
   partLoaded=(bool)m_part;
   return m_part;
 }
 
-void KMmobileToolsPlugin::slotNewSMS()
+void KMobileToolsPlugin::slotNewSMS()
 {
-    if(kmtIface) kmtIface->newSMS();
+//     if(kmtIface) kmtIface->newSMS();
 }
 
 #include "kmobiletools_plugin.moc"
--- trunk/KDE/kdepim/kontact/plugins/kmobiletools/kmobiletools_plugin.h #671023:671065
@@ -24,21 +24,20 @@
 #include <klocale.h>
 #include <kparts/part.h>
 
-#include <kontact/plugin.h>
+#include <plugin.h>
+#include <uniqueapphandler.h>
 
-#include "mainIFace_stub.h"
 
 
 class KAboutData;
 
-class KMmobileToolsPlugin : public Kontact::Plugin
+class KMobileToolsPlugin : public Kontact::Plugin
 {
   Q_OBJECT
 
   public:
-    KMmobileToolsPlugin( Kontact::Core *core, const char *name,
-                       const QStringList & );
-    ~KMmobileToolsPlugin();
+    KMobileToolsPlugin( Kontact::Core *core, const QStringList & );
+    ~KMobileToolsPlugin();
 
     int weight() const { return 700; }
     bool isRunningStandalone();
@@ -46,7 +45,7 @@
   protected:
     KParts::ReadOnlyPart *createPart();
     bool partLoaded;
-    MainIFace_stub *kmtIface;
+//     MainIFace_stub *kmtIface;
     public slots:
         void slotNewSMS();
 };