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

The following commit has been merged in the master branch:
commit d51cfecf25b35599d9603a7e4ff163b95da806b4
Author: Roman Nazarenko <me at jtalk.me>
Date:   Mon Mar 4 19:12:25 2013 +0600

    Contact list grouping now goes disabled during search.
    
    REVIEW: 109280
    BUG: 291445
---
 contact-list-widget.cpp |  8 +++++++-
 contact-list-widget_p.h | 22 ++++++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 85d7132..f931913 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -305,12 +305,12 @@ void ContactListWidget::toggleGroups(bool show)
 {
     Q_D(ContactListWidget);
 
-
     if (show) {
         d->model->setGroupMode(KTp::ContactsModel::GroupGrouping);
     } else {
         d->model->setGroupMode(KTp::ContactsModel::AccountGrouping);
     }
+    d->groupMode = d->model->groupMode();
 
     for (int i = 0; i < d->model->rowCount(); i++) {
         onNewGroupModelItemsInserted(d->model->index(i, 0, QModelIndex()), 0, 0);
@@ -504,6 +504,12 @@ void ContactListWidget::setFilterString(const QString& string)
 {
     Q_D(ContactListWidget);
 
+    if (string.isEmpty()) {
+        d->model->setGroupMode(d->groupMode);
+    } else {
+        d->model->setGroupMode(KTp::ContactsModel::NoGrouping);
+    }
+
     d->model->setPresenceTypeFilterFlags(string.isEmpty() && !d->showOffline ? KTp::ContactsFilterModel::ShowOnlyConnected : KTp::ContactsFilterModel::DoNotFilterByPresence);
     d->model->setGlobalFilterString(string);
 }
diff --git a/contact-list-widget_p.h b/contact-list-widget_p.h
index 03a7f1b..f3e7214 100644
--- a/contact-list-widget_p.h
+++ b/contact-list-widget_p.h
@@ -21,6 +21,7 @@
 #define CONTACT_LIST_WIDGET_P_H
 
 #include <TelepathyQt/Types>
+#include <KTp/Models/contacts-model.h>
 
 namespace KTp {
     class ContactsModel;
@@ -38,16 +39,17 @@ public:
       shouldDrag(false),
       showOffline(false) {}
 
-    KTp::ContactsModel     *model;
-    ContactDelegate        *delegate;
-    ContactDelegateCompact *compactDelegate;
-    QRect                   dropIndicatorRect;
-    QPoint                  dragStartPosition;
-    QString                 dragSourceGroup;
-    bool                    shouldDrag;
-    bool                    showOffline;
-    QHash<QString, bool>    groupStates;
-    Tp::AccountManagerPtr   accountManager;
+    KTp::ContactsModel           *model;
+    ContactDelegate              *delegate;
+    ContactDelegateCompact       *compactDelegate;
+    QRect                         dropIndicatorRect;
+    QPoint                        dragStartPosition;
+    QString                       dragSourceGroup;
+    bool                          shouldDrag;
+    bool                          showOffline;
+    QHash<QString, bool>          groupStates;
+    Tp::AccountManagerPtr         accountManager;
+    KTp::ContactsModel::GroupMode groupMode; // Stores current grouping mode (by accounts or by groups)
 };
 
 #endif //CONTACT_LIST_WIDGET_P_H

-- 
ktp-contact-list packaging