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

List:       kde-commits
Subject:    KDE/kdevelop
From:       Laurent Montel <montel () kde ! org>
Date:       2006-07-31 13:05:24
Message-ID: 1154351124.040893.30428.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 568186 by mlaurent:

Convert to new knotify api


 M  +7 -7      plugins/outputviews/makewidget.cpp  
 M  +3 -2      src/CMakeLists.txt  
 D             src/eventsrc  
 A             src/kdevelop.notifyrc   src/eventsrc#567595
 M  +2 -1      src/mainwindowshare.cpp  


--- trunk/KDE/kdevelop/plugins/outputviews/makewidget.cpp #568185:568186
@@ -21,7 +21,7 @@
 #include <ktexteditor/document.h>
 #include <ktexteditor/view.h>
 #include <ktexteditor/cursor.h>
-
+#include <knotification.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <knotifyclient.h>
@@ -357,10 +357,10 @@
         {
             m_lastErrorSelected = -1;
             if ( !scanErrorForward( 0 ) )
-                KNotifyClient::beep();
+                KNotification::beep();
         }
         else
-            KNotifyClient::beep();
+            KNotification::beep();
 }
 
 void MakeWidget::prevError()
@@ -385,10 +385,10 @@
 #endif
 
             if ( !scanErrorBackward( parag ) )
-                KNotifyClient::beep();
+                KNotification::beep();
         }
         else
-            KNotifyClient::beep();
+            KNotification::beep();
 }
 
 void MakeWidget::contentsMouseReleaseEvent( QMouseEvent* e )
@@ -543,12 +543,12 @@
     {
         if ( childproc->exitStatus() )
         {
-            KNotifyClient::event( topLevelWidget() ->winId(), "ProcessError", i18n( \
"The process has finished with errors" ) ); +            KNotification::event( \
"ProcessError", i18n( "The process has finished with errors" ) ,QPixmap(), \
topLevelWidget());  emit m_part->commandFailed( currentCommand );
         }
         else
         {
-            KNotifyClient::event( topLevelWidget() ->winId(), "ProcessSuccess", \
i18n( "The process has finished successfully" ) ); +            KNotification::event( \
"ProcessSuccess", i18n( "The process has finished successfully" ) ,QPixmap(), \
topLevelWidget());  emit m_part->commandFinished( currentCommand );
         }
     }
--- trunk/KDE/kdevelop/src/CMakeLists.txt #568185:568186
@@ -43,7 +43,8 @@
 kde4_add_ui3_files(kdevshell_LIB_SRCS ${kdevshell_UI3})
 kde4_add_library(kdevshell SHARED ${kdevshell_LIB_SRCS})
 kde4_add_kcfg_files(kdevshell_LIB_SRCS kdevelopconfig.kcfgc )
-target_link_libraries(kdevshell ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} \
kdevinterfaces kdevutil kdevwidgets ${KDE4_KHTML_LIBS} ktexteditor) \
+target_link_libraries(kdevshell ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} \
kdevinterfaces kdevutil +    kdevwidgets ${KDE4_KHTML_LIBS} ktexteditor \
knotifyconfig)  set_target_properties(kdevshell PROPERTIES VERSION 4.0.0 SOVERSION 4)
 install(TARGETS kdevshell DESTINATION ${LIB_INSTALL_DIR} )
 
@@ -105,7 +106,7 @@
     DESTINATION ${INCLUDE_INSTALL_DIR}/kdevelop/shell )
 
 install( FILES kdeveloprc kdevassistantrc DESTINATION ${CONFIG_INSTALL_DIR} )
-install( FILES kdevelopui.rc eventsrc data.kdev4 DESTINATION \
${DATA_INSTALL_DIR}/kdevelop ) +install( FILES kdevelopui.rc kdevelop.notifyrc \
data.kdev4 DESTINATION ${DATA_INSTALL_DIR}/kdevelop )  install( FILES projectprofiles \
DESTINATION ${DATA_INSTALL_DIR}/kdevelop/profiles )  install( FILES \
kdevassistantui.rc DESTINATION ${DATA_INSTALL_DIR}/kdevassistant )  
--- trunk/KDE/kdevelop/src/mainwindowshare.cpp #568185:568186
@@ -22,6 +22,7 @@
 #include <QDir>
 #include <QRegExp>
 
+#include <knotifyconfigwidget.h>
 #include <kaction.h>
 #include <kaboutdata.h>
 #include <kstdaction.h>
@@ -304,7 +305,7 @@
 
 void MainWindowShare::slotConfigureNotifications()
 {
-    KNotifyDialog::configure(m_pMainWnd, "Notification Configuration Dialog");
+    KNotifyConfigWidget::configure(m_pMainWnd);
 }
 
 void MainWindowShare::slotSettings()


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