diff options
| -rw-r--r-- | components/PasswordDialog.qml | 4 | ||||
| -rw-r--r-- | components/StandardButton.qml | 2 | ||||
| -rw-r--r-- | components/StandardDialog.qml | 5 | ||||
| -rw-r--r-- | main.qml | 5 | ||||
| -rw-r--r-- | pages/AddressBook.qml | 2 |
5 files changed, 10 insertions, 8 deletions
diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index 51fc3913..b90e192b 100644 --- a/components/PasswordDialog.qml +++ b/components/PasswordDialog.qml @@ -89,7 +89,7 @@ Item { Layout.columnSpan: 2 Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter - font.pixelSize: 24 * scaleRatio + font.pixelSize: 18 * scaleRatio font.family: "Arial" color: "#555555" } @@ -165,7 +165,7 @@ Item { shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" pressedColor: "#FF4304" - text: qsTr("Ok") + text: qsTr("Continue") KeyNavigation.tab: cancelButton onClicked: { root.close() diff --git a/components/StandardButton.qml b/components/StandardButton.qml index 0ee722b5..6f714947 100644 --- a/components/StandardButton.qml +++ b/components/StandardButton.qml @@ -43,7 +43,7 @@ Item { signal clicked() // Dynamic label width - Layout.minimumWidth: (label.contentWidth + 10 * scaleRatio) // (label.contentWidth > 80)? label.contentWidth + 20 : 100 + Layout.minimumWidth: (label.contentWidth > 50)? label.contentWidth + 10 : 60 function doClick() { // Android workaround diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index 044c0a5c..84402147 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -97,7 +97,7 @@ Rectangle { Label { id: dialogTitle horizontalAlignment: Text.AlignHCenter - font.pixelSize: 32 * scaleRatio + font.pixelSize: 18 * scaleRatio font.family: "Arial" color: "#555555" } @@ -114,6 +114,7 @@ Rectangle { readOnly: true font.pixelSize: 12 * scaleRatio selectByMouse: false + wrapMode: TextEdit.Wrap MouseArea { anchors.fill: parent @@ -156,7 +157,7 @@ Rectangle { shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" pressedColor: "#FF4304" - text: qsTr("Ok") + text: qsTr("OK") KeyNavigation.tab: cancelButton onClicked: { root.close() @@ -969,7 +969,7 @@ ApplicationWindow { // Confrirmation aka question dialog StandardDialog { - z:10 + z: parent.z + 1 id: transactionConfirmationPopup onAccepted: { close(); @@ -996,8 +996,9 @@ ApplicationWindow { } StandardDialog { - z:11 + z: parent.z + 1 id: confirmationDialog + anchors.fill: parent property var onAcceptedCallback property var onRejectedCallback onAccepted: { diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml index 29a18557..7904c594 100644 --- a/pages/AddressBook.qml +++ b/pages/AddressBook.qml @@ -53,7 +53,7 @@ Rectangle { RowLayout { StandardButton { id: qrfinderButton - text: qsTr("QRCODE") + translationManager.emptyString + text: qsTr("Qr Code") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" |