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

The following commit has been merged in the master branch:
commit e0e5d290c5468ca66533907689de61310447ed86
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Jun 13 21:19:17 2013 +0200

    Automatically hide the filter bar after an action has been started
    
    As this makes repeatable actions harder to execute, this patch is mainly
    for testing purposes, it may be reverted before 0.7, see the bug for
    details
    
    CCBUG: 320708
    FIXED-IN: 0.7.0
    REVIEW: 110998
---
 contact-list-widget.cpp | 12 ++++++++++++
 contact-list-widget.h   |  2 +-
 filter-bar.cpp          |  6 ++++++
 filter-bar.h            |  3 +++
 main-widget.cpp         |  3 +++
 5 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 526335f..ba18b18 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -335,6 +335,8 @@ void ContactListWidget::startTextChannel(const Tp::AccountPtr &account, const Tp
     Tp::PendingOperation *op = KTp::Actions::startChat(account, contact, true);
     connect(op, SIGNAL(finished(Tp::PendingOperation*)),
             SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
+
+    Q_EMIT actionStarted();
 }
 
 void ContactListWidget::startAudioChannel(const Tp::AccountPtr &account, const Tp::ContactPtr &contact)
@@ -342,6 +344,8 @@ void ContactListWidget::startAudioChannel(const Tp::AccountPtr &account, const T
     Tp::PendingOperation *op = KTp::Actions::startAudioCall(account, contact);
     connect(op, SIGNAL(finished(Tp::PendingOperation*)),
             SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
+
+    Q_EMIT actionStarted();
 }
 
 void ContactListWidget::startVideoChannel(const Tp::AccountPtr &account, const Tp::ContactPtr &contact)
@@ -349,6 +353,8 @@ void ContactListWidget::startVideoChannel(const Tp::AccountPtr &account, const T
     Tp::PendingOperation *op = KTp::Actions::startAudioVideoCall(account, contact);
     connect(op, SIGNAL(finished(Tp::PendingOperation*)),
             SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
+
+    Q_EMIT actionStarted();
 }
 
 void ContactListWidget::startDesktopSharing(const Tp::AccountPtr &account, const Tp::ContactPtr &contact)
@@ -356,12 +362,16 @@ void ContactListWidget::startDesktopSharing(const Tp::AccountPtr &account, const
     Tp::PendingOperation *op = KTp::Actions::startDesktopSharing(account, contact);
     connect(op, SIGNAL(finished(Tp::PendingOperation*)),
             SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
+
+    Q_EMIT actionStarted();
 }
 
 void ContactListWidget::startLogViewer(const Tp::AccountPtr &account, const Tp::ContactPtr &contact)
 {
     //log viewer is not a Tp handler so does not return a pending operation
     KTp::Actions::openLogViewer(account, contact);
+
+    Q_EMIT actionStarted();
 }
 
 void ContactListWidget::startFileTransferChannel(const Tp::AccountPtr &account, const Tp::ContactPtr &contact)
@@ -389,6 +399,8 @@ void ContactListWidget::requestFileTransferChannels(const Tp::AccountPtr &accoun
         connect(op, SIGNAL(finished(Tp::PendingOperation*)),
                 SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
     }
+
+    Q_EMIT actionStarted();
 }
 
 void ContactListWidget::onNewGroupModelItemsInserted(const QModelIndex& index, int start, int end)
diff --git a/contact-list-widget.h b/contact-list-widget.h
index ab2191c..0ab5449 100644
--- a/contact-list-widget.h
+++ b/contact-list-widget.h
@@ -77,7 +77,7 @@ Q_SIGNALS:
     void enableOverlays(bool);
     void accountManagerReady(Tp::PendingOperation* op);
     void genericOperationFinished(Tp::PendingOperation* op);
-
+    void actionStarted();
 
 protected:
     void setDropIndicatorRect(const QRect &rect);
diff --git a/filter-bar.cpp b/filter-bar.cpp
index 0144fcb..d6e25d4 100644
--- a/filter-bar.cpp
+++ b/filter-bar.cpp
@@ -74,6 +74,12 @@ void FilterBar::clear()
     m_filterInput->clear();
 }
 
+void FilterBar::hide()
+{
+    clear();
+    QWidget::hide();
+}
+
 void FilterBar::showEvent(QShowEvent* event)
 {
     if (!event->spontaneous()) {
diff --git a/filter-bar.h b/filter-bar.h
index 4e58dda..01ebf12 100644
--- a/filter-bar.h
+++ b/filter-bar.h
@@ -47,6 +47,9 @@ public slots:
     /** Clears the input field. */
     void clear();
 
+    /** Hides and clears the input field */
+    void hide();
+
 signals:
     /**
      * Signal that reports the name filter has been
diff --git a/main-widget.cpp b/main-widget.cpp
index 3ddb32d..3f7db3e 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -171,6 +171,9 @@ MainWidget::MainWidget(QWidget *parent)
     connect(m_contactsListView, SIGNAL(genericOperationFinished(Tp::PendingOperation*)),
             this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 
+    connect(m_contactsListView, SIGNAL(actionStarted()),
+            m_filterBar, SLOT(hide()));
+
     bool useGroups = guiConfigGroup.readEntry("use_groups", true);
     m_groupContactsAction->setChecked(useGroups);
     m_groupContactsAction->setActive(useGroups);

-- 
ktp-contact-list packaging