WizardOpenWallet1: new wallet icons; hide "Mainnet" label in simple mode

14 files changed, 21 insertions, 4 deletions

diff --git a/images/open-wallet-from-file-mainnet.png b/images/open-wallet-from-file-mainnet.png
new file mode 100644
index 00000000..aa497672
--- /dev/null
+++ b/images/open-wallet-from-file-mainnet.png
diff --git a/images/open-wallet-from-file-mainnet@2x.png b/images/open-wallet-from-file-mainnet@2x.png
new file mode 100644
index 00000000..eb5351e2
--- /dev/null
+++ b/images/open-wallet-from-file-mainnet@2x.png
diff --git a/images/open-wallet-from-file-stagenet.png b/images/open-wallet-from-file-stagenet.png
new file mode 100644
index 00000000..453d1219
--- /dev/null
+++ b/images/open-wallet-from-file-stagenet.png
diff --git a/images/open-wallet-from-file-stagenet@2x.png b/images/open-wallet-from-file-stagenet@2x.png
new file mode 100644
index 00000000..c437098e
--- /dev/null
+++ b/images/open-wallet-from-file-stagenet@2x.png
diff --git a/images/open-wallet-from-file-testnet.png b/images/open-wallet-from-file-testnet.png
new file mode 100644
index 00000000..10e0d345
--- /dev/null
+++ b/images/open-wallet-from-file-testnet.png
diff --git a/images/open-wallet-from-file-testnet@2x.png b/images/open-wallet-from-file-testnet@2x.png
new file mode 100644
index 00000000..0bd0c4b7
--- /dev/null
+++ b/images/open-wallet-from-file-testnet@2x.png
diff --git a/images/open-wallet-from-file-trezor.png b/images/open-wallet-from-file-trezor.png
new file mode 100644
index 00000000..9f967f08
--- /dev/null
+++ b/images/open-wallet-from-file-trezor.png
diff --git a/images/open-wallet-from-file-trezor@2x.png b/images/open-wallet-from-file-trezor@2x.png
new file mode 100644
index 00000000..9ca476a5
--- /dev/null
+++ b/images/open-wallet-from-file-trezor@2x.png
diff --git a/images/open-wallet-from-file-view-only.png b/images/open-wallet-from-file-view-only.png
new file mode 100644
index 00000000..fc89c092
--- /dev/null
+++ b/images/open-wallet-from-file-view-only.png
diff --git a/images/open-wallet-from-file-view-only@2x.png b/images/open-wallet-from-file-view-only@2x.png
new file mode 100644
index 00000000..1a996270
--- /dev/null
+++ b/images/open-wallet-from-file-view-only@2x.png
diff --git a/images/open-wallet-from-file.png b/images/open-wallet-from-file.png
index 737e4cfb..c1bcaace 100644
--- a/images/open-wallet-from-file.png
+++ b/images/open-wallet-from-file.png
diff --git a/images/open-wallet-from-file@2x.png b/images/open-wallet-from-file@2x.png
index 0edcb2aa..e4b25ef5 100644
--- a/images/open-wallet-from-file@2x.png
+++ b/images/open-wallet-from-file@2x.png
diff --git a/qml.qrc b/qml.qrc
index 1f6e7a36..bdad75b6 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -213,6 +213,16 @@
         <file>images/restore-wallet-from-hardware.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-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.png</file>
         <file>images/create-wallet@2x.png</file>
diff --git a/wizard/WizardOpenWallet1.qml b/wizard/WizardOpenWallet1.qml
index 4e645cf1..d2f52bd7 100644
--- a/wizard/WizardOpenWallet1.qml
+++ b/wizard/WizardOpenWallet1.qml
@@ -163,7 +163,7 @@ Rectangle {
                             return parent.width / 3
                         }
                         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 === 2) return qsTr("Stagenet");
                             return "";
@@ -218,7 +218,14 @@ Rectangle {
                                     anchors.left: parent.left
                                     anchors.verticalCenter: parent.verticalCenter
                                     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: {
                                         if(!isOpenGL) return true;
                                         if(MoneroComponents.Style.blackTheme) return true;
@@ -263,12 +270,12 @@ Rectangle {
 
                                     wrapMode: Text.WordWrap
                                     leftPadding: 0
-                                    topPadding: networktype !== -1 ? 8 : 4
+                                    topPadding: networkType !== "" ? 8 : 4
                                     bottomPadding: 0
                                 }
 
                                 Text {
-                                    visible: networktype !== -1
+                                    visible: networkType !== ""
                                     Layout.preferredHeight: 24
                                     Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
                                     Layout.fillWidth: true