[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=c897341

The following commit has been merged in the master branch:
commit c8973414853c090b2f66050730b06b2053d5e69a
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Thu Dec 29 23:18:57 2011 +0100

    Connect to the right slots, check if the user clicked ok
---
 context-menu.cpp | 52 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/context-menu.cpp b/context-menu.cpp
index 53fffed..00d0b55 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -243,13 +243,13 @@ KMenu* ContextMenu::groupContextMenu(const QModelIndex &index)
     action->setIcon(KIcon("edit-rename"));
 
     connect(action, SIGNAL(triggered(bool)),
-            this, SLOT(onRenameGroup()));
+            this, SLOT(onRenameGroupTriggered()));
 
     action = menu->addAction(i18n("Delete Group"));
     action->setIcon(KIcon("edit-delete"));
 
     connect(action, SIGNAL(triggered(bool)),
-            this, SLOT(onDeleteGroup()));
+            this, SLOT(onDeleteGroupTriggered()));
 
     return menu;
 }
@@ -398,16 +398,23 @@ void ContextMenu::onAddContactToGroupTriggered()
 
 void ContextMenu::onCreateNewGroupTriggered()
 {
-    QString newGroupName = KInputDialog::getText(i18n("New Group Name"), i18n("Please enter the new group name"));
+    bool ok = false;
 
-    ContactModelItem *contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
+    QString newGroupName = KInputDialog::getText(i18n("New Group Name"),
+                                                 i18n("Please enter the new group name"),
+                                                 QString(),
+                                                 &ok);
 
-    Q_ASSERT(contactItem);
-    Tp::ContactPtr contact =  contactItem->contact();
-    Tp::PendingOperation *operation = contact->addToGroup(newGroupName);
+    if (ok) {
+        ContactModelItem *contactItem = m_currentIndex.data(AccountsModel::ItemRole).value<ContactModelItem*>();
 
-    connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
-            m_mainWidget, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
+        Q_ASSERT(contactItem);
+        Tp::ContactPtr contact =  contactItem->contact();
+        Tp::PendingOperation *operation = contact->addToGroup(newGroupName);
+
+        connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
+                m_mainWidget, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
+    }
 }
 
 void ContextMenu::onRenameGroupTriggered()
@@ -416,19 +423,26 @@ void ContextMenu::onRenameGroupTriggered()
 
     Q_ASSERT(groupItem);
 
-    QString newGroupName = KInputDialog::getText(i18n("New Group Name"), i18n("Please enter the new group name"), groupItem->groupName());
+    bool ok = false;
 
-    for(int i = 0; i < groupItem->size(); i++) {
-        Tp::ContactPtr contact = qobject_cast<ProxyTreeNode*>(groupItem->childAt(i))->data(AccountsModel::ItemRole).value<ContactModelItem*>()->contact();
-        Q_ASSERT(contact);
+    QString newGroupName = KInputDialog::getText(i18n("New Group Name"),
+                                                 i18n("Please enter the new group name"),
+                                                 groupItem->groupName(),
+                                                 &ok);
 
-        Tp::PendingOperation *operation = contact->addToGroup(newGroupName);
-        connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
-                m_mainWidget, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
+    if (ok) {
+        for(int i = 0; i < groupItem->size(); i++) {
+            Tp::ContactPtr contact = qobject_cast<ProxyTreeNode*>(groupItem->childAt(i))->data(AccountsModel::ItemRole).value<ContactModelItem*>()->contact();
+            Q_ASSERT(contact);
 
-        operation = contact->removeFromGroup(groupItem->groupName());
-        connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
-                m_mainWidget, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
+            Tp::PendingOperation *operation = contact->addToGroup(newGroupName);
+            connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
+                    m_mainWidget, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
+
+            operation = contact->removeFromGroup(groupItem->groupName());
+            connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
+                    m_mainWidget, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
+        }
     }
 }
 

-- 
ktp-contact-list packaging