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

The following commit has been merged in the master branch:
commit b83e452e60969ee02891db835c715a88fac391db
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Fri Jun 17 23:13:09 2011 +0200

    FIX: single click to expand/collaps contact list groups
    
    contact list groups are now expanded/collapsed by single click.
    
    BUG: 275413
    REVIEW: 101662
    Reviewed by: David Edmundson
---
 main-widget.cpp | 25 +++++++++++++++++++------
 main-widget.h   |  1 +
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 0785079..27a903d 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -244,6 +244,9 @@ MainWidget::MainWidget(QWidget *parent)
     connect(m_contactsListView, SIGNAL(customContextMenuRequested(QPoint)),
             this, SLOT(onCustomContextMenuRequested(QPoint)));
 
+    connect(m_contactsListView, SIGNAL(clicked(QModelIndex)),
+            this, SLOT(onContactListClicked(QModelIndex)));
+
     connect(m_contactsListView, SIGNAL(doubleClicked(QModelIndex)),
             this, SLOT(onContactListDoubleClick(QModelIndex)));
 
@@ -469,18 +472,28 @@ void MainWidget::onConnectionChanged(const Tp::ConnectionPtr& connection)
     }
 }
 
-void MainWidget::onContactListDoubleClick(const QModelIndex& index)
+void MainWidget::onContactListClicked(const QModelIndex& index)
 {
-    if(!index.isValid()) {
+    if (!index.isValid()) {
         return;
     }
 
-    if(index.data(AccountsModel::AliasRole).toString().isEmpty()) {
-        if(m_contactsListView->isExpanded(index))
+    if (index.data(AccountsModel::AliasRole).toString().isEmpty()) {
+        if (m_contactsListView->isExpanded(index)) {
             m_contactsListView->collapse(index);
-        else m_contactsListView->expand(index);
+        } else {
+            m_contactsListView->expand(index);
+        }
     }
-    else {
+}
+
+void MainWidget::onContactListDoubleClick(const QModelIndex& index)
+{
+    if (!index.isValid()) {
+        return;
+    }
+
+    if (!index.data(AccountsModel::AliasRole).toString().isEmpty()) {
         kDebug() << "Text chat requested for index" << index;
         startTextChannel(index.data(AccountsModel::ItemRole).value<ContactModelItem*>());
     }
diff --git a/main-widget.h b/main-widget.h
index 070ac10..fb1cf10 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -70,6 +70,7 @@ public:
 public Q_SLOTS:
     void onAccountManagerReady(Tp::PendingOperation *op);
 
+    void onContactListClicked(const QModelIndex &index);
     void onContactListDoubleClick(const QModelIndex &index);
     void onConnectionChanged(const Tp::ConnectionPtr &connection);
     void onAccountConnectionStatusChanged(Tp::ConnectionStatus status);

-- 
ktp-contact-list packaging