diff options
| author | Sander Ferdinand <sa.ferdinand@gmail.com> | 2018-03-27 20:41:15 +0200 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-03-29 23:04:04 +0100 |
| commit | 0bfff8844e113d36a538d2bb0109541a3edc95e6 (patch) | |
| tree | 3388abf017c7c67739d35d1fc146a5ac71e1353d | |
| parent | 3c2404473672991b51cbe6ec6d2d9326e9f85ca8 (diff) | |
| download | monzero-gui-0bfff8844e113d36a538d2bb0109541a3edc95e6.tar.gz monzero-gui-0bfff8844e113d36a538d2bb0109541a3edc95e6.tar.xz monzero-gui-0bfff8844e113d36a538d2bb0109541a3edc95e6.zip | |
nettype comparison needs to be loose
| -rw-r--r-- | LeftPanel.qml | 5 | ||||
| -rw-r--r-- | components/CheckBox2.qml | 1 | ||||
| -rw-r--r-- | main.qml | 4 | ||||
| -rw-r--r-- | wizard/WizardOptions.qml | 8 |
4 files changed, 8 insertions, 10 deletions
diff --git a/LeftPanel.qml b/LeftPanel.qml index acefa60f..b9577591 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -99,7 +99,6 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - // @TODO: customDecorations? anchors.topMargin: (persistentSettings.customDecorations)? 50 : 0 RowLayout { @@ -121,8 +120,8 @@ Rectangle { Text { id: testnetLabel - visible: persistentSettings.nettype - text: qsTr("Testnet") + translationManager.emptyString + visible: persistentSettings.nettype != NetworkType.MAINNET + text: (persistentSettings.nettype == NetworkType.TESTNET ? qsTr("Testnet") : qsTr("Stagenet")) + translationManager.emptyString anchors.top: parent.top anchors.topMargin: 8 anchors.left: parent.left diff --git a/components/CheckBox2.qml b/components/CheckBox2.qml index 667a950f..367037c2 100644 --- a/components/CheckBox2.qml +++ b/components/CheckBox2.qml @@ -80,7 +80,6 @@ RowLayout { anchors.centerIn: parent source: "../images/whiteDropIndicator.png" rotation: checkBox.checked ? 180 * scaleRatio : 0 - verticalAlignment: parent.verticalCenter } } @@ -73,7 +73,7 @@ ApplicationWindow { property bool remoteNodeConnected: false property bool androidCloseTapped: false; // Default daemon addresses - readonly property string localDaemonAddress : persistentSettings.nettype === NetworkType.MAINNET ? "localhost:18081" : persistentSettings.nettype === NetworkType.TESTNET ? "localhost:28081" : "localhost:38081" + readonly property string localDaemonAddress : persistentSettings.nettype == NetworkType.MAINNET ? "localhost:18081" : persistentSettings.nettype == NetworkType.TESTNET ? "localhost:28081" : "localhost:38081" property string currentDaemonAddress; property bool startLocalNodeCancelled: false @@ -232,7 +232,7 @@ ApplicationWindow { if(isIOS) wallet_path = moneroAccountsDir + wallet_path; // console.log("opening wallet at: ", wallet_path, "with password: ", appWindow.walletPassword); - console.log("opening wallet at: ", wallet_path, ", network type: ", persistentSettings.nettype === NetworkType.MAINNET ? "mainnet" : persistentSettings.nettype === NetworkType.TESTNET ? "testnet" : "stagenet"); + console.log("opening wallet at: ", wallet_path, ", network type: ", persistentSettings.nettype == NetworkType.MAINNET ? "mainnet" : persistentSettings.nettype == NetworkType.TESTNET ? "testnet" : "stagenet"); walletManager.openWalletAsync(wallet_path, walletPassword, persistentSettings.nettype); } diff --git a/wizard/WizardOptions.qml b/wizard/WizardOptions.qml index 7a9ffa62..3579f147 100644 --- a/wizard/WizardOptions.qml +++ b/wizard/WizardOptions.qml @@ -250,11 +250,11 @@ ColumnLayout { fontSize: 16 * scaleRatio checkedIcon: "../images/checkedVioletIcon.png" uncheckedIcon: "../images/uncheckedIcon.png" - checked: appWindow.persistentSettings.nettype === NetworkType.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") + console.log("Network type set to ", persistentSettings.nettype == NetworkType.TESTNET ? "Testnet" : "Mainnet") } } } @@ -269,11 +269,11 @@ ColumnLayout { fontSize: 16 * scaleRatio checkedIcon: "../images/checkedVioletIcon.png" uncheckedIcon: "../images/uncheckedIcon.png" - checked: appWindow.persistentSettings.nettype === NetworkType.STAGENET; + checked: appWindow.persistentSettings.nettype == NetworkType.STAGENET; onClicked: { persistentSettings.nettype = stageNet.checked ? NetworkType.STAGENET : NetworkType.MAINNET testNet.checked = false; - console.log("Network type set to ", persistentSettings.nettype === NetworkType.STAGENET ? "Stagenet" : "Mainnet") + console.log("Network type set to ", persistentSettings.nettype == NetworkType.STAGENET ? "Stagenet" : "Mainnet") } } } |
