[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/plasma/applets/leavenote
From:       Christian Weilbach <christian () whiletaker ! homeip ! net>
Date:       2008-09-19 9:09:22
Message-ID: 1221815362.562109.30067.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 862551 by weilbach:

Start moving to a KDEDModule instead of forking a process.


 M  +14 -9     LeaveNoteHelperDaemon/CMakeLists.txt  
 M  +15 -4     LeaveNoteHelperDaemon/LeaveNoteHelperDaemon.cpp  
 M  +13 -4     LeaveNoteHelperDaemon/LeaveNoteHelperDaemon.h  
 M  +2 -2      LeaveNoteHelperDaemon/dbus/RootDBusHandler.cpp  
 M  +4 -2      plasma-leavenote.cpp  


--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/CMakeLists.txt \
#862550:862551 @@ -1,19 +1,24 @@
-set(leavenotehelperdaemon_SRCS 
-    main.cpp
+set(kded_leavenotehelperdaemon_SRCS 
+#    main.cpp
     LeaveNoteHelperDaemon.cpp
     dbus/RootDBusHandler.cpp
     dbus/DaemonDBusHandler.cpp
 )
 
-qt4_add_dbus_adaptor(leavenotehelperdaemon_SRCS \
dbus/org.kde.LeaveNoteHelperDaemon.root.xml dbus/RootDBusHandler.h \
                LeaveNoteHelperDaemon::RootDBusHandler RootAdaptor RootAdaptor)
-qt4_add_dbus_adaptor(leavenotehelperdaemon_SRCS \
dbus/org.kde.LeaveNoteHelperDaemon.daemon.xml dbus/DaemonDBusHandler.h \
LeaveNoteHelperDaemon::DaemonDBusHandler DaemonAdaptor DaemonAdaptor) \
+qt4_add_dbus_adaptor(kded_leavenotehelperdaemon_SRCS \
dbus/org.kde.LeaveNoteHelperDaemon.root.xml dbus/RootDBusHandler.h \
LeaveNoteHelperDaemon::RootDBusHandler RootAdaptor RootAdaptor) \
+qt4_add_dbus_adaptor(kded_leavenotehelperdaemon_SRCS \
dbus/org.kde.LeaveNoteHelperDaemon.daemon.xml dbus/DaemonDBusHandler.h \
LeaveNoteHelperDaemon::DaemonDBusHandler DaemonAdaptor DaemonAdaptor)  
-kde4_add_executable(leavenotehelperdaemon ${leavenotehelperdaemon_SRCS})
-target_link_libraries(leavenotehelperdaemon ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} \
                )
-install(FILES simplemessagedaemon.notifyrc 
-        DESTINATION ${DATA_INSTALL_DIR}/leavenotehelperdaemon)
-install(TARGETS leavenotehelperdaemon ${INSTALL_TARGETS_DEFAULT_ARGS})
+#kde4_add_executable(leavenotehelperdaemon ${leavenotehelperdaemon_SRCS})
+kde4_add_plugin(kded_leavenotehelperdaemon ${kded_leavenotehelperdaemon_SRCS})
+
+target_link_libraries(kded_leavenotehelperdaemon ${KDE4_KDECORE_LIBS} \
${KDE4_KDEUI_LIBS} ) +#install(FILES simplemessagedaemon.notifyrc 
+#        DESTINATION ${DATA_INSTALL_DIR}/leavenotehelperdaemon)
+#install(TARGETS leavenotehelperdaemon ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kded_leavenotehelperdaemon  DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(FILES dbus/org.kde.LeaveNoteHelperDaemon.root.xml
               DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
 install(FILES dbus/org.kde.LeaveNoteHelperDaemon.daemon.xml
               DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
+
+install( FILES leavenotehelperdaemon.desktop  DESTINATION  \
                ${SERVICES_INSTALL_DIR}/kded )
--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/LeaveNoteHelperDaemon.cpp \
#862550:862551 @@ -20,19 +20,30 @@
 #include "dbus/RootDBusHandler.h"
 #include "dbus/DaemonDBusHandler.h"
 
+#include <KPluginFactory>
+#include <KPluginLoader>
+
 namespace LeaveNoteHelperDaemon
 {
+K_PLUGIN_FACTORY(LeaveNoteHelperDaemonFactory,
+                 registerPlugin<Daemon>();
+    )
+K_EXPORT_PLUGIN(LeaveNoteHelperDaemonFactory("leavenotehelperdaemon"))
 
-Daemon::Daemon() : KUniqueApplication()
+//Daemon::Daemon() : KUniqueApplication()
+Daemon::Daemon(QObject* parent, const QList<QVariant>&) 
+        : KDEDModule (parent)
 {
-    new RootDBusHandler();
-    new DaemonDBusHandler();
+    mRootDBus = new RootDBusHandler();
+    mDaemonDBus = new DaemonDBusHandler();
 }
 
 Daemon::~Daemon()
 {
+    delete mRootDBus;
+    delete mDaemonDBus;
 }
 
 }
 
-#include "LeaveNoteHelperDaemon.moc"
\ No newline at end of file
+#include "LeaveNoteHelperDaemon.moc"
--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/LeaveNoteHelperDaemon.h \
#862550:862551 @@ -24,18 +24,27 @@
 #include <QtCore/QList>
 #include <QtGui/QWidget>
 
-#include <KUniqueApplication>
+//#include <KUniqueApplication>
+#include <KDEDModule>
 
-
 namespace LeaveNoteHelperDaemon
 {
 
-class Daemon : public KUniqueApplication
+    class RootDBusHandler;
+    class DaemonDBusHandler;
+
+//class Daemon : public KUniqueApplication
+class Daemon : public KDEDModule
 {
     Q_OBJECT
 public:
-    Daemon();
+    Daemon(QObject* parent, const QList<QVariant>&);
     ~Daemon();
+
+private:
+    RootDBusHandler* mRootDBus;
+    DaemonDBusHandler* mDaemonDBus;
+
 };
 }
 
--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/dbus/RootDBusHandler.cpp \
#862550:862551 @@ -46,7 +46,7 @@
 {
 
 RootDBusHandler::RootDBusHandler()
-        : QObject(kapp)
+        : QObject(0) //kapp)
 {
     qDBusRegisterMetaType<Version>();
 
@@ -61,7 +61,7 @@
 
 void RootDBusHandler::Quit()
 {
-    kapp->closeAllWindows();
+//    kapp->closeAllWindows();
 }
 
 Version RootDBusHandler::MprisVersion()
--- trunk/playground/base/plasma/applets/leavenote/plasma-leavenote.cpp \
#862550:862551 @@ -36,6 +36,7 @@
 #include <KConfigDialog>
 #include <KDateTime>
 #include <KDebug>
+#include <KDED>
 #include <KPushButton>
 #include <KTextEdit>
 #include <KLocale>
@@ -69,9 +70,10 @@
 
     /* start the simplemessagedaemon to keep track of the messages
      * even after the applet has vanished (screen unlock) */
-    QProcess smd;
-    smd.startDetached("leavenotehelperdaemon");
+//    QProcess smd;
+//    smd.startDetached("leavenotehelperdaemon");
 //    smd.waitForStarted();
+    Kded::self()->loadModule("leavenotehelperdaemon");    
 
     /* initialize layout */
     mTheme.setImagePath("widgets/notes");


[prev in list] [next in list] [prev in thread] [next in thread]