monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 00:07:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mining: display max cpu thread count and warn about impact

Browse source
This commit is contained in:
mmbyday 2018-12-17 21:04:16 -08:00
parent 59fc48bd8b
commit 481ef1f895
3 changed files with 185 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MiddlePanel.qml
View file

@ -146,7 +146,7 @@ Rectangle {
}, State { }, State {
name: "Mining" name: "Mining"
PropertyChanges { target: root; currentView: miningView } PropertyChanges { target: root; currentView: miningView }
PropertyChanges { target: mainFlickable; contentHeight: minHeight } PropertyChanges { target: mainFlickable; contentHeight: 700 * scaleRatio}
}, State { }, State {
name: "Keys" name: "Keys"
PropertyChanges { target: root; currentView: keysView } PropertyChanges { target: root; currentView: keysView }

2
main.cpp
View file

@ -36,6 +36,7 @@
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QScreen> #include <QScreen>
#include <QRegExp> #include <QRegExp>
#include <QThread>
#include "clipboardAdapter.h" #include "clipboardAdapter.h"
#include "filter.h" #include "filter.h"
#include "oscursor.h" #include "oscursor.h"
@ -284,6 +285,7 @@ int main(int argc, char *argv[])
engine.rootContext()->setContextProperty("defaultAccountName", accountName); engine.rootContext()->setContextProperty("defaultAccountName", accountName);
engine.rootContext()->setContextProperty("applicationDirectory", QApplication::applicationDirPath()); engine.rootContext()->setContextProperty("applicationDirectory", QApplication::applicationDirPath());
engine.rootContext()->setContextProperty("numberMiningThreadsAvailable", QThread::idealThreadCount());
bool builtWithScanner = false; bool builtWithScanner = false;
#ifdef WITH_SCANNER #ifdef WITH_SCANNER

157
pages/Mining.qml
View file

@ -29,49 +29,40 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import "../components" import "../components" as MoneroComponents
import moneroComponents.Wallet 1.0 import moneroComponents.Wallet 1.0
Rectangle { Rectangle {
id: root id: root
color: "transparent" color: "transparent"
property var currentHashRate: 0 property double currentHashRate: 0
/* main layout */
ColumnLayout { ColumnLayout {
id: mainLayout id: mainLayout
anchors.margins: 40
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.margins: 40 * scaleRatio
spacing: 20 spacing: 20 * scaleRatio
Layout.fillWidth: true
// solo MoneroComponents.Label {
ColumnLayout {
id: soloBox
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
spacing: 20
Label {
id: soloTitleLabel id: soloTitleLabel
fontSize: 24 fontSize: 24 * scaleRatio
text: qsTr("Solo mining") + translationManager.emptyString text: qsTr("Solo mining") + translationManager.emptyString
} }
Label { MoneroComponents.Label {
id: soloLocalDaemonsLabel id: soloLocalDaemonsLabel
fontSize: 18 fontSize: 18 * scaleRatio
color: "#D02020" color: "#D02020"
text: qsTr("(only available for local daemons)") + translationManager.emptyString text: qsTr("(only available for local daemons)") + translationManager.emptyString
visible: !walletManager.isDaemonLocal(appWindow.currentDaemonAddress) visible: !walletManager.isDaemonLocal(appWindow.currentDaemonAddress)
} }
Label { MoneroComponents.Label {
id: soloSyncedLabel id: soloSyncedLabel
fontSize: 18 fontSize: 18 * scaleRatio
color: "#D02020" color: "#D02020"
text: qsTr("Your daemon must be synchronized before you can start mining") + translationManager.emptyString text: qsTr("Your daemon must be synchronized before you can start mining") + translationManager.emptyString
visible: walletManager.isDaemonLocal(appWindow.currentDaemonAddress) && !appWindow.daemonSynced visible: walletManager.isDaemonLocal(appWindow.currentDaemonAddress) && !appWindow.daemonSynced
@ -82,46 +73,89 @@ Rectangle {
text: qsTr("Mining with your computer helps strengthen the Monero network. The more that people mine, the harder it is for the network to be attacked, and every little bit helps.<br> <br>Mining also gives you a small chance to earn some Monero. Your computer will create hashes looking for block solutions. If you find a block, you will get the associated reward. Good luck!") + translationManager.emptyString text: qsTr("Mining with your computer helps strengthen the Monero network. The more that people mine, the harder it is for the network to be attacked, and every little bit helps.<br> <br>Mining also gives you a small chance to earn some Monero. Your computer will create hashes looking for block solutions. If you find a block, you will get the associated reward. Good luck!") + translationManager.emptyString
wrapMode: Text.Wrap wrapMode: Text.Wrap
Layout.fillWidth: true Layout.fillWidth: true
font.family: Style.fontRegular.name font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
}
MoneroComponents.WarningBox {
id: warningLabel
Layout.topMargin: 8 * scaleRatio
Layout.bottomMargin: 8 * scaleRatio
text: qsTr("Mining may reduce the performance of other running applications and processes.") + translationManager.emptyString
} }
RowLayout { RowLayout {
id: soloMinerThreadsRow id: soloMinerThreadsRow
Label {
MoneroComponents.Label {
id: soloMinerThreadsLabel id: soloMinerThreadsLabel
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
text: qsTr("CPU threads") + translationManager.emptyString text: qsTr("CPU threads") + translationManager.emptyString
fontSize: 16 fontSize: 16 * scaleRatio
Layout.preferredWidth: 120 Layout.preferredWidth: 120 * scaleRatio
} }
LineEdit {
MoneroComponents.LineEdit {
id: soloMinerThreadsLine id: soloMinerThreadsLine
Layout.preferredWidth: 200 Layout.preferredWidth: 200 * scaleRatio
text: "1" text: "1"
placeholderText: qsTr("(optional)") + translationManager.emptyString validator: IntValidator { bottom: 1; top: numberMiningThreadsAvailable }
validator: IntValidator { bottom: 1 } }
}
Text {
id: numAvailableThreadsText
text: qsTr("Max # of CPU threads available for mining: ") + numberMiningThreadsAvailable + translationManager.emptyString
wrapMode: Text.wrapMode
Layout.leftMargin: 125 * scaleRatio
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: MoneroComponents.Style.defaultFontColor
}
RowLayout {
Layout.leftMargin: 125 * scaleRatio
MoneroComponents.StandardButton {
id: autoRecommendedThreadsButton
small: true
text: qsTr("Use recommended # of threads") + translationManager.emptyString
enabled: startSoloMinerButton.enabled
onClicked: {
soloMinerThreadsLine.text = Math.floor(numberMiningThreadsAvailable / 2);
appWindow.showStatusMessage(qsTr("Set to use recommended # of threads"),3)
}
}
MoneroComponents.StandardButton {
id: autoSetMaxThreadsButton
small: true
text: qsTr("Use all threads") + translationManager.emptyString
enabled: startSoloMinerButton.enabled
onClicked: {
soloMinerThreadsLine.text = numberMiningThreadsAvailable
appWindow.showStatusMessage(qsTr("Set to use all threads"),3)
}
} }
} }
RowLayout { RowLayout {
Layout.leftMargin: 125 Layout.leftMargin: 125 * scaleRatio
CheckBox { MoneroComponents.CheckBox {
id: backgroundMining id: backgroundMining
enabled: startSoloMinerButton.enabled enabled: startSoloMinerButton.enabled
checked: persistentSettings.allow_background_mining checked: persistentSettings.allow_background_mining
onClicked: {persistentSettings.allow_background_mining = checked} onClicked: {persistentSettings.allow_background_mining = checked}
text: qsTr("Background mining (experimental)") + translationManager.emptyString text: qsTr("Background mining (experimental)") + translationManager.emptyString
} }
} }
RowLayout { RowLayout {
// Disable this option until stable // Disable this option until stable
visible: false visible: false
Layout.leftMargin: 125 Layout.leftMargin: 125 * scaleRatio
CheckBox { MoneroComponents.CheckBox {
id: ignoreBattery id: ignoreBattery
enabled: startSoloMinerButton.enabled enabled: startSoloMinerButton.enabled
checked: !persistentSettings.miningIgnoreBattery checked: !persistentSettings.miningIgnoreBattery
@ -131,18 +165,18 @@ Rectangle {
} }
RowLayout { RowLayout {
Label { MoneroComponents.Label {
id: manageSoloMinerLabel id: manageSoloMinerLabel
color: Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
text: qsTr("Manage miner") + translationManager.emptyString text: qsTr("Manage miner") + translationManager.emptyString
fontSize: 16 fontSize: 16 * scaleRatio
Layout.preferredWidth: 120 * scaleRatio
} }
StandardButton { MoneroComponents.StandardButton {
visible: true visible: true
//enabled: !walletManager.isMining()
id: startSoloMinerButton id: startSoloMinerButton
width: 110 width: 110 * scaleRatio
small: true small: true
text: qsTr("Start mining") + translationManager.emptyString text: qsTr("Start mining") + translationManager.emptyString
onClicked: { onClicked: {
@ -160,11 +194,10 @@ Rectangle {
} }
} }
StandardButton { MoneroComponents.StandardButton {
visible: true visible: true
//enabled: walletManager.isMining()
id: stopSoloMinerButton id: stopSoloMinerButton
width: 110 width: 110 * scaleRatio
small: true small: true
text: qsTr("Stop mining") + translationManager.emptyString text: qsTr("Stop mining") + translationManager.emptyString
onClicked: { onClicked: {
@ -173,28 +206,35 @@ Rectangle {
} }
} }
} }
RowLayout {
id: statusRow
MoneroComponents.Label {
id: statusLabel
color: MoneroComponents.Style.defaultFontColor
text: qsTr("Status") + translationManager.emptyString
fontSize: 16 * scaleRatio
Layout.preferredWidth: 120 * scaleRatio
} }
Text { MoneroComponents.LineEdit {
id: statusText id: statusText
text: qsTr("Status: not mining") Layout.preferredWidth: 200 * scaleRatio
color: Style.defaultFontColor text: qsTr("Not mining") + translationManager.emptyString
textFormat: Text.RichText borderDisabled: true
wrapMode: Text.Wrap readOnly: true
}
} }
} }
function updateStatusText() { function updateStatusText() {
var text = ""
if (walletManager.isMining()) { if (walletManager.isMining()) {
if (text !== "") statusText.text = qsTr("Mining at %1 H/s").arg(walletManager.miningHashRate()) + translationManager.emptyString;
text += "<br>";
text += qsTr("Mining at %1 H/s").arg(walletManager.miningHashRate())
} }
if (text === "") { else {
text += qsTr("Not mining") + translationManager.emptyString; statusText.text = qsTr("Not mining") + translationManager.emptyString;
} }
statusText.text = qsTr("Status: ") + text
} }
function update() { function update() {
@ -203,7 +243,7 @@ Rectangle {
stopSoloMinerButton.enabled = !startSoloMinerButton.enabled stopSoloMinerButton.enabled = !startSoloMinerButton.enabled
} }
StandardDialog { MoneroComponents.StandardDialog {
id: errorPopup id: errorPopup
cancelVisible: false cancelVisible: false
} }
@ -216,11 +256,10 @@ Rectangle {
function onPageCompleted() { function onPageCompleted() {
console.log("Mining page loaded"); console.log("Mining page loaded");
update() update()
timer.running = walletManager.isDaemonLocal(appWindow.currentDaemonAddress) timer.running = walletManager.isDaemonLocal(appWindow.currentDaemonAddress)
} }
function onPageClosed() { function onPageClosed() {
timer.running = false timer.running = false
} }