aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2022-06-09 13:54:42 -0500
committerluigi1111 <luigi1111w@gmail.com>2022-06-09 13:54:42 -0500
commit953cb8d30241e52b36fb5a0b6e26718a82c0c77a (patch)
tree3fdb3bffb5d78947f435d9414108089bf042075e
parente1d3cf1b98ef2785f16baf36fb3e59e8d83b4da5 (diff)
parent434ac2182aad844255a2d4ef13a6bfb7e9d20483 (diff)
downloadmonzero-gui-953cb8d30241e52b36fb5a0b6e26718a82c0c77a.tar.gz
monzero-gui-953cb8d30241e52b36fb5a0b6e26718a82c0c77a.tar.xz
monzero-gui-953cb8d30241e52b36fb5a0b6e26718a82c0c77a.zip
Merge pull request #3903
434ac21 WizardCreateDevice1: add Ledger Nano S Plus (selsta)
-rw-r--r--images/ledgerNanoSPlus.pngbin0 -> 31499 bytes
-rw-r--r--qml.qrc1
-rw-r--r--wizard/WizardCreateDevice1.qml16
3 files changed, 16 insertions, 1 deletions
diff --git a/images/ledgerNanoSPlus.png b/images/ledgerNanoSPlus.png
new file mode 100644
index 00000000..9e1dc61b
--- /dev/null
+++ b/images/ledgerNanoSPlus.png
Binary files differ
diff --git a/qml.qrc b/qml.qrc
index 578729ec..ea698a4e 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -264,6 +264,7 @@
<file>components/SuccessfulTxDialog.qml</file>
<file>components/TxConfirmationDialog.qml</file>
<file>images/ledgerNanoS.png</file>
+ <file>images/ledgerNanoSPlus.png</file>
<file>images/ledgerNanoX.png</file>
<file>images/trezor.png</file>
<file>images/trezor@2x.png</file>
diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml
index 4bf54360..82971b88 100644
--- a/wizard/WizardCreateDevice1.qml
+++ b/wizard/WizardCreateDevice1.qml
@@ -52,6 +52,7 @@ Rectangle {
id: deviceNameModel
ListElement { column1: qsTr("Choose your hardware wallet"); column2: "";}
ListElement { column1: "Ledger Nano S"; column2: "Ledger";}
+ ListElement { column1: "Ledger Nano S Plus"; column2: "Ledger";}
ListElement { column1: "Ledger Nano X"; column2: "Ledger";}
ListElement { column1: "Trezor Model T"; column2: "Trezor";}
}
@@ -159,7 +160,20 @@ Rectangle {
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") : ""
+ source: {
+ if (hardwareWalletType == "Trezor") {
+ return "qrc:///images/trezor.png";
+ } else if (hardwareWalletType == "Ledger") {
+ if (ledgerType == "Ledger Nano S") {
+ return "qrc:///images/ledgerNanoS.png";
+ } else if (ledgerType == "Ledger Nano S Plus") {
+ return "qrc:///images/ledgerNanoSPlus.png";
+ } else if (ledgerType == "Ledger Nano X") {
+ return "qrc:///images/ledgerNanoX.png";
+ }
+ }
+ return "";
+ }
z: parent.z + 1
width: parent.width
height: 165