From a5ffdf27e840a8f630f710bf6212affcd83c6e34 Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@ucw.cz>
Date: Tue, 16 Oct 2012 19:36:49 +0200
Subject: [PATCH] brmbarv3 BarKeyboard: Allow keyboard text entry; use in
 ChargeCredit

---
 brmbar3/brmbar-gui-qt4/BarKeyboard.qml  | 11 +++++++++++
 brmbar3/brmbar-gui-qt4/ChargeCredit.qml |  8 +++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/brmbar3/brmbar-gui-qt4/BarKeyboard.qml b/brmbar3/brmbar-gui-qt4/BarKeyboard.qml
index 2d08b36..f0967b1 100644
--- a/brmbar3/brmbar-gui-qt4/BarKeyboard.qml
+++ b/brmbar3/brmbar-gui-qt4/BarKeyboard.qml
@@ -2,6 +2,7 @@ import Qt 4.7
 
 Grid {
     property string keys: ""
+    property string enteredText: ""
     property int gridRows: 0
     property int gridColumns: 0
     property int buttonWidth: 70
@@ -38,4 +39,14 @@ Grid {
             }
         }
     }
+
+    onLetterEntered: { enteredText = enteredText.toString() + letter; }
+    onLetterBackspace: { enteredText = enteredText.toString().replace(/.$/, ''); }
+    Keys.onPressed: {
+	if (event.key == Qt.Key_Backspace) {
+	    enteredText = enteredText.toString().replace(/.$/, '');
+	} else {
+	    enteredText = enteredText.toString() + event.text;
+	}
+    }
 }
diff --git a/brmbar3/brmbar-gui-qt4/ChargeCredit.qml b/brmbar3/brmbar-gui-qt4/ChargeCredit.qml
index 1e90715..a65a241 100644
--- a/brmbar3/brmbar-gui-qt4/ChargeCredit.qml
+++ b/brmbar3/brmbar-gui-qt4/ChargeCredit.qml
@@ -8,7 +8,7 @@ Item {
 
     property variant username: ""
     property variant userdbid: ""
-    property variant amount: ""
+    property variant amount: credit_pad.enteredText
 
     Text {
         id: item_name
@@ -49,12 +49,14 @@ Item {
 	x: 65
 	y: 195
 	visible: parent.username != ""
-	onLetterEntered: { amount = amount.toString() + letter; }
-	onLetterBackspace: { amount = amount.toString().replace(/.$/, ''); }
+	focus: parent.username != ""
+	Keys.onReturnPressed: { charge_button.buttonClick() }
+	Keys.onEscapePressed: { cancel.buttonClick() }
     }
 
     BarcodeInput {
         color: "#00ff00" /* just for debugging */
+	focus: parent.username == ""
         onAccepted: {
             var acct = shop.barcodeInput(text)
             text = ""