[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=67ca197

The following commit has been merged in the master branch:
commit 67ca197598c3707eef449fd5e8617a8cde281453
Author: Roman Nazarenko <me at jtalk.me>
Date:   Mon Feb 25 15:16:19 2013 +0100

    Add notification settings into configuration dialog
    
    REVIEW: 109139
    BUG: 313381
    FIXED-IN: 0.6
---
 CMakeLists.txt          |  1 +
 contact-list-widget.cpp | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9712de2..1ba261c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,6 +71,7 @@ target_link_libraries (ktp-contactlist
                        ${KDE4_KIO_LIBS}
                        ${KDE4_KCMUTILS_LIBS}
                        ${TELEPATHY_LOGGER_QT4_LIBRARIES}
+                       ${KDE4_KNOTIFYCONFIG_LIBS}
 )
 
 
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 2e8dcb8..1343ef0 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -42,6 +42,7 @@
 #include <KFileDialog>
 #include <KSettings/Dialog>
 #include <KMenu>
+#include <KNotifyConfigWidget>
 
 #include <QHeaderView>
 #include <QLabel>
@@ -170,6 +171,22 @@ void ContactListWidget::showSettingsKCM()
     dialog->addModule("kcm_ktp_accounts");
     dialog->addModule("kcm_ktp_integration_module");
 
+    // Setup notifications menu
+    KNotifyConfigWidget *notificationWidget = new KNotifyConfigWidget(dialog);
+    notificationWidget->setApplication("ktelepathy");
+    connect(dialog, SIGNAL(accepted()),
+            notificationWidget, SLOT(save()));
+
+    connect(notificationWidget, SIGNAL(changed(bool)),
+            dialog, SLOT(enableButtonApply(bool)));
+
+    connect(dialog,SIGNAL(applyClicked()),
+            notificationWidget, SLOT(save()));
+
+    KPageWidgetItem* notificationPage = new KPageWidgetItem(notificationWidget, i18n("Notifications"));
+    notificationPage->setIcon(KIcon("preferences-desktop-notification"));
+    dialog->addPage(notificationPage);
+
     dialog->setAttribute(Qt::WA_DeleteOnClose);
     dialog->exec();
 }

-- 
ktp-contact-list packaging