Merge lp:~rpadovani/telegram-app/sendByEnter into lp:telegram-app/app-dev

[Riccardo Padovani]

Added option to send messages using enter button

Added option to send messages using enter button

[Michał Karnicki (karni)]

Minor style in-line comments. Other than that, very nice!

review: Needs Fixing

[lp:~rpadovani/telegram-app/sendByEnter]

137. By Riccardo Padovani on 2014-10-23

Code style improvements

[Riccardo Padovani (rpadovani)]

Done

[Michał Karnicki (karni)]

review: Approve

=== modified file 'telegram.qml'
--- telegram.qml	2014-10-21 14:03:09 +0000
+++ telegram.qml	2014-10-23 12:28:41 +0000
@@ -227,6 +227,13 @@
         property bool promptForPush: true
     }
 
+    Settings {
+        id: preferencesSettings
+        category: "preferences"
+
+        property bool sendByEnter: false
+    }
+
     Loader {
         id: pushClientLoader
         active: false
 
=== modified file 'ui/DialogPage.qml'
--- ui/DialogPage.qml	2014-10-17 13:11:56 +0000
+++ ui/DialogPage.qml	2014-10-23 12:28:41 +0000
@@ -104,8 +104,6 @@
 
             color: "white"
 
-            // Add button for emoji here
-
             TextArea {
                 id: message
                 anchors {
@@ -124,6 +122,16 @@
 
                 autoSize: true
                 maximumLineCount: 4
+                Keys.onReturnPressed: {
+                    if (preferencesSettings.sendByEnter && isConnected) {
+                        Qt.inputMethod.commit();
+                        if (message.text.length === 0) return;
+
+                        sendMessage(message.text);
+                    } else {
+                        event.accepted = false;
+                    }
+                }
             }
 
             Item {
 
=== modified file 'ui/SettingsPage.qml'
--- ui/SettingsPage.qml	2014-10-15 17:42:46 +0000
+++ ui/SettingsPage.qml	2014-10-23 12:28:41 +0000
@@ -71,6 +71,26 @@
         }
 
         ListItem.Header {
+            text: i18n.tr("Messages")
+        }
+
+        ListItem.Standard {
+            text: i18n.tr("Send by Enter")
+
+            Switch {
+                id: checkbox
+                checked: preferencesSettings.sendByEnter
+                anchors {
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+
+                onCheckedChanged: preferencesSettings.sendByEnter = checked;
+            }
+        }
+
+        ListItem.Header {
             text: i18n.tr("Support")
         }