Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Merge pull request #1830

Browse Source 
84a6042 mining: add visual icon/indicator that mining is enabled, visible on all the screens (mmbyday)
This commit is contained in:
luigi1111
2018-12-20 14:30:08 -06:00
parent 7cf94734be 84a60424ef
commit 1e4e9384eb
9 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
components/NetworkStatusItem.qml
View File

@@ -43,7 +43,7 @@ Rectangle {
return qsTr("Synchronizing")
if(appWindow.remoteNodeConnected)
return qsTr("Remote node")
return qsTr("Connected")
return appWindow.isMining ? qsTr("Connected") + " + " + qsTr("Mining"): qsTr("Connected")
}
if (status == Wallet.ConnectionStatus_WrongVersion)
return qsTr("Wrong version")
@@ -69,16 +69,30 @@ Rectangle {
Image {
anchors.top: parent.top
anchors.topMargin: 6
anchors.topMargin: !appWindow.isMining ? 6 * scaleRatio : 4 * scaleRatio
anchors.right: parent.right
anchors.rightMargin: 11
anchors.rightMargin: !appWindow.isMining ? 11 * scaleRatio : 0
source: {
if(item.connected == Wallet.ConnectionStatus_Connected){
if(appWindow.isMining) {
return "../images/miningxmr.png"
} else if(item.connected == Wallet.ConnectionStatus_Connected) {
return "../images/lightning.png"
} else {
return "../images/lightning-white.png"
}
}
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
if(!appWindow.isMining) {
middlePanel.settingsView.settingsStateViewState = "Node";
appWindow.showPageRequest("Settings");
} else {
appWindow.showPageRequest("Mining")
}
}
}
}
}
@@ -108,9 +122,19 @@ Rectangle {
font.pixelSize: 20 * scaleRatio
color: "white"
text: getConnectionStatusString(item.connected) + translationManager.emptyString
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
if(!appWindow.isMining) {
middlePanel.settingsView.settingsStateViewState = "Node";
appWindow.showPageRequest("Settings");
} else {
appWindow.showPageRequest("Mining")
}
}
}
}
}
}
}