[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=246df66

The following commit has been merged in the master branch:
commit 246df6637b382bb846a30742f8c0f35633f693c2
Author: Siddhartha Sahu <sh.siddhartha at gmail.com>
Date:   Sun Mar 30 13:18:10 2014 +0530

    Use SettingsKcmDialog from K-C-I
    
    REVIEW: 117180
---
 contact-list-widget.cpp | 37 +++++--------------------------------
 1 file changed, 5 insertions(+), 32 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index ffae7bf..ff91593 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -31,6 +31,7 @@
 #include <KTp/global-contact-manager.h>
 #include <KTp/actions.h>
 #include <KTp/contact.h>
+#include <KTp/Widgets/settings-kcm-dialog.h>
 
 #include <KGlobal>
 #include <KSharedConfig>
@@ -206,38 +207,10 @@ void ContactListWidget::setAccountManager(const Tp::AccountManagerPtr &accountMa
 
 void ContactListWidget::showSettingsKCM()
 {
-    KSettings::Dialog *dialog = new KSettings::Dialog(this);
-
-    KService::Ptr tpAccKcm = KService::serviceByDesktopName("kcm_ktp_accounts");
-
-    if (!tpAccKcm) {
-        KMessageBox::error(this,
-                           i18n("It appears you do not have the IM Accounts control module installed. Please install ktp-accounts-kcm package."),
-                           i18n("IM Accounts KCM Plugin Is Not Installed"));
-    }
-
-    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->resize(700, 640);
-    dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog->exec();
+    KTp::SettingsKcmDialog *dialog = new KTp::SettingsKcmDialog(this);
+    dialog->addGeneralSettingsModule();
+    dialog->addNotificationsModule();
+    dialog->show();
 }
 
 void ContactListWidget::onContactListClicked(const QModelIndex& index)

-- 
ktp-contact-list packaging