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

The following commit has been merged in the master branch:
commit eaaf5d1903b7a39a1e63f7e4109aec4f63d5e9b1
Author: Roman Nazarenko <me at jtalk.me>
Date:   Wed Mar 13 00:31:37 2013 +0600

    Excluded KeypadModifier from Send Message action shortcut comparison.
    This fix will allow using keypad keys for message sending.
    
    REVIEW: 109458
---
 lib/chat-text-edit.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/chat-text-edit.cpp b/lib/chat-text-edit.cpp
index 8fb7e13..00c3f47 100644
--- a/lib/chat-text-edit.cpp
+++ b/lib/chat-text-edit.cpp
@@ -146,8 +146,13 @@ void ChatTextEdit::keyPressEvent(QKeyEvent *e)
 bool ChatTextEdit::event(QEvent *e)
 {
     if (e->type() == QEvent::ShortcutOverride) {
+        // Extract key code for shortcut sequence comparison
         QKeyEvent *keyEvent = static_cast<QKeyEvent*>(e);
-        const int key = keyEvent->key() | keyEvent->modifiers();
+        int key = keyEvent->key();
+        if (keyEvent->modifiers() != Qt::KeypadModifier) {
+            // Keypad modifier is not used in KDE shortcuts setup, so, we need to skip it.
+            key |= keyEvent->modifiers();
+        }
         if (m_sendMessageAction->shortcut().contains(key)) {
             // keyPressEvent() handles Control modifier wrong, so we need that thing
             // to be in event().

-- 
ktp-text-ui packaging