[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:13:48 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=6bc2631
The following commit has been merged in the master branch:
commit 6bc2631f372e514522fd0a75b80bfab87ce792ca
Author: Sven Brauch <svenbrauch at googlemail.com>
Date: Thu Aug 29 18:39:04 2013 +0200
set the search action to unchecked when the search widget is hidden
Reviewed-by: Dan Vrátil
---
main-widget.cpp | 22 ++++++++++++++--------
main-widget.h | 1 +
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/main-widget.cpp b/main-widget.cpp
index 88cc868..e9129a7 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -126,7 +126,7 @@ MainWidget::MainWidget(QWidget *parent)
this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
connect(m_contactsListView, SIGNAL(actionStarted()),
- m_filterBar, SLOT(hide()));
+ this, SLOT(hideSearchWidget()));
bool useGroups = guiConfigGroup.readEntry("use_groups", true);
m_groupContactsAction->setChecked(useGroups);
@@ -365,13 +365,19 @@ void MainWidget::onUsePerAccountPresenceTriggered()
void MainWidget::toggleSearchWidget(bool show)
{
- if(show) {
- m_filterBar->show();
- } else {
- m_contactsListView->setFilterString(QString());
- m_filterBar->clear();
- m_filterBar->hide();
- }
+ m_searchContactAction->setChecked(show);
+ if(show) {
+ m_filterBar->show();
+ } else {
+ m_contactsListView->setFilterString(QString());
+ m_filterBar->clear();
+ m_filterBar->hide();
+ }
+}
+
+void MainWidget::hideSearchWidget()
+{
+ toggleSearchWidget(false);
}
void MainWidget::setupGlobalMenu()
diff --git a/main-widget.h b/main-widget.h
index 8dab6e0..7ec22a0 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -81,6 +81,7 @@ public Q_SLOTS:
private Q_SLOTS:
void toggleSearchWidget(bool show);
+ void hideSearchWidget();
void onAccountManagerReady(Tp::PendingOperation* op);
void onAddContactRequest();
void onUseGlobalPresenceTriggered();
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list