[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=96ab98c

The following commit has been merged in the master branch:
commit 96ab98c2b22471804a7d18ca1437c36984f914a5
Author: Daniele Elmo Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Aug 5 15:35:56 2010 +0000

    Add a toolbar action to switch from grouped model to sorted model
    
    svn path=/trunk/playground/network/telepathy-contactlist/; revision=1159549
---
 main-widget.cpp | 31 ++++++++++++++++++++++++-------
 main-widget.h   |  3 +++
 main-widget.ui  | 12 ++++++++++++
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 0d39532..d8f9c70 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -147,6 +147,7 @@ MainWidget::MainWidget(QWidget *parent)
     setupUi(this);
     setWindowIcon(KIcon("telepathy"));
     m_actionAdd_contact->setIcon(KIcon("list-add-user"));
+    m_actionGroup_contacts->setIcon(KIcon("user-group-properties"));
 
     // Initialize Telepathy
     TelepathyBridge::instance()->init();
@@ -163,12 +164,15 @@ MainWidget::MainWidget(QWidget *parent)
 
     m_contactsListView->setSortingEnabled(true);
     m_contactsListView->setContextMenuPolicy(Qt::CustomContextMenu);
+    m_currentModel = m_groupedContactsProxyModel;
     m_contactsListView->setModel(m_groupedContactsProxyModel);
     m_contactsListView->setItemDelegate(new ContactDelegate(this));
     connect(m_contactsListView, SIGNAL(customContextMenuRequested(QPoint)),
             this, SLOT(onCustomContextMenuRequested(QPoint)));
     connect(m_actionAdd_contact, SIGNAL(triggered(bool)),
             this, SLOT(onAddContactRequest(bool)));
+    connect(m_actionGroup_contacts, SIGNAL(triggered(bool)),
+            this, SLOT(onGroupContacts(bool)));
 
     // Get 'me' as soon as possible
     // FIXME: Port to new OSCAF standard for accessing "me" as soon as it
@@ -211,7 +215,7 @@ void MainWidget::onCustomContextMenuRequested(const QPoint& point)
     }
 
     // Map the index to the real model
-    QModelIndex idx = m_groupedContactsProxyModel->mapToSource(proxyIdx);
+    QModelIndex idx = m_currentModel->mapToSource(proxyIdx);
     if (!idx.isValid()) {
         kDebug() << "Could not map to source";
         // Flee
@@ -379,7 +383,7 @@ void MainWidget::onRequestRemoveFromGroup(bool )
     kDebug() << "Request removal from group " << action->text();
 
     // Pick the current model index
-    QModelIndex idx = m_groupedContactsProxyModel->mapToSource(m_contactsListView->currentIndex());
+    QModelIndex idx = m_currentModel->mapToSource(m_contactsListView->currentIndex());
     if (!idx.isValid()) {
         // Flee
         kDebug() << "Invalid index";
@@ -421,7 +425,7 @@ void MainWidget::onRequestAddToGroup(bool )
     kDebug() << "Request addition group " << action->text();
 
     // Pick the current model index
-    QModelIndex idx = m_groupedContactsProxyModel->mapToSource(m_contactsListView->currentIndex());
+    QModelIndex idx = m_currentModel->mapToSource(m_contactsListView->currentIndex());
     if (!idx.isValid()) {
         // Flee
         kDebug() << "Invalid index";
@@ -458,7 +462,7 @@ void MainWidget::onContactBlockRequest(bool )
 void MainWidget::onRemoveFromMetacontact(bool )
 {
     // Pick the current model index
-    QModelIndex idx = m_groupedContactsProxyModel->mapToSource(m_contactsListView->currentIndex());
+    QModelIndex idx = m_currentModel->mapToSource(m_contactsListView->currentIndex());
     if (!idx.isValid()) {
         // Flee
         kDebug() << "Invalid index";
@@ -493,7 +497,7 @@ void MainWidget::onContactRemovalRequest(bool )
     kDebug() << "Request addition group " << action->text();
 
     // Pick the current model index
-    QModelIndex idx = m_groupedContactsProxyModel->mapToSource(m_contactsListView->currentIndex());
+    QModelIndex idx = m_currentModel->mapToSource(m_contactsListView->currentIndex());
     if (!idx.isValid()) {
         // Flee
         kDebug() << "Invalid index";
@@ -654,6 +658,19 @@ void MainWidget::onAddContactRequest(bool )
     }
 }
 
+void MainWidget::onGroupContacts(bool grouped)
+{
+    if (grouped && m_currentModel != m_groupedContactsProxyModel) {
+        m_currentModel = m_groupedContactsProxyModel;
+        m_contactsListView->setModel(m_groupedContactsProxyModel);
+    }
+    else if(!grouped && m_currentModel != m_sortFilterProxyModel) {
+        m_currentModel = m_sortFilterProxyModel;
+        m_contactsListView->setModel(m_sortFilterProxyModel);
+    }
+
+}
+
 void MainWidget::onAddToMetaContact(bool )
 {
     QAction *action = qobject_cast< QAction* >(sender());
@@ -666,7 +683,7 @@ void MainWidget::onAddToMetaContact(bool )
     kDebug() << "Request adding to metacontact " << metaContactName;
 
     // Pick the current model index
-    QModelIndex idx = m_groupedContactsProxyModel->mapToSource(m_contactsListView->currentIndex());
+    QModelIndex idx = m_currentModel->mapToSource(m_contactsListView->currentIndex());
     if (!idx.isValid()) {
         // Flee
         kDebug() << "Invalid index";
@@ -746,7 +763,7 @@ void MainWidget::onStartChat(bool)
     }
 
     // Pick the current model index
-    QModelIndex idx = m_groupedContactsProxyModel->mapToSource(m_contactsListView->currentIndex());
+    QModelIndex idx = m_currentModel->mapToSource(m_contactsListView->currentIndex());
     if (!idx.isValid()) {
         // Flee
         kDebug() << "Invalid index";
diff --git a/main-widget.h b/main-widget.h
index 058fe22..cd77c77 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -32,6 +32,7 @@
 class ContactsListModel;
 class GroupedContactsProxyModel;
 class QSortFilterProxyModel;
+class QAbstractProxyModel;
 
 class ContactDelegate : public QStyledItemDelegate
 {
@@ -56,6 +57,7 @@ private:
     ContactsListModel *m_model;
     GroupedContactsProxyModel *m_groupedContactsProxyModel;
     QSortFilterProxyModel *m_sortFilterProxyModel;
+    QAbstractProxyModel *m_currentModel;
     Nepomuk::PersonContact m_mePersonContact;
 
 public slots:
@@ -71,6 +73,7 @@ public slots:
     void onRemoveFromMetacontact(bool);
 //Toolbar actions
     void onAddContactRequest(bool);
+    void onGroupContacts(bool);
 };
 
 
diff --git a/main-widget.ui b/main-widget.ui
index b4e38ae..5b0d5aa 100644
--- a/main-widget.ui
+++ b/main-widget.ui
@@ -23,6 +23,7 @@
       <enum>Qt::ToolButtonTextBesideIcon</enum>
      </property>
      <addaction name="m_actionAdd_contact"/>
+     <addaction name="m_actionGroup_contacts"/>
     </widget>
    </item>
    <item>
@@ -34,6 +35,17 @@
     <string>Add contact</string>
    </property>
   </action>
+  <action name="m_actionGroup_contacts">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Group contacts</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

-- 
ktp-contact-list packaging