From 4983fea31e181e5d23e8e5cc0ef735b5a665a713 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Thu, 18 Oct 2012 19:23:22 +0200 Subject: [PATCH] Slightly improve (and correct) credit charging UI --- brmbar3/brmbar-gui-qt4/ChargeCredit.qml | 4 ++-- brmbar3/brmbar-gui-qt4/MainPage.qml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/brmbar3/brmbar-gui-qt4/ChargeCredit.qml b/brmbar3/brmbar-gui-qt4/ChargeCredit.qml index aa71e25..07f2bdc 100644 --- a/brmbar3/brmbar-gui-qt4/ChargeCredit.qml +++ b/brmbar3/brmbar-gui-qt4/ChargeCredit.qml @@ -17,7 +17,7 @@ Item { width: 537 height: 80 color: "#ffffff" - text: parent.username ? parent.username : "Credit charge" + text: parent.username ? parent.username : "" wrapMode: Text.WordWrap horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter @@ -41,7 +41,7 @@ Item { x: 65 y: 430 hint_goal: (parent.username ? "" : parent.amount ? "Charge user:" : "Charge credit:") - hint_action: (parent.username ? (parent.amount ? "" : "(or scan barcode now)") : "Scan barcode now") + hint_action: (parent.username ? "" : "Scan barcode now") } BarNumPad { diff --git a/brmbar3/brmbar-gui-qt4/MainPage.qml b/brmbar3/brmbar-gui-qt4/MainPage.qml index cb4f980..063bdc8 100644 --- a/brmbar3/brmbar-gui-qt4/MainPage.qml +++ b/brmbar3/brmbar-gui-qt4/MainPage.qml @@ -39,7 +39,7 @@ Item { x: 599 y: 430 width: 360 - text: "Credit" + text: "Charge" onButtonClick: { loadPage("ChargeCredit") }