[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=b287d8e

The following commit has been merged in the master branch:
commit b287d8ee3a06f894169956ef14692f6c368558ea
Author: Roman Nazarenko <me at jtalk.me>
Date:   Mon Apr 8 02:28:04 2013 +0600

    Pressing Escape key when search bar is active now hides search bar even if Escape key is assigned to shortcut.
    BUG: 317984
    Reviewed-by: David Edmundson
---
 lib/chat-search-bar.cpp | 14 ++++++++++++++
 lib/chat-search-bar.h   |  3 +++
 lib/chat-widget.cpp     |  5 -----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/chat-search-bar.cpp b/lib/chat-search-bar.cpp
index a838591..d5ccdf5 100644
--- a/lib/chat-search-bar.cpp
+++ b/lib/chat-search-bar.cpp
@@ -30,6 +30,8 @@
 #include <QHBoxLayout>
 #include <QToolButton>
 
+#include <QtGui/QKeyEvent>
+
 ChatSearchBar::ChatSearchBar(QWidget *parent)
     : QWidget(parent)
     , m_searchInput(new KLineEdit(this))
@@ -155,6 +157,18 @@ void ChatSearchBar::toggleView(bool toggle)
     }
 }
 
+bool ChatSearchBar::event(QEvent *e)
+{
+    if (e->type() == QEvent::ShortcutOverride && static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) {
+        if (isVisible()) {
+            setVisible(false);
+            e->accept();
+            return true;
+        }
+    }
+    return false;
+}
+
 void ChatSearchBar::textChanged(const QString& text)
 {
     // enable/disable next and previous buttons
diff --git a/lib/chat-search-bar.h b/lib/chat-search-bar.h
index 25ba27e..58f7a1a 100644
--- a/lib/chat-search-bar.h
+++ b/lib/chat-search-bar.h
@@ -52,6 +52,9 @@ public Q_SLOTS:
     /** toggle search bar visibility */
     void toggleView(bool toggle);
 
+protected:
+    bool event(QEvent *e);
+
 private Q_SLOTS:
     /** called when user writes in search bar
      * this emits a signal for chat-window with the text to search for
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 612fb87..212680d 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -271,11 +271,6 @@ void ChatWidget::keyPressEvent(QKeyEvent *e)
         return;
     }
 
-    if (e->key() == Qt::Key_Escape && d->ui.searchBar->isVisible()) {
-        d->ui.searchBar->toggleView(false);
-        return;
-    }
-
     if (e->key() == Qt::Key_PageUp ||
         e->key() == Qt::Key_PageDown) {
         d->ui.chatArea->event(e);

-- 
ktp-text-ui packaging