KNotifyClient -> KNotification (doesn't really work though, eg dcop warning/error, if a null pixmap is specified for the event

svn path=/trunk/KDE/kdebase/konsole/; revision=512385

Makefile.am

@@ -18,7 +18,7 @@ install-data-local:
 konsolehere_DATA = konsolehere.desktop
 konsoleheredir = $(kde_datadir)/konqueror/servicemenus
 
-misc_DATA = eventsrc tips
+misc_DATA = konsole.notifyrc eventsrc tips
 miscdir = $(kde_datadir)/konsole
 
 EXTRA_DIST = CONTRIBUTORS LICENSE.readme README.bugs \

konsole.notifyrc

@@ -1,19 +1,19 @@
-[!Global!]
+[Global]
 IconName=konsole
 Comment=Konsole
 Comment[x-test]=xxKonsolexx
 
-[BellVisible]
+[Event/BellVisible]
 Name=Bell in visible session
 Name[fr]=Cloche dans la session visible
 Name[x-test]=xxBell in visible sessionxx
 Comment=Bell emitted within a visible session
 Comment[fr]=Cloche émise dans une session visible
 Comment[x-test]=xxBell emitted within a visible sessionxx
-default_sound=KDE_Beep.ogg
-default_presentation=1
+Sound=KDE_Beep.ogg
+Action=Sound
 
-[BellInvisible]
+[Event/BellInvisible]
 Name=Bell in non-visible session
 Name[fr]=Cloche dans une session invisible
 Name[x-test]=xxBell in non-visible sessionxx
@@ -21,31 +21,32 @@ Comment=Bell emitted within a non-visible session
 Comment[fr]=Cloche émise dans une session invisible
 Comment[x-test]=xxBell emitted within a non-visible sessionxx
 default_sound=KDE_Beep.ogg
-default_presentation=16
+Action=PassivePopup
 
-[Activity]
+[Event/Activity]
 Name=Activity in monitored session
 Name[fr]=Activité dans la session surveillée
 Name[x-test]=xxActivity in monitored sessionxx
 Comment=Activity detected in a monitored session
 Comment[fr]=Activité détectée dans une session surveillée
 Comment[x-test]=xxActivity detected in a monitored sessionxx
-default_presentation=16
+Action=PassivePopup
+
 
-[Silence]
+[Event/Silence]
 Name=Silence in monitored session
 Name[fr]=Inactivité dans la session surveillée
 Name[x-test]=xxSilence in monitored sessionxx
 Comment=Silence detected in a monitored session
 Comment[fr]=Inactivité détectée dans une session surveillée
 Comment[x-test]=xxSilence detected in a monitored sessionxx
-default_presentation=16
+Action=PassivePopup
 
-[Finished]
+[Event/Finished]
 Name=Session finished with non-zero status
 Name[fr]=La session s'est terminée anormalement
 Name[x-test]=xxSession finished with non-zero statusxx
 Comment=A session has exited with non-zero status
 Comment[fr]=Une session s'est terminée anormalement
 Comment[x-test]=xxA session has exited with non-zero statusxx
-default_presentation=0
+Action=None

konsole/TEWidget.cpp

@@ -83,7 +83,7 @@
 #include <kcursor.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <knotifyclient.h>
+#include <knotification.h>
 #include <kglobalsettings.h>
 #include <kshortcut.h>
 #include <k3urldrag.h>
@@ -1998,12 +1998,12 @@ void TEWidget::Bell(bool visibleSession, QString message)
   if (m_bellMode==BELLNONE) return;
 
   if (m_bellMode==BELLSYSTEM) {
-    KNotifyClient::beep();
+    KNotification::beep();
   } else if (m_bellMode==BELLNOTIFY) {
     if (visibleSession)
-      KNotifyClient::event(winId(), "BellVisible", message);
+      KNotification::event("BellVisible", message,QPixmap(),this);
     else
-      KNotifyClient::event(winId(), "BellInvisible", message);
+      KNotification::event("BellInvisible", message,QPixmap(),this);
   } else if (m_bellMode==BELLVISUAL) {
     swapColorTable();
     QTimer::singleShot(200,this,SLOT(swapColorTable()));