monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-16 15:58:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4255

Browse source 
c692fd1 wizard: add Trezor Safe 3 to hardware wallets (selsta)
This commit is contained in:
luigi1111 2024-01-18 18:18:53 -05:00
commit df4f68fbf2
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
5 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
images/trezor3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 64 KiB

0
images/trezor.png → images/trezorT.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 72 KiB

0
images/trezor@2x.png → images/trezorT@2x.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 301 KiB

After

Width:  |  Height:  |  Size: 301 KiB

5
qml.qrc
View file

@ -282,8 +282,9 @@
<file>images/ledgerNanoSPlus.png</file> <file>images/ledgerNanoSPlus.png</file>
<file>images/ledgerNanoX.png</file> <file>images/ledgerNanoX.png</file>
<file>images/ledgerStax.png</file> <file>images/ledgerStax.png</file>
<file>images/trezor.png</file> <file>images/trezor3.png</file>
<file>images/trezor@2x.png</file> <file>images/trezorT.png</file>
<file>images/trezorT@2x.png</file>
<file>qtquickcontrols2.conf</file> <file>qtquickcontrols2.conf</file>
<file>images/write-down.png</file> <file>images/write-down.png</file>
<file>images/write-down-white.png</file> <file>images/write-down-white.png</file>

8
wizard/WizardCreateDevice1.qml
View file

@ -46,6 +46,7 @@ Rectangle {
property var deviceName: deviceNameModel.get(deviceNameDropdown.currentIndex).column2 property var deviceName: deviceNameModel.get(deviceNameDropdown.currentIndex).column2
property var ledgerType: deviceName == "Ledger" ? deviceNameModel.get(deviceNameDropdown.currentIndex).column1 : null 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; property var hardwareWalletType: wizardCreateDevice1.deviceName;
ListModel { ListModel {
@ -56,6 +57,7 @@ Rectangle {
ListElement { column1: "Ledger Nano X"; column2: "Ledger";} ListElement { column1: "Ledger Nano X"; column2: "Ledger";}
ListElement { column1: "Ledger Stax"; column2: "Ledger";} ListElement { column1: "Ledger Stax"; column2: "Ledger";}
ListElement { column1: "Trezor Model T"; column2: "Trezor";} ListElement { column1: "Trezor Model T"; column2: "Trezor";}
ListElement { column1: "Trezor Safe 3"; column2: "Trezor";}
} }
ColumnLayout { ColumnLayout {
@ -163,7 +165,11 @@ Rectangle {
Layout.alignment: Qt.AlignTop | Qt.AlignHCenter Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
source: { source: {
if (hardwareWalletType == "Trezor") { 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") { } else if (hardwareWalletType == "Ledger") {
if (ledgerType == "Ledger Nano S") { if (ledgerType == "Ledger Nano S") {
return "qrc:///images/ledgerNanoS.png"; return "qrc:///images/ledgerNanoS.png";