Merge pull request #1161

c8f0cf3 Stagenet

5 files changed, 38 insertions, 15 deletions

diff --git a/wizard/WizardCreateWallet.qml b/wizard/WizardCreateWallet.qml
index 521d6cf7..f25d2047 100644
--- a/wizard/WizardCreateWallet.qml
+++ b/wizard/WizardCreateWallet.qml
@@ -85,9 +85,9 @@ ColumnLayout {
 
         var tmp_wallet_filename = oshelper.temporaryFilename();
         console.log("Creating temporary wallet", tmp_wallet_filename)
-        var testnet = appWindow.persistentSettings.testnet;
+        var nettype = appWindow.persistentSettings.nettype;
         var wallet = walletManager.createWallet(tmp_wallet_filename, "", settingsObject.wallet_language,
-                                                testnet)
+                                                nettype)
         uiItem.wordsTextItem.memoText = wallet.seed
         // saving wallet in "global" settings object
         // TODO: wallet should have a property pointing to the file where it stored or loaded from
diff --git a/wizard/WizardFinish.qml b/wizard/WizardFinish.qml
index e681c80e..0ab50706 100644
--- a/wizard/WizardFinish.qml
+++ b/wizard/WizardFinish.qml
@@ -28,6 +28,7 @@
 
 import QtQuick 2.2
 import QtQuick.Layouts 1.1
+import moneroComponents.NetworkType 1.0
 
 
 ColumnLayout {
@@ -50,8 +51,8 @@ ColumnLayout {
             autoDonationAmount = wizard.settings["auto_donations_amount"] + " %",
             backgroundMiningEnabled = wizard.settings["allow_background_mining"] === true,
             backgroundMiningText = backgroundMiningEnabled ? qsTr("Enabled") : qsTr("Disabled"),
-            testnetEnabled = appWindow.persistentSettings.testnet,
-            testnetText = testnetEnabled ? qsTr("Enabled") : qsTr("Disabled"),
+            nettype = appWindow.persistentSettings.nettype,
+            networkText = nettype === NetworkType.TESTNET ? qsTr("Testnet") : nettype === NetworkType.STAGENET ? qsTr("Stagenet") : qsTr("Mainnet"),
             restoreHeightEnabled = wizard.settings['restore_height'] !== undefined;
 
         return "<table>"
@@ -65,7 +66,7 @@ ColumnLayout {
                 // : "")
             // + trStart + qsTr("Background mining") + trMiddle + backgroundMiningText + trEnd
             + trStart + qsTr("Daemon address") + trMiddle + persistentSettings.daemon_address + trEnd
-            + trStart + qsTr("Testnet") + trMiddle + testnetText + trEnd
+            + trStart + qsTr("Network Type") + trMiddle + networkText + trEnd
             + (restoreHeightEnabled
                 ? trStart + qsTr("Restore height") + trMiddle + wizard.settings['restore_height'] + trEnd
                 : "")
diff --git a/wizard/WizardManageWalletUI.qml b/wizard/WizardManageWalletUI.qml
index 7d2c789b..b83648a7 100644
--- a/wizard/WizardManageWalletUI.qml
+++ b/wizard/WizardManageWalletUI.qml
@@ -56,10 +56,10 @@ ColumnLayout {
     property int rowSpacing: 10
 
     function checkFields(){
-        var addressOK = walletManager.addressValid(addressLine.text, persistentSettings.testnet)
-        var viewKeyOK = walletManager.keyValid(viewKeyLine.text, addressLine.text, true, persistentSettings.testnet)
+        var addressOK = walletManager.addressValid(addressLine.text, persistentSettings.nettype)
+        var viewKeyOK = walletManager.keyValid(viewKeyLine.text, addressLine.text, true, persistentSettings.nettype)
         // Spendkey is optional
-        var spendKeyOK = (spendKeyLine.text.length > 0)? walletManager.keyValid(spendKeyLine.text, addressLine.text, false, persistentSettings.testnet) : true
+        var spendKeyOK = (spendKeyLine.text.length > 0)? walletManager.keyValid(spendKeyLine.text, addressLine.text, false, persistentSettings.nettype) : true
 
         addressLine.error = !addressOK && addressLine.text.length != 0
         viewKeyLine.error = !viewKeyOK && viewKeyLine.text.length != 0
diff --git a/wizard/WizardOptions.qml b/wizard/WizardOptions.qml
index 784c1968..7a9ffa62 100644
--- a/wizard/WizardOptions.qml
+++ b/wizard/WizardOptions.qml
@@ -29,6 +29,7 @@
 import QtQuick 2.2
 import QtQml 2.2
 import QtQuick.Layouts 1.1
+import moneroComponents.NetworkType 1.0
 import "../components"
 
 ColumnLayout {
@@ -231,12 +232,13 @@ ColumnLayout {
 
     }
 
-    RowLayout {
+    ColumnLayout {
         Layout.leftMargin: wizardLeftMargin
         Layout.rightMargin: wizardRightMargin
         Layout.topMargin: 30 * scaleRatio
         Layout.alignment: Qt.AlignCenter
         Layout.fillWidth: true
+        spacing: 50 * scaleRatio
 
         Rectangle {
             width: 100 * scaleRatio
@@ -248,10 +250,30 @@ ColumnLayout {
                 fontSize: 16 * scaleRatio
                 checkedIcon: "../images/checkedVioletIcon.png"
                 uncheckedIcon: "../images/uncheckedIcon.png"
-                checked: appWindow.persistentSettings.testnet;
+                checked: appWindow.persistentSettings.nettype === NetworkType.TESTNET;
+                onClicked: {
+                    persistentSettings.nettype = testNet.checked ? NetworkType.TESTNET : NetworkType.MAINNET
+                    stageNet.checked = false;
+                    console.log("Network type set to ", persistentSettings.nettype === NetworkType.TESTNET ? "Testnet" : "Mainnet")
+                }
+            }
+        }
+
+        Rectangle {
+            width: 100 * scaleRatio
+            CheckBox {
+                id: stageNet
+                text: qsTr("Stagenet") + translationManager.emptyString
+                background: "#FFFFFF"
+                fontColor: "#4A4646"
+                fontSize: 16 * scaleRatio
+                checkedIcon: "../images/checkedVioletIcon.png"
+                uncheckedIcon: "../images/uncheckedIcon.png"
+                checked: appWindow.persistentSettings.nettype === NetworkType.STAGENET;
                 onClicked: {
-                    persistentSettings.testnet = testNet.checked
-                    console.log("testnet set to ", persistentSettings.testnet)
+                    persistentSettings.nettype = stageNet.checked ? NetworkType.STAGENET : NetworkType.MAINNET
+                    testNet.checked = false;
+                    console.log("Network type set to ", persistentSettings.nettype === NetworkType.STAGENET ? "Stagenet" : "Mainnet")
                 }
             }
         }
diff --git a/wizard/WizardRecoveryWallet.qml b/wizard/WizardRecoveryWallet.qml
index 9c028187..f30c9849 100644
--- a/wizard/WizardRecoveryWallet.qml
+++ b/wizard/WizardRecoveryWallet.qml
@@ -76,7 +76,7 @@ ColumnLayout {
     }
 
     function recoveryWallet(settingsObject, fromSeed) {
-        var testnet = appWindow.persistentSettings.testnet;
+        var nettype = appWindow.persistentSettings.nettype;
         var restoreHeight = settingsObject.restore_height;
         var tmp_wallet_filename = oshelper.temporaryFilename()
         console.log("Creating temporary wallet", tmp_wallet_filename)
@@ -89,9 +89,9 @@ ColumnLayout {
 
         // From seed or keys
         if(fromSeed)
-            var wallet = walletManager.recoveryWallet(tmp_wallet_filename, settingsObject.words, testnet, restoreHeight)
+            var wallet = walletManager.recoveryWallet(tmp_wallet_filename, settingsObject.words, nettype, restoreHeight)
         else
-            var wallet = walletManager.createWalletFromKeys(tmp_wallet_filename, settingsObject.wallet_language, testnet,
+            var wallet = walletManager.createWalletFromKeys(tmp_wallet_filename, settingsObject.wallet_language, nettype,
                                                             settingsObject.recover_address, settingsObject.recover_viewkey,
                                                             settingsObject.recover_spendkey, restoreHeight)