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

List:       kde-commits
Subject:    =?utf-8?q?=5Btelepathy-chat-handler=5D_/=3A_Add_notifications_co?=
From:       David Edmundson <kde () davidedmundson ! co ! uk>
Date:       2011-02-18 20:51:51
Message-ID: 20110218205151.17A89A609B () git ! kde ! org
[Download RAW message or body]

Git commit 22ae1ebdb69817fe3926fef4931088985b02fdbb by David Edmundson. on behalf of \
Dominik Schmidt Committed on 18/02/2011 at 20:29.
Pushed by davidedmundson into branch 'master'.

Add notifications configure dialog and fix linking

M  +9    -2    app/CMakeLists.txt     
M  +8    -1    app/chatwindow.cpp     
M  +1    -0    app/chatwindow.h     
M  +0    -1    app/main.cpp     
M  +2    -1    lib/CMakeLists.txt     

http://commits.kde.org/telepathy-chat-handler/22ae1ebdb69817fe3926fef4931088985b02fdbb


diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 738a3b6..f626914 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -10,7 +10,14 @@ set(telepathy_chat_handler_SRCS
 
 kde4_add_executable(telepathy-chat-handler ${telepathy_chat_handler_SRCS})
 
-target_link_libraries(telepathy-chat-handler ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} \
${TELEPATHY_QT4_LIBRARIES} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KUTILS_LIBS} \
ktelepathy_chat_lib) +target_link_libraries(telepathy-chat-handler
+            ${KDE4_KDECORE_LIBS}
+            ${KDE4_KDEUI_LIBS}
+            ${TELEPATHY_QT4_LIBRARIES}
+            ${QT_QTWEBKIT_LIBRARY}
+            ${KDE4_KNOTIFYCONFIG_LIBS}
+	    ${KDE4_KCMUTILS_LIBS}
+            ktelepathy_chat_lib)
 
 configure_file(org.freedesktop.Telepathy.Client.KDEChatHandler.service.in
                ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDEChatHandler.service)
 @@ -20,4 +27,4 @@ install(FILES \
${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDECh  DESTINATION \
${DBUS_SERVICES_INSTALL_DIR})  install(FILES KDEChatHandler.client DESTINATION \
${SHARE_INSTALL_PREFIX}/telepathy/clients/)  install(FILES chatwindow.rc
-        DESTINATION  ${DATA_INSTALL_DIR}/telepathy-chat-handler/)
+        DESTINATION  ${DATA_INSTALL_DIR}/ktelepathy/)
diff --git a/app/chatwindow.cpp b/app/chatwindow.cpp
index 5cf2ea0..fed4381 100644
--- a/app/chatwindow.cpp
+++ b/app/chatwindow.cpp
@@ -31,13 +31,14 @@
 #include <KColorScheme>
 #include <KTabBar>
 #include <KSettings/Dialog>
+#include <KNotifyConfigWidget>
 
 ChatWindow::ChatWindow()
 {
     //setup actions
     KStandardAction::quit(KApplication::instance(), SLOT(quit()), \
                actionCollection());
     KStandardAction::preferences(this, SLOT(showSettingsDialog()), \
                actionCollection());
-
+    KStandardAction::configureNotifications(this, SLOT(showNotificationsDialog()), \
actionCollection());  
     // set up m_tabWidget
     m_tabWidget = new KTabWidget(this);
@@ -149,4 +150,10 @@ void ChatWindow::showSettingsDialog()
     dialog->show();
 }
 
+void ChatWindow::showNotificationsDialog()
+{
+    KNotifyConfigWidget::configure(this, "ktelepathy");
+}
+
+
 #include "chatwindow.moc"
\ No newline at end of file
diff --git a/app/chatwindow.h b/app/chatwindow.h
index e6e2ffd..663a54a 100644
--- a/app/chatwindow.h
+++ b/app/chatwindow.h
@@ -46,6 +46,7 @@ public slots:
 
 protected slots:
     void showSettingsDialog();
+    void showNotificationsDialog();
 
 private:
     KTabWidget *m_tabWidget;
diff --git a/app/main.cpp b/app/main.cpp
index 06281e2..1a08bac 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -36,7 +36,6 @@ int main(int argc, char *argv[])
                          0,
                          ki18n("Telepathy Chat Handler"),
                          "0.1");
-
     aboutData.addAuthor(ki18n("David Edmundson"), ki18n("Developer"), \
                "david@davidedmundson.co.uk");
     aboutData.addAuthor(ki18n("Dominik Schmidt"), ki18n("Developer"), \
"kde@dominik-schmidt.de");  
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index f4e46aa..f31dbc7 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -25,7 +25,8 @@ target_link_libraries(ktelepathy_chat_lib
     ${KDE4_KDEUI_LIBS}
     ${TELEPATHY_QT4_LIBRARIES}
     ${QT_QTWEBKIT_LIBRARY}
-    ${KDE4_KUTILS_LIBS}
+    ${KDE4_KEMOTICONS_LIBS}
+    ${KDE4_KCMUTILS_LIBS}
 )
 install(TARGETS ktelepathy_chat_lib ${INSTALL_TARGETS_DEFAULT_ARGS})
 


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