[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=907b9d1

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

    Enter key is now an alternate shortcut for Send Message action.
    
    Reviewed-by: Martin Klapetek
---
 app/chat-window.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 410c86f..02a390e 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -695,7 +695,10 @@ void ChatWindow::setupCustomActions()
     connect(addEmoticonAction, SIGNAL(emoticonActivated(QString)), this, SLOT(onAddEmoticon(QString)) );
 
     KAction *sendMessage = new KAction(i18n("Send message"), this);
-    sendMessage->setShortcut(QKeySequence::InsertParagraphSeparator, KAction::DefaultShortcut);
+    sendMessage->setShortcuts(
+                // Setting default shortcuts. Return will be a primary one, and Enter (on keypad) - alternate.
+                QList<QKeySequence>() << QKeySequence(Qt::Key_Return) << QKeySequence(Qt::Key_Enter),
+                KAction::DefaultShortcut);
     sendMessage->setShortcutConfigurable(true);
     connect(sendMessage, SIGNAL(triggered()), SLOT(sendCurrentTabMessage()));
 

-- 
ktp-text-ui packaging