[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=784c25a

The following commit has been merged in the master branch:
commit 784c25a725c78753e333367ecd03116edfb23bf4
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Sep 13 16:40:05 2011 +0200

    Show offline users while searching in contact list. Also fixes some code style issues.
    
    Reviewed-by: David Edmundson
    FEATURE: 279006
---
 filter-bar.cpp                   |  2 +-
 main-widget.cpp                  | 13 +++++--------
 models/accounts-filter-model.cpp | 12 +++++++++---
 models/accounts-filter-model.h   |  4 +++-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/filter-bar.cpp b/filter-bar.cpp
index 13102f5..4f6cd05 100644
--- a/filter-bar.cpp
+++ b/filter-bar.cpp
@@ -46,7 +46,7 @@ FilterBar::FilterBar(QWidget* parent) :
     m_filterInput = new KLineEdit(this);
     m_filterInput->setLayoutDirection(Qt::LeftToRight);
     m_filterInput->setClearButtonShown(true);
-    connect(m_filterInput, SIGNAL(textChanged(const QString&)),
+    connect(m_filterInput, SIGNAL(textEdited(const QString&)),
             this, SIGNAL(filterChanged(const QString&)));
     setFocusProxy(m_filterInput);
 
diff --git a/main-widget.cpp b/main-widget.cpp
index b2a511c..0e2c252 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -307,7 +307,7 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
         m_modelFilter->setSourceModel(m_model);
     }
     m_modelFilter->setDynamicSortFilter(true);
-    m_modelFilter->showOfflineUsers(m_showOfflineAction->isChecked());
+    m_modelFilter->setShowOfflineUsers(m_showOfflineAction->isChecked());
     m_modelFilter->clearFilterString();
     m_modelFilter->setFilterCaseSensitivity(Qt::CaseInsensitive);
     m_modelFilter->setSortRole(Qt::DisplayRole);
@@ -317,19 +317,16 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     m_contactsListView->sortByColumn(0, Qt::AscendingOrder);
 
     connect(m_showOfflineAction, SIGNAL(toggled(bool)),
-            m_modelFilter, SLOT(showOfflineUsers(bool)));
+            m_modelFilter, SLOT(setShowOfflineUsers(bool)));
 
     connect(m_filterBar, SIGNAL(filterChanged(QString)),
             m_modelFilter, SLOT(setFilterString(QString)));
 
     connect(m_filterBar, SIGNAL(closeRequest()),
-            m_modelFilter, SLOT(clearFilterString()));
-
-    connect(m_filterBar, SIGNAL(closeRequest()),
             m_filterBar, SLOT(hide()));
 
     connect(m_filterBar, SIGNAL(closeRequest()),
-            m_searchContactAction, SLOT(toggle()));
+            m_searchContactAction, SLOT(trigger()));
 
     connect(m_sortByPresenceAction, SIGNAL(toggled(bool)),
             m_modelFilter, SLOT(setSortByPresence(bool)));
@@ -371,7 +368,7 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     m_groupContactsAction->setChecked(useGroups);
 
     bool showOffline = guiConfigGroup.readEntry("show_offline", false);
-    m_modelFilter->showOfflineUsers(showOffline);
+    m_modelFilter->setShowOfflineUsers(showOffline);
     m_showOfflineAction->setChecked(showOffline);
 
     bool sortByPresence = guiConfigGroup.readEntry("sort_by_presence", true);
@@ -697,7 +694,7 @@ void MainWidget::toggleSearchWidget(bool show)
         m_filterBar->show();
     }
     else {
-        m_modelFilter->clearFilterString();
+        m_modelFilter->clearFilterStringAndHideOfflineUsers(m_showOfflineAction->isChecked());
         m_filterBar->clear();
         m_filterBar->hide();
     }
diff --git a/models/accounts-filter-model.cpp b/models/accounts-filter-model.cpp
index 8c31686..a830d06 100644
--- a/models/accounts-filter-model.cpp
+++ b/models/accounts-filter-model.cpp
@@ -27,7 +27,6 @@
 #include "contact-model-item.h"
 #include "accounts-model-item.h"
 
-
 #include <KDebug>
 
 AccountsFilterModel::AccountsFilterModel(QObject *parent)
@@ -47,7 +46,7 @@ AccountsFilterModel::AccountsFilterModel(QObject *parent)
     m_presenceSorting[Tp::ConnectionPresenceTypeOffline] = 6;
 }
 
-void AccountsFilterModel::showOfflineUsers(bool showOfflineUsers)
+void AccountsFilterModel::setShowOfflineUsers(bool showOfflineUsers)
 {
     m_showOfflineUsers = showOfflineUsers;
     invalidateFilter();
@@ -127,9 +126,16 @@ void AccountsFilterModel::setFilterString(const QString &str)
 {
     m_filterString = str;
     m_filterByName = true;
+    m_showOfflineUsers = true;
     invalidateFilter();
 }
 
+void AccountsFilterModel::clearFilterStringAndHideOfflineUsers(const bool &showOfflineUsers)
+{
+    m_showOfflineUsers = showOfflineUsers;
+    clearFilterString();
+}
+
 void AccountsFilterModel::clearFilterString()
 {
     m_filterString.clear();
@@ -137,7 +143,7 @@ void AccountsFilterModel::clearFilterString()
     invalidateFilter();
 }
 
-bool AccountsFilterModel::lessThan( const QModelIndex &left, const QModelIndex &right ) const
+bool AccountsFilterModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
     uint leftPresence;
     uint rightPresence;
diff --git a/models/accounts-filter-model.h b/models/accounts-filter-model.h
index ffe936d..1796f51 100644
--- a/models/accounts-filter-model.h
+++ b/models/accounts-filter-model.h
@@ -53,8 +53,10 @@ public:
     bool isSortedByPresence() const;
 
 public slots:
-    void showOfflineUsers(bool showOfflineUsers);
+    void setShowOfflineUsers(bool showOfflineUsers);
     void setFilterString(const QString &str);
+    /// This overloaded method takes into account showing/hiding offline users
+    void clearFilterStringAndHideOfflineUsers(const bool& showOfflineUsers);
     void clearFilterString();
     /**
      * rief Lets the proxy know whether the model should get sorted by presence or not.

-- 
ktp-contact-list packaging