[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=8941bcd

The following commit has been merged in the master branch:
commit 8941bcd22c9ff6a8f214a78859b7e414ab15a7a7
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Wed Jun 15 20:19:15 2011 +0530

    Refactor filterOfflineUsers to showOfflineUsers
     - This commit changes the nature of the Show/Hide Offline Users action button
     - Pushing the button in now shows the offline users instead of hiding them
     - String change : "Show/Hide offline users" -> "Hide/Show offline users"
    
    REVIEW: 101630
---
 account-filter-model.cpp | 14 +++++++-------
 account-filter-model.h   |  8 ++++----
 main-widget.cpp          | 16 ++++++++--------
 main-widget.h            |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/account-filter-model.cpp b/account-filter-model.cpp
index d30b208..d86b340 100644
--- a/account-filter-model.cpp
+++ b/account-filter-model.cpp
@@ -25,21 +25,21 @@
 
 AccountFilterModel::AccountFilterModel(QObject *parent)
     : QSortFilterProxyModel(parent),
-      m_filterOfflineUsers(false),
+      m_showOfflineUsers(false),
       m_filterByName(false)
 {
 
 }
 
-void AccountFilterModel::filterOfflineUsers(bool filterOfflineUsers)
+void AccountFilterModel::showOfflineUsers(bool showOfflineUsers)
 {
-    m_filterOfflineUsers = filterOfflineUsers;
+    m_showOfflineUsers = showOfflineUsers;
     invalidateFilter();
 }
 
-bool AccountFilterModel::filterOfflineUsers() const
+bool AccountFilterModel::showOfflineUsers() const
 {
-    return m_filterOfflineUsers;
+    return m_showOfflineUsers;
 }
 
 bool AccountFilterModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
@@ -56,7 +56,7 @@ bool AccountFilterModel::filterAcceptsRow(int source_row, const QModelIndex &sou
         }
 
         //filter offline users out
-        if (m_filterOfflineUsers &&
+        if (!m_showOfflineUsers &&
                 ((source_parent.child(source_row, 0).data(AccountsModel::PresenceTypeRole).toUInt()
                 == Tp::ConnectionPresenceTypeOffline) ||
                 (source_parent.child(source_row, 0).data(AccountsModel::PresenceTypeRole).toUInt()
@@ -68,7 +68,7 @@ bool AccountFilterModel::filterAcceptsRow(int source_row, const QModelIndex &sou
         QModelIndex index = sourceModel()->index(source_row, 0);
         if (index.isValid()) {
             if (m_groupsActive) {
-                if (m_filterOfflineUsers) {
+                if (!m_showOfflineUsers) {
                     if (index.data(AccountsModel::OnlineUsersCountRole).toInt() > 0) {
                         return true;
                     } else {
diff --git a/account-filter-model.h b/account-filter-model.h
index 007c2a9..1e30a25 100644
--- a/account-filter-model.h
+++ b/account-filter-model.h
@@ -39,7 +39,7 @@ class AccountFilterModel : public QSortFilterProxyModel
 
 public:
     AccountFilterModel(QObject *parent = 0);
-    bool filterOfflineUsers() const;
+    bool showOfflineUsers() const;
 
     /**
      * rief Flag to sort the contactlist by presence.
@@ -53,7 +53,7 @@ public:
 
 
 public slots:
-    void filterOfflineUsers(bool filterOfflineUsers);
+    void showOfflineUsers(bool showOfflineUsers);
     void setFilterString(const QString &str);
     void clearFilterString();
     /**
@@ -68,8 +68,8 @@ protected:
     bool lessThan ( const QModelIndex &left, const QModelIndex &right ) const;
 
 private:
-    /// Filters out offline users
-    bool m_filterOfflineUsers;
+    /// Shows offline users
+    bool m_showOfflineUsers;
 
     /// Used when searching for contact
     bool m_filterByName;
diff --git a/main-widget.cpp b/main-widget.cpp
index 65fff93..1f81b19 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -129,12 +129,12 @@ MainWidget::MainWidget(QWidget *parent)
 
     m_toolBar->addAction(m_groupContactsAction);
 
-    m_hideOfflineAction = new KAction(KIcon("meeting-attending-tentative"), QString(), this);
-    m_hideOfflineAction->setCheckable(true);
-    m_hideOfflineAction->setChecked(true);
-    m_hideOfflineAction->setToolTip(i18n("Show/Hide offline users"));
+    m_showOfflineAction = new KAction(KIcon("meeting-attending-tentative"), QString(), this);
+    m_showOfflineAction->setCheckable(true);
+    m_showOfflineAction->setChecked(false);
+    m_showOfflineAction->setToolTip(i18n("Hide/Show offline users"));
 
-    m_toolBar->addAction(m_hideOfflineAction);
+    m_toolBar->addAction(m_showOfflineAction);
 
     m_sortByPresenceAction = new KAction(KIcon("view-sort-ascending"), QString(), this);
     m_sortByPresenceAction->setCheckable(true);
@@ -295,7 +295,7 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
         m_modelFilter->setSourceModel(m_model);
     }
     m_modelFilter->setDynamicSortFilter(true);
-    m_modelFilter->filterOfflineUsers(m_hideOfflineAction->isChecked());
+    m_modelFilter->showOfflineUsers(m_showOfflineAction->isChecked());
     m_modelFilter->clearFilterString();
     m_modelFilter->setFilterCaseSensitivity(Qt::CaseInsensitive);
     m_modelFilter->setSortRole(Qt::DisplayRole);
@@ -304,8 +304,8 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     m_contactsListView->setSortingEnabled(true);
     m_contactsListView->sortByColumn(0, Qt::AscendingOrder);
 
-    connect(m_hideOfflineAction, SIGNAL(toggled(bool)),
-            m_modelFilter, SLOT(filterOfflineUsers(bool)));
+    connect(m_showOfflineAction, SIGNAL(toggled(bool)),
+            m_modelFilter, SLOT(showOfflineUsers(bool)));
 
     connect(m_filterBar, SIGNAL(filterChanged(QString)),
             m_modelFilter, SLOT(setFilterString(QString)));
diff --git a/main-widget.h b/main-widget.h
index abee064..070ac10 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -131,7 +131,7 @@ private:
     ContactDelegateCompact *m_compactDelegate;
     KAction                *m_addContactAction;
     KAction                *m_groupContactsAction;
-    KAction                *m_hideOfflineAction;
+    KAction                *m_showOfflineAction;
     KAction                *m_searchContactAction;
     KAction                *m_sortByPresenceAction;
 };

-- 
ktp-contact-list packaging