[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=31e7faf

The following commit has been merged in the master branch:
commit 31e7faffe1adcf96ed1d55e6f0e65a78dd86a3cf
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Sat May 5 15:05:38 2012 +0200

    Make it possible to filter for blocked/unblocked contacts
    
    This adds a submenu to the wrench-button-menu where you can set which
    contacts should be shown:
     * Show all contacts [that's how it was up until now]
     * Show unblocked contacts [default]
     * Show blocked contacts
    
    BUG: 294679
    CCBUG: 294679
    REVIEW: 104667
---
 contact-list-widget.cpp | 36 ++++++++++++++++++++++++++++++++++++
 contact-list-widget.h   |  4 ++++
 main-widget.cpp         | 31 +++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 014271a..5f5a95c 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -531,6 +531,42 @@ void ContactListWidget::onSwitchToCompactView()
     guiConfigGroup.config()->sync();
 }
 
+void ContactListWidget::onShowAllContacts()
+{
+    Q_D(ContactListWidget);
+
+    d->modelFilter->setSubscriptionStateFilterFlags(AccountsFilterModel::DoNotFilterBySubscription);
+
+    KSharedConfigPtr config = KGlobal::config();
+    KConfigGroup guiConfigGroup(config, "GUI");
+    guiConfigGroup.writeEntry("shown_contacts", "all");
+    guiConfigGroup.config()->sync();
+}
+
+void ContactListWidget::onShowUnblockedContacts()
+{
+    Q_D(ContactListWidget);
+
+    d->modelFilter->setSubscriptionStateFilterFlags(AccountsFilterModel::HideBlocked);
+
+    KSharedConfigPtr config = KGlobal::config();
+    KConfigGroup guiConfigGroup(config, "GUI");
+    guiConfigGroup.writeEntry("shown_contacts", "unblocked");
+    guiConfigGroup.config()->sync();
+}
+
+void ContactListWidget::onShowBlockedContacts()
+{
+    Q_D(ContactListWidget);
+
+    d->modelFilter->setSubscriptionStateFilterFlags(AccountsFilterModel::ShowOnlyBlocked);
+
+    KSharedConfigPtr config = KGlobal::config();
+    KConfigGroup guiConfigGroup(config, "GUI");
+    guiConfigGroup.writeEntry("shown_contacts", "blocked");
+    guiConfigGroup.config()->sync();
+}
+
 void ContactListWidget::setFilterString(const QString& string)
 {
     Q_D(ContactListWidget);
diff --git a/contact-list-widget.h b/contact-list-widget.h
index 9688c0c..0a66178 100644
--- a/contact-list-widget.h
+++ b/contact-list-widget.h
@@ -56,6 +56,10 @@ public Q_SLOTS:
     void onSwitchToFullView();
     void onSwitchToCompactView();
 
+    void onShowAllContacts();
+    void onShowUnblockedContacts();
+    void onShowBlockedContacts();
+
 private Q_SLOTS:
     void onNewAccountAdded(const Tp::AccountPtr &account);
     void onContactListClicked(const QModelIndex &index);
diff --git a/main-widget.cpp b/main-widget.cpp
index b78cd3e..cb4523e 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -180,6 +180,37 @@ MainWidget::MainWidget(QWidget *parent)
 
     settingsButtonMenu->addMenu(setDelegateTypeMenu);
 
+    KMenu *setBlockedFilterMenu = new KMenu(settingsButtonMenu);
+    setBlockedFilterMenu->setTitle(i18n("Shown Contacts"));
+
+    QActionGroup *blockedFilterGroup = new QActionGroup(this);
+    blockedFilterGroup->setExclusive(true);
+
+    QString shownContacts = guiConfigGroup.readEntry("shown_contacts", "unblocked");
+
+    blockedFilterGroup->addAction(setBlockedFilterMenu->addAction(i18n("Show all contacts"),
+                                                                  m_contactsListView, SLOT(onShowAllContacts())));
+    blockedFilterGroup->actions().last()->setCheckable(true);
+    if (shownContacts == QLatin1String("all")) {
+        blockedFilterGroup->actions().last()->setChecked(true);
+    }
+
+    blockedFilterGroup->addAction(setBlockedFilterMenu->addAction(i18n("Show unblocked contacts"),
+                                                                  m_contactsListView, SLOT(onShowUnblockedContacts())));
+    blockedFilterGroup->actions().last()->setCheckable(true);
+    if (shownContacts == QLatin1String("unblocked")) {
+        blockedFilterGroup->actions().last()->setChecked(true);
+    }
+
+    blockedFilterGroup->addAction(setBlockedFilterMenu->addAction(i18n("Show blocked contacts"),
+                                                                  m_contactsListView, SLOT(onShowBlockedContacts())));
+    blockedFilterGroup->actions().last()->setCheckable(true);
+    if (shownContacts == QLatin1String("blocked")) {
+        blockedFilterGroup->actions().last()->setChecked(true);
+    }
+
+    settingsButtonMenu->addMenu(setBlockedFilterMenu);
+
     if (guiConfigGroup.readEntry("selected_presence_chooser", "global") == QLatin1String("global")) {
 //         //hide account buttons and show global presence
          onUseGlobalPresenceTriggered();

-- 
ktp-contact-list packaging