WizardOpenWallet1: new wallet icons; hide "Mainnet" label in simple mode
BIN
images/open-wallet-from-file-mainnet.png
Normal file
After Width: | Height: | Size: 640 B |
BIN
images/open-wallet-from-file-mainnet@2x.png
Normal file
After Width: | Height: | Size: 937 B |
BIN
images/open-wallet-from-file-stagenet.png
Normal file
After Width: | Height: | Size: 569 B |
BIN
images/open-wallet-from-file-stagenet@2x.png
Normal file
After Width: | Height: | Size: 717 B |
BIN
images/open-wallet-from-file-testnet.png
Normal file
After Width: | Height: | Size: 608 B |
BIN
images/open-wallet-from-file-testnet@2x.png
Normal file
After Width: | Height: | Size: 779 B |
BIN
images/open-wallet-from-file-trezor.png
Normal file
After Width: | Height: | Size: 969 B |
BIN
images/open-wallet-from-file-trezor@2x.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
images/open-wallet-from-file-view-only.png
Normal file
After Width: | Height: | Size: 958 B |
BIN
images/open-wallet-from-file-view-only@2x.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 742 B After Width: | Height: | Size: 424 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 678 B |
10
qml.qrc
|
@ -213,6 +213,16 @@
|
||||||
<file>images/restore-wallet-from-hardware.png</file>
|
<file>images/restore-wallet-from-hardware.png</file>
|
||||||
<file>images/open-wallet-from-file@2x.png</file>
|
<file>images/open-wallet-from-file@2x.png</file>
|
||||||
<file>images/open-wallet-from-file.png</file>
|
<file>images/open-wallet-from-file.png</file>
|
||||||
|
<file>images/open-wallet-from-file-mainnet@2x.png</file>
|
||||||
|
<file>images/open-wallet-from-file-mainnet.png</file>
|
||||||
|
<file>images/open-wallet-from-file-stagenet@2x.png</file>
|
||||||
|
<file>images/open-wallet-from-file-stagenet.png</file>
|
||||||
|
<file>images/open-wallet-from-file-testnet@2x.png</file>
|
||||||
|
<file>images/open-wallet-from-file-testnet.png</file>
|
||||||
|
<file>images/open-wallet-from-file-view-only@2x.png</file>
|
||||||
|
<file>images/open-wallet-from-file-view-only.png</file>
|
||||||
|
<file>images/open-wallet-from-file-trezor@2x.png</file>
|
||||||
|
<file>images/open-wallet-from-file-trezor.png</file>
|
||||||
<file>images/restore-wallet@2x.png</file>
|
<file>images/restore-wallet@2x.png</file>
|
||||||
<file>images/restore-wallet.png</file>
|
<file>images/restore-wallet.png</file>
|
||||||
<file>images/create-wallet@2x.png</file>
|
<file>images/create-wallet@2x.png</file>
|
||||||
|
|
|
@ -163,7 +163,7 @@ Rectangle {
|
||||||
return parent.width / 3
|
return parent.width / 3
|
||||||
}
|
}
|
||||||
property string networkType: {
|
property string networkType: {
|
||||||
if(networktype === 0) return qsTr("Mainnet");
|
if(networktype === 0 && appWindow.walletMode >= 2) return qsTr("Mainnet");
|
||||||
else if(networktype === 1) return qsTr("Testnet");
|
else if(networktype === 1) return qsTr("Testnet");
|
||||||
else if(networktype === 2) return qsTr("Stagenet");
|
else if(networktype === 2) return qsTr("Stagenet");
|
||||||
return "";
|
return "";
|
||||||
|
@ -218,7 +218,14 @@ Rectangle {
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
fillMode: Image.PreserveAspectFit
|
fillMode: Image.PreserveAspectFit
|
||||||
source: "qrc:///images/open-wallet-from-file.png"
|
source: {
|
||||||
|
if (networktype === 0 && fileName.toLowerCase().includes("viewonly")) return "qrc:///images/open-wallet-from-file-view-only.png";
|
||||||
|
else if (networktype === 0 && fileName.toLowerCase().includes("trezor")) return "qrc:///images/open-wallet-from-file-trezor.png";
|
||||||
|
else if (networktype === 0 && fileName.toLowerCase().includes("ledger")) return "qrc:///images/restore-wallet-from-hardware.png";
|
||||||
|
else if (networktype === 0) return "qrc:///images/open-wallet-from-file-mainnet.png";
|
||||||
|
else if (networktype === 1) return "qrc:///images/open-wallet-from-file-testnet.png";
|
||||||
|
else if (networktype === 2) return "qrc:///images/open-wallet-from-file-stagenet.png";
|
||||||
|
}
|
||||||
visible: {
|
visible: {
|
||||||
if(!isOpenGL) return true;
|
if(!isOpenGL) return true;
|
||||||
if(MoneroComponents.Style.blackTheme) return true;
|
if(MoneroComponents.Style.blackTheme) return true;
|
||||||
|
@ -263,12 +270,12 @@ Rectangle {
|
||||||
|
|
||||||
wrapMode: Text.WordWrap
|
wrapMode: Text.WordWrap
|
||||||
leftPadding: 0
|
leftPadding: 0
|
||||||
topPadding: networktype !== -1 ? 8 : 4
|
topPadding: networkType !== "" ? 8 : 4
|
||||||
bottomPadding: 0
|
bottomPadding: 0
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
visible: networktype !== -1
|
visible: networkType !== ""
|
||||||
Layout.preferredHeight: 24
|
Layout.preferredHeight: 24
|
||||||
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
|
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|