github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-11-28 09:31:37 +01:00
Code Releases Activity

Merge pull request #3618

Browse Source 
5234570 WizardCreateDevice1: display images; differentiate Ledger Nano X and S; add label to dropdown (rating89us)
This commit is contained in:
luigi1111 2021-08-26 21:19:11 -04:00
commit 55a262b892
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
6 changed files with 84 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
images/ledgerNanoS.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
images/ledgerNanoX.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
images/trezor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 72 KiB

BIN
images/trezor@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 KiB

4
qml.qrc
View File

@ -252,5 +252,9 @@
<file>images/success@2x.png</file>
<file>components/SuccessfulTxDialog.qml</file>
<file>components/TxConfirmationDialog.qml</file>
<file>images/ledgerNanoS.png</file>
<file>images/ledgerNanoX.png</file>
<file>images/trezor.png</file>
<file>images/trezor@2x.png</file>
</qresource>
</RCC>

113
wizard/WizardCreateDevice1.qml
View File

@ -45,11 +45,14 @@ Rectangle {
property string viewName: "wizardCreateDevice1"
property var deviceName: deviceNameModel.get(deviceNameDropdown.currentIndex).column2
property var ledgerType: deviceName == "Ledger" ? deviceNameModel.get(deviceNameDropdown.currentIndex).column1 : null
property var hardwareWalletType: wizardCreateDevice1.deviceName;
ListModel {
id: deviceNameModel
ListElement { column1: qsTr("Choose your hardware device"); column2: "";}
ListElement { column1: "Ledger Nano S/X"; column2: "Ledger";}
ListElement { column1: qsTr("Choose your hardware wallet"); column2: "";}
ListElement { column1: "Ledger Nano S"; column2: "Ledger";}
ListElement { column1: "Ledger Nano X"; column2: "Ledger";}
ListElement { column1: "Trezor Model T"; column2: "Trezor";}
}
@ -78,44 +81,88 @@ Rectangle {
id: walletInput
}
ColumnLayout {
RowLayout {
id: mainRow
spacing: 0
Layout.topMargin: -10
Layout.fillWidth: true
MoneroComponents.StandardDropdown {
id: deviceNameDropdown
dataModel: deviceNameModel
ColumnLayout {
id: leftColumn
Layout.fillWidth: true
Layout.topMargin: 0
z: 3
}
Layout.alignment: Qt.AlignTop
MoneroComponents.RadioButton {
id: newDeviceWallet
Layout.topMargin: 20
text: qsTr("Create a new wallet from device.") + translationManager.emptyString
fontSize: 16
checked: true
onClicked: {
checked = true;
restoreDeviceWallet.checked = false;
wizardController.walletOptionsDeviceIsRestore = false;
}
}
MoneroComponents.TextPlain {
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14
color: MoneroComponents.Style.defaultFontColor
wrapMode: Text.Wrap
Layout.fillWidth: true
text: qsTr("Hardware wallet model")
}
MoneroComponents.RadioButton {
id: restoreDeviceWallet
Layout.topMargin: 10
text: qsTr("Restore a wallet from device. Use this if you used your hardware wallet before.") + translationManager.emptyString
fontSize: 16
checked: false
onClicked: {
checked = true;
newDeviceWallet.checked = false;
wizardController.walletOptionsDeviceIsRestore = true;
}
}
MoneroComponents.StandardDropdown {
id: deviceNameDropdown
dataModel: deviceNameModel
Layout.preferredWidth: 450
Layout.topMargin: 6
z: 3
}
MoneroComponents.RadioButton {
id: newDeviceWallet
Layout.topMargin: 20
text: qsTr("Create a new wallet from device.") + translationManager.emptyString
fontSize: 16
checked: true
onClicked: {
checked = true;
restoreDeviceWallet.checked = false;
wizardController.walletOptionsDeviceIsRestore = false;
}
}
MoneroComponents.RadioButton {
id: restoreDeviceWallet
Layout.topMargin: 10
text: qsTr("Restore a wallet from device. Use this if you used your hardware wallet before.") + translationManager.emptyString
fontSize: 16
checked: false
onClicked: {
checked = true;
newDeviceWallet.checked = false;
wizardController.walletOptionsDeviceIsRestore = true;
}
}
}
ColumnLayout {
id: rightColumn
Layout.alignment: Qt.AlignTop
Layout.preferredWidth: 305
Layout.minimumWidth: 120
Layout.preferredHeight: 165
Layout.maximumHeight: 165
Layout.leftMargin: 10
Layout.rightMargin: 10
Rectangle {
color: "transparent"
Layout.fillWidth: true
Layout.fillHeight: true
Layout.topMargin: 0
Image {
Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
source: hardwareWalletType == "Trezor" ? "qrc:///images/trezor.png" : hardwareWalletType == "Ledger" ? (ledgerType == "Ledger Nano S" ? "qrc:///images/ledgerNanoS.png" : "qrc:///images/ledgerNanoX.png") : ""
z: parent.z + 1
width: parent.width
height: 165
fillMode: Image.PreserveAspectFit
mipmap: true
}
}
}
}
ColumnLayout {