This is a simple sales tracker:
" + + "Click Generate to create a random payment id for a new customer
" + + "Let your customer scan that QR code to make a payment (if that customer has software which " + + "supports QR code scanning).
" + + "This page will automatically scan the blockchain and the tx pool " + + "for incoming transactions using this QR code. If you input an amount, it will also check " + + "that incoming transactions total up to that amount.
" + + "It's up to you whether to accept unconfirmed transactions or not. It is likely they'll be " + + "confirmed in short order, but there is still a possibility they might not, so for larger " + + "values you may want to wait for one or more confirmation(s)." + ) + trackingHowToUseDialog.icon = StandardIcon.Information + trackingHowToUseDialog.open() } } + + // @TODO: CLEAR BUTTON should be present as labelButton +// StandardButton { +// id: clearPaymentId +// enabled: !!paymentIdLine.text +// shadowReleasedColor: "#FF4304" +// shadowPressedColor: "#B32D00" +// releasedColor: "#FF6C3C" +// pressedColor: "#FF4304" +// text: qsTr("Clear") + translationManager.emptyString; +// onClicked: updatePaymentId("") +// } } ColumnLayout { - id: amountRow - Label { - id: amountLabel - text: qsTr("Amount") + translationManager.emptyString - width: mainLayout.labelWidth + id: integratedAddressRow + + LineEditMulti { + id: integratedAddressLine + inputLabelText: qsTr("Integrated address") + translationManager.emptyString + placeholderText: qsTr("Generate payment ID for integrated address") + translationManager.emptyString + readOnly: true + Layout.fillWidth: true + copyButton: true } + } + GridLayout { + columns: (isMobile)? 1 : 2 + Layout.fillWidth: true + columnSpacing: 32 - LineEdit { - id: amountLine -// fontSize: mainLayout.lineEditFontSize - placeholderText: qsTr("Amount to receive") + translationManager.emptyString - readOnly: false - width: mainLayout.editWidth + ColumnLayout { Layout.fillWidth: true - validator: DoubleValidator { - bottom: 0.0 - top: 18446744.073709551615 - decimals: 12 - notation: DoubleValidator.StandardNotation - locale: "C" + + RowLayout { + Layout.fillWidth: true + Layout.minimumWidth: 200 + LineEdit { + id: amountLine + placeholderText: qsTr("Amount to receive") + translationManager.emptyString + readOnly: false + inlineIcon: true + labelText: qsTr("Amount") + Layout.fillWidth: true + validator: DoubleValidator { + bottom: 0.0 + top: 18446744.073709551615 + decimals: 12 + notation: DoubleValidator.StandardNotation + locale: "C" +>>>>>>> Receive page development + } + inputDialog.onRejectedCallback = null; + inputDialog.open() + } } } + ColumnLayout { + Layout.fillWidth: true + } } RowLayout { id: trackingRow + Layout.fillWidth: true visible: !isAndroid && !isIOS +<<<<<<< HEAD Label { id: trackingLabel textFormat: Text.RichText @@ -288,16 +368,39 @@ Rectangle { trackingHowToUseDialog.open() } } +======= +>>>>>>> Receive page development TextEdit { id: trackingLine anchors.top: trackingRow.top + horizontalAlignment: TextInput.AlignLeft + Layout.fillWidth: true textFormat: Text.RichText text: "" readOnly: true - width: mainLayout.editWidth - Layout.fillWidth: true selectByMouse: true + color: Style.defaultFontColor + font.family: Style.fontRegular.name + font.pixelSize: 16 * scaleRatio + leftPadding: 12 * scaleRatio + rightPadding: 12 * scaleRatio + topPadding: 8 * scaleRatio + bottomPadding: 8 * scaleRatio + + Rectangle { + color: "transparent" + border.width: 1 + border.color: { + if(trackingLine.activeFocus){ + return Qt.rgba(255, 255, 255, 0.35); + } else { + return Qt.rgba(255, 255, 255, 0.25); + } + } + radius: 4 + anchors.fill: parent + } } } diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 80604763..ee0d7aa4 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -113,19 +113,19 @@ Rectangle { ColumnLayout { id: pageRoot - anchors.margins: (isMobile)? 17 : 40 + anchors.margins: (isMobile)? 17 : 20 anchors.topMargin: 40 * scaleRatio anchors.left: parent.left anchors.top: parent.top anchors.right: parent.right - spacing: 20 * scaleRatio + spacing: 26 * scaleRatio GridLayout { columns: (isMobile)? 1 : 2 Layout.fillWidth: true - columnSpacing: 48 + columnSpacing: 32 ColumnLayout { Layout.fillWidth: true @@ -198,97 +198,169 @@ Rectangle { id: addressLineRow Layout.fillWidth: true - ColumnLayout { - Rectangle{ - id: inputLabelRect - color: "transparent" - Layout.fillWidth: true - height: inputLabel.height + 10 - - Text { - id: inputLabel - anchors.top: parent.top - anchors.left: parent.left - font.family: Style.fontRegular.name - font.pixelSize: 16 * scaleRatio - font.bold: labelFontBold - textFormat: Text.RichText - color: Style.defaultFontColor - onLinkActivated: { appWindow.showPageRequest("AddressBook") } - text: qsTr("\ - Address ( Address book )") - + translationManager.emptyString - } - - Rectangle{ - id: copyButton - color: "#808080" - radius: 3 - height: 20 - width: copyButtonText.width + 8 - anchors.right: parent.right - visible: addressLine.text !== "" - - Text { - id: copyButtonText - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - font.family: Style.fontRegular.name - font.pixelSize: 12 - font.bold: true - text: qsTr("Copy") + translationManager.emptyString - color: "black" - } - - MouseArea { - cursorShape: Qt.PointingHandCursor - anchors.fill: parent - hoverEnabled: true - onClicked: { - if (addressLine.text.length > 0) { - console.log(addressLine.text + " copied to clipboard"); - clipboard.setText(addressLine.text); - appWindow.showStatusMessage(qsTr("Address copied to clipboard"), 3); - } - } - onEntered: { - copyButton.color = "#707070"; - copyButtonText.opacity = 0.8; - } - onExited: { - copyButtonText.opacity = 1.0; - copyButton.color = "#808080"; - } - } - } - } - - InputMulti { - id: addressLine - readOnly: false - addressValidation: true - anchors.top: inputLabelRect.bottom - placeholderText: "4..." - Layout.fillWidth: true - - Rectangle { - color: "transparent" - border.width: 1 - border.color: { - if(addressLine.error && addressLine.text !== ""){ - return Qt.rgba(255, 0, 0, 0.45); - } else if(addressLine.activeFocus){ - return Qt.rgba(255, 255, 255, 0.35); + LineEditMulti{ + id: addressLine + spacing: 0 +// @TODO: +// - fix wrong copy @ receive.qml +// - resolve button click @ multiline @ transfer.qml + + inputLabelText: qsTr("\ + Address ( Address book )") + + translationManager.emptyString + labelButtonText: qsTr("Resolve") + translationManager.emptyString + placeholderText: "4.." + onInputLabelLinkActivated: { appWindow.showPageRequest("AddressBook") } + onLabelButtonClicked: { + var result = walletManager.resolveOpenAlias(addressLine.text) + if (result) { + var parts = result.split("|") + if (parts.length == 2) { + var address_ok = walletManager.addressValid(parts[1], appWindow.persistentSettings.testnet) + if (parts[0] === "true") { + if (address_ok) { + addressLine.text = parts[1] + addressLine.cursorPosition = 0 + } + else + oa_message(qsTr("No valid address found at this OpenAlias address")) + } else if (parts[0] === "false") { + if (address_ok) { + addressLine.text = parts[1] + addressLine.cursorPosition = 0 + oa_message(qsTr("Address found, but the DNSSEC signatures could not be verified, so this address may be spoofed")) } else { - return Qt.rgba(255, 255, 255, 0.25); + oa_message(qsTr("No valid address found at this OpenAlias address, but the DNSSEC signatures could not be verified, so this may be spoofed")) } + } else { + oa_message(qsTr("Internal error")) } - radius: 4 - anchors.fill: parent + } else { + oa_message(qsTr("Internal error")) + } + } else { + oa_message(qsTr("No address found")) } } } +// ColumnLayout { +// spacing: 0 +// Rectangle{ +// id: inputLabelRect +// color: "transparent" +// Layout.fillWidth: true +// height: inputLabel.height + 10 + +// Text { +// id: inputLabel +// anchors.top: parent.top +// anchors.left: parent.left +// font.family: Style.fontRegular.name +// font.pixelSize: 16 * scaleRatio +// font.bold: labelFontBold +// textFormat: Text.RichText +// color: Style.defaultFontColor +// onLinkActivated: { appWindow.showPageRequest("AddressBook") } +// text: qsTr("\ +// Address ( Address book )") +// + translationManager.emptyString +// } + +// Rectangle{ +// id: resolveButton +// color: "#808080" +// radius: 3 +// height: 20 +// width: resolveButtonText.width + 8 +// anchors.right: copyButton.left +// anchors.rightMargin: 6 +// visible: isValidOpenAliasAddress(addressLine.text) + +// Text { +// id: resolveButtonText +// anchors.verticalCenter: parent.verticalCenter +// anchors.horizontalCenter: parent.horizontalCenter +// font.family: Style.fontRegular.name +// font.pixelSize: 12 +// font.bold: true +// text: qsTr("Resolve") + translationManager.emptyString +// color: "black" +// } + +// MouseArea { +// cursorShape: Qt.PointingHandCursor +// anchors.fill: parent +// hoverEnabled: true +// onClicked: { +// var result = walletManager.resolveOpenAlias(addressLine.text) +// if (result) { +// var parts = result.split("|") +// if (parts.length == 2) { +// var address_ok = walletManager.addressValid(parts[1], appWindow.persistentSettings.testnet) +// if (parts[0] === "true") { +// if (address_ok) { +// addressLine.text = parts[1] +// addressLine.cursorPosition = 0 +// } +// else +// oa_message(qsTr("No valid address found at this OpenAlias address")) +// } else if (parts[0] === "false") { +// if (address_ok) { +// addressLine.text = parts[1] +// addressLine.cursorPosition = 0 +// oa_message(qsTr("Address found, but the DNSSEC signatures could not be verified, so this address may be spoofed")) +// } else { +// oa_message(qsTr("No valid address found at this OpenAlias address, but the DNSSEC signatures could not be verified, so this may be spoofed")) +// } +// } else { +// oa_message(qsTr("Internal error")) +// } +// } else { +// oa_message(qsTr("Internal error")) +// } +// } else { +// oa_message(qsTr("No address found")) +// } +// } +// onEntered: { +// resolveButton.color = "#707070"; +// resolveButtonText.opacity = 0.8; +// } +// onExited: { +// resolveButtonText.opacity = 1.0; +// resolveButton.color = "#808080"; +// } +// } +// } +// } + +// InputMulti { +// id: addressLine +// readOnly: false +// addressValidation: true +// anchors.top: inputLabelRect.bottom +// placeholderText: "4..." +// Layout.fillWidth: true + +// Rectangle { +// color: "transparent" +// border.width: 1 +// border.color: { +// if(addressLine.error && addressLine.text !== ""){ +// return Qt.rgba(255, 0, 0, 0.45); +// } else if(addressLine.activeFocus){ +// return Qt.rgba(255, 255, 255, 0.35); +// } else { +// return Qt.rgba(255, 255, 255, 0.25); +// } +// } +// radius: 4 +// anchors.fill: parent +// } +// } +// } + StandardButton { id: qrfinderButton text: qsTr("QR Code") + translationManager.emptyString @@ -374,9 +446,9 @@ Rectangle { anchors.top: pageRoot.bottom anchors.left: parent.left anchors.right: parent.right - anchors.margins: (isMobile)? 17 : 40 + anchors.margins: (isMobile)? 17 : 20 anchors.topMargin: 40 * scaleRatio - spacing: 20 * scaleRatio + spacing: 26 * scaleRatio enabled: !viewOnly || pageRoot.enabled RowLayout { diff --git a/qml.qrc b/qml.qrc index 18aa7da3..bb32bfbf 100644 --- a/qml.qrc +++ b/qml.qrc @@ -192,5 +192,7 @@