monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 03:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add explicit mainnet button and move nettypes to advanced options

Browse source
This commit is contained in:
cryptochangements34 2018-06-07 12:23:47 -04:00
parent 06fdf27be2
commit f7bbdd3044
2 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
components/CheckBox2.qml
View file

@ -28,6 +28,7 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.0
import "." 1.0 import "." 1.0
RowLayout { RowLayout {
@ -40,6 +41,7 @@ RowLayout {
property int fontSize: 14 * scaleRatio property int fontSize: 14 * scaleRatio
property alias fontColor: label.color property alias fontColor: label.color
property int textMargin: 8 * scaleRatio property int textMargin: 8 * scaleRatio
property bool darkDropIndicator: false
signal clicked() signal clicked()
height: 25 * scaleRatio height: 25 * scaleRatio
@ -74,12 +76,19 @@ RowLayout {
anchors.left: label.right anchors.left: label.right
anchors.leftMargin: textMargin anchors.leftMargin: textMargin
color: "transparent" color: "transparent"
rotation: checkBox.checked ? 180 * scaleRatio : 0
Image { Image {
id: indicatorImage id: indicatorImage
anchors.centerIn: parent anchors.centerIn: parent
source: "../images/whiteDropIndicator.png" source: "../images/whiteDropIndicator.png"
rotation: checkBox.checked ? 180 * scaleRatio : 0 visible: !darkDropIndicator
}
ColorOverlay {
anchors.fill: indicatorImage
source: indicatorImage
color: "#FF000000"
visible: darkDropIndicator
} }
} }

36
wizard/WizardOptions.qml
View file

@ -237,9 +237,41 @@ ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: 38 * scaleRatio spacing: 38 * scaleRatio
RowLayout {
CheckBox2 {
id: showAdvancedCheckbox
darkDropIndicator: true
text: qsTr("Advanced options") + translationManager.emptyString
fontColor: "#4A4646"
}
}
Rectangle { Rectangle {
width: 100 * scaleRatio width: 100 * scaleRatio
RadioButton { RadioButton {
visible: showAdvancedCheckbox.checked
enabled: !this.checked
id: mainNet
text: qsTr("Mainnet") + translationManager.emptyString
checkedColor: Qt.rgba(0, 0, 0, 0.75)
borderColor: Qt.rgba(0, 0, 0, 0.45)
fontColor: "#4A4646"
fontSize: 16 * scaleRatio
checked: appWindow.persistentSettings.nettype == NetworkType.MAINNET;
onClicked: {
persistentSettings.nettype = NetworkType.MAINNET
testNet.checked = false;
stageNet.checked = false;
console.log("Network type set to MainNet")
}
}
}
Rectangle {
width: 100 * scaleRatio
RadioButton {
visible: showAdvancedCheckbox.checked
enabled: !this.checked
id: testNet id: testNet
text: qsTr("Testnet") + translationManager.emptyString text: qsTr("Testnet") + translationManager.emptyString
checkedColor: Qt.rgba(0, 0, 0, 0.75) checkedColor: Qt.rgba(0, 0, 0, 0.75)
@ -249,6 +281,7 @@ ColumnLayout {
checked: appWindow.persistentSettings.nettype == NetworkType.TESTNET; checked: appWindow.persistentSettings.nettype == NetworkType.TESTNET;
onClicked: { onClicked: {
persistentSettings.nettype = testNet.checked ? NetworkType.TESTNET : NetworkType.MAINNET persistentSettings.nettype = testNet.checked ? NetworkType.TESTNET : NetworkType.MAINNET
mainNet.checked = false;
stageNet.checked = false; 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")
} }
@ -258,6 +291,8 @@ ColumnLayout {
Rectangle { Rectangle {
width: 100 * scaleRatio width: 100 * scaleRatio
RadioButton { RadioButton {
visible: showAdvancedCheckbox.checked
enabled: !this.checked
id: stageNet id: stageNet
text: qsTr("Stagenet") + translationManager.emptyString text: qsTr("Stagenet") + translationManager.emptyString
checkedColor: Qt.rgba(0, 0, 0, 0.75) checkedColor: Qt.rgba(0, 0, 0, 0.75)
@ -267,6 +302,7 @@ ColumnLayout {
checked: appWindow.persistentSettings.nettype == NetworkType.STAGENET; checked: appWindow.persistentSettings.nettype == NetworkType.STAGENET;
onClicked: { onClicked: {
persistentSettings.nettype = stageNet.checked ? NetworkType.STAGENET : NetworkType.MAINNET persistentSettings.nettype = stageNet.checked ? NetworkType.STAGENET : NetworkType.MAINNET
mainNet.checked = false;
testNet.checked = false; 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")
} }