aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2024-01-18 18:18:53 -0500
committerluigi1111 <luigi1111w@gmail.com>2024-01-18 18:18:53 -0500
commitdf4f68fbf297478450406f01a7e41b32ce4f5628 (patch)
tree4e5be112d1521dcb39d1bbf7a956e4f9c97450b7
parent1cc631d265770eb8bf3041661c4e075cf2140b3e (diff)
parentc692fd16051639f366b99f474fdb66e5675f065e (diff)
downloadmonzero-gui-df4f68fbf297478450406f01a7e41b32ce4f5628.tar.gz
monzero-gui-df4f68fbf297478450406f01a7e41b32ce4f5628.tar.xz
monzero-gui-df4f68fbf297478450406f01a7e41b32ce4f5628.zip
Merge pull request #4255
c692fd1 wizard: add Trezor Safe 3 to hardware wallets (selsta)
-rw-r--r--images/trezor3.pngbin0 -> 65928 bytes
-rw-r--r--images/trezorT.png (renamed from images/trezor.png)bin74286 -> 74286 bytes
-rw-r--r--images/trezorT@2x.png (renamed from images/trezor@2x.png)bin307843 -> 307843 bytes
-rw-r--r--qml.qrc5
-rw-r--r--wizard/WizardCreateDevice1.qml8
5 files changed, 10 insertions, 3 deletions
diff --git a/images/trezor3.png b/images/trezor3.png
new file mode 100644
index 00000000..d0fc03eb
--- /dev/null
+++ b/images/trezor3.png
Binary files differ
diff --git a/images/trezor.png b/images/trezorT.png
index bdd1b091..bdd1b091 100644
--- a/images/trezor.png
+++ b/images/trezorT.png
Binary files differ
diff --git a/images/trezor@2x.png b/images/trezorT@2x.png
index a5687cbe..a5687cbe 100644
--- a/images/trezor@2x.png
+++ b/images/trezorT@2x.png
Binary files differ
diff --git a/qml.qrc b/qml.qrc
index 4915d4ae..2b3dfce2 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -282,8 +282,9 @@
<file>images/ledgerNanoSPlus.png</file>
<file>images/ledgerNanoX.png</file>
<file>images/ledgerStax.png</file>
- <file>images/trezor.png</file>
- <file>images/trezor@2x.png</file>
+ <file>images/trezor3.png</file>
+ <file>images/trezorT.png</file>
+ <file>images/trezorT@2x.png</file>
<file>qtquickcontrols2.conf</file>
<file>images/write-down.png</file>
<file>images/write-down-white.png</file>
diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml
index 145c5fc1..559437f7 100644
--- a/wizard/WizardCreateDevice1.qml
+++ b/wizard/WizardCreateDevice1.qml
@@ -46,6 +46,7 @@ Rectangle {
property var deviceName: deviceNameModel.get(deviceNameDropdown.currentIndex).column2
property var ledgerType: deviceName == "Ledger" ? deviceNameModel.get(deviceNameDropdown.currentIndex).column1 : null
+ property var trezorType: deviceName == "Trezor" ? deviceNameModel.get(deviceNameDropdown.currentIndex).column1 : null
property var hardwareWalletType: wizardCreateDevice1.deviceName;
ListModel {
@@ -56,6 +57,7 @@ Rectangle {
ListElement { column1: "Ledger Nano X"; column2: "Ledger";}
ListElement { column1: "Ledger Stax"; column2: "Ledger";}
ListElement { column1: "Trezor Model T"; column2: "Trezor";}
+ ListElement { column1: "Trezor Safe 3"; column2: "Trezor";}
}
ColumnLayout {
@@ -163,7 +165,11 @@ Rectangle {
Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
source: {
if (hardwareWalletType == "Trezor") {
- return "qrc:///images/trezor.png";
+ if (trezorType == "Trezor Model T") {
+ return "qrc:///images/trezorT.png";
+ } else if (trezorType == "Trezor Safe 3") {
+ return "qrc:///images/trezor3.png";
+ }
} else if (hardwareWalletType == "Ledger") {
if (ledgerType == "Ledger Nano S") {
return "qrc:///images/ledgerNanoS.png";