diff options
| -rw-r--r-- | components/StandardButton.qml | 4 | ||||
| -rw-r--r-- | pages/AddressBook.qml | 53 | ||||
| -rw-r--r-- | pages/Settings.qml | 2 | ||||
| -rw-r--r-- | pages/Transfer.qml | 41 |
4 files changed, 54 insertions, 46 deletions
diff --git a/components/StandardButton.qml b/components/StandardButton.qml index f1253cd9..bb2f4d94 100644 --- a/components/StandardButton.qml +++ b/components/StandardButton.qml @@ -43,8 +43,8 @@ Item { signal clicked() // Dynamic label width - width: label.contentWidth + 20 - Layout.minimumWidth: 100 + Layout.minimumWidth: (label.contentWidth > 100)? label.contentWidth + 20 : 100 + Rectangle { diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml index 88b0d701..2813099e 100644 --- a/pages/AddressBook.qml +++ b/pages/AddressBook.qml @@ -27,6 +27,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import QtQuick 2.0 +import QtQuick.Layouts 1.1 import "../components" import moneroComponents.AddressBook 1.0 import moneroComponents.AddressBookModel 1.0 @@ -138,42 +139,46 @@ Rectangle { placeholderText: qsTr("Give this entry a name or description") + translationManager.emptyString } - StandardButton { + + RowLayout { id: addButton anchors.left: parent.left anchors.top: descriptionLine.bottom anchors.leftMargin: 17 anchors.topMargin: 17 - width: 60 - shadowReleasedColor: "#FF4304" - shadowPressedColor: "#B32D00" - releasedColor: "#FF6C3C" - pressedColor: "#FF4304" - text: qsTr("Add") + translationManager.emptyString - enabled: checkInformation(addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet) + StandardButton { + shadowReleasedColor: "#FF4304" + shadowPressedColor: "#B32D00" + releasedColor: "#FF6C3C" + pressedColor: "#FF4304" + text: qsTr("Add") + translationManager.emptyString + enabled: checkInformation(addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet) - onClicked: { - if (!currentWallet.addressBook.addRow(addressLine.text.trim(), paymentIdLine.text.trim(), descriptionLine.text)) { - informationPopup.title = qsTr("Error") + translationManager.emptyString; - // TODO: check currentWallet.addressBook.errorString() instead. - if(currentWallet.addressBook.errorCode() === AddressBook.Invalid_Address) - informationPopup.text = qsTr("Invalid address") + translationManager.emptyString - else if(currentWallet.addressBook.errorCode() === AddressBook.Invalid_Payment_Id) - informationPopup.text = currentWallet.addressBook.errorString() - else - informationPopup.text = qsTr("Can't create entry") + translationManager.emptyString + onClicked: { + if (!currentWallet.addressBook.addRow(addressLine.text.trim(), paymentIdLine.text.trim(), descriptionLine.text)) { + informationPopup.title = qsTr("Error") + translationManager.emptyString; + // TODO: check currentWallet.addressBook.errorString() instead. + if(currentWallet.addressBook.errorCode() === AddressBook.Invalid_Address) + informationPopup.text = qsTr("Invalid address") + translationManager.emptyString + else if(currentWallet.addressBook.errorCode() === AddressBook.Invalid_Payment_Id) + informationPopup.text = currentWallet.addressBook.errorString() + else + informationPopup.text = qsTr("Can't create entry") + translationManager.emptyString - informationPopup.onCloseCallback = null - informationPopup.open(); - } else { - addressLine.text = ""; - paymentIdLine.text = ""; - descriptionLine.text = ""; + informationPopup.onCloseCallback = null + informationPopup.open(); + } else { + addressLine.text = ""; + paymentIdLine.text = ""; + descriptionLine.text = ""; + } } } } + + Item { id: expandItem property bool expanded: false diff --git a/pages/Settings.qml b/pages/Settings.qml index 10ccb64a..1d6a4ca8 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -84,7 +84,6 @@ Rectangle { RowLayout { StandardButton { id: closeWalletButton - width: 100 text: qsTr("Close wallet") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" @@ -118,7 +117,6 @@ Rectangle { releasedColor: "#FF6C3C" pressedColor: "#FF4304" text: qsTr("Show seed") + translationManager.emptyString - Layout.alignment: Qt.AlignRight onClicked: { settingsPasswordDialog.open(); } diff --git a/pages/Transfer.qml b/pages/Transfer.qml index f0341a03..91ece694 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -375,31 +375,36 @@ Rectangle { return amount_ok && address_ok && payment_id_ok } - StandardButton { - id: sendButton + + RowLayout { anchors.left: parent.left anchors.top: descriptionLine.bottom anchors.leftMargin: 17 anchors.topMargin: 17 - width: 60 - text: qsTr("Send") + translationManager.emptyString - shadowReleasedColor: "#FF4304" - shadowPressedColor: "#B32D00" - releasedColor: "#FF6C3C" - pressedColor: "#FF4304" - enabled : !appWindow.viewOnly && pageRoot.checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet) - onClicked: { - console.log("Transfer: paymentClicked") - var priority = priorityModel.get(priorityDropdown.currentIndex).priority - console.log("priority: " + priority) - console.log("amount: " + amountLine.text) - addressLine.text = addressLine.text.trim() - paymentIdLine.text = paymentIdLine.text.trim() - root.paymentClicked(addressLine.text, paymentIdLine.text, amountLine.text, scaleValueToMixinCount(privacyLevelItem.fillLevel), - priority, descriptionLine.text) + StandardButton { + id: sendButton + text: qsTr("Send") + translationManager.emptyString + shadowReleasedColor: "#FF4304" + shadowPressedColor: "#B32D00" + releasedColor: "#FF6C3C" + pressedColor: "#FF4304" + enabled : !appWindow.viewOnly && pageRoot.checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet) + onClicked: { + console.log("Transfer: paymentClicked") + var priority = priorityModel.get(priorityDropdown.currentIndex).priority + console.log("priority: " + priority) + console.log("amount: " + amountLine.text) + addressLine.text = addressLine.text.trim() + paymentIdLine.text = paymentIdLine.text.trim() + root.paymentClicked(addressLine.text, paymentIdLine.text, amountLine.text, scaleValueToMixinCount(privacyLevelItem.fillLevel), + priority, descriptionLine.text) + + } } } + + } // pageRoot Rectangle { |