From 84a60424efb90c680137294cb7338f41f8c9fe9d Mon Sep 17 00:00:00 2001 From: mmbyday Date: Sat, 15 Dec 2018 20:10:12 -0800 Subject: [PATCH] mining: add visual icon/indicator that mining is enabled, visible on all the screens --- LeftPanel.qml | 2 +- components/NetworkStatusItem.qml | 36 +++++++++++++++++++++++++------ images/miningxmr.png | Bin 0 -> 1405 bytes images/miningxmr@2x.png | Bin 0 -> 2713 bytes main.qml | 1 + pages/Mining.qml | 1 + pages/Transfer.qml | 2 ++ pages/settings/Settings.qml | 1 + qml.qrc | 2 ++ 9 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 images/miningxmr.png create mode 100644 images/miningxmr@2x.png diff --git a/LeftPanel.qml b/LeftPanel.qml index 53da5f22..e05e62ac 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -650,7 +650,7 @@ Rectangle { id: networkStatus anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 0 + anchors.leftMargin: 5 * scaleRatio anchors.rightMargin: 0 anchors.bottom: (progressBar.visible)? progressBar.top : parent.bottom; connected: Wallet.ConnectionStatus_Disconnected diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml index edc22595..965948bd 100644 --- a/components/NetworkStatusItem.qml +++ b/components/NetworkStatusItem.qml @@ -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") + } + } + } } } } - - } diff --git a/images/miningxmr.png b/images/miningxmr.png new file mode 100644 index 0000000000000000000000000000000000000000..81fb7689c64ef84efd9d1b7e93262e96d2e92157 GIT binary patch literal 1405 zcmV-@1%mpCP)qF!4cR zNO&>co&YHoVv!cGZZAkLPzfb~RMBR8k=|@6QtHmy*4^&x&Yts~Gvh<)O0g}_F3~TU zr;~HO-}#^KHo$*uN-PdJSmsuRv{y2ef*fUn3 z;`G@##`$)^>3zo793sN-&@lRXuR;6w)nr)3MeyP~C7|Wm4`CBt9g@HO3hFuU$uXS1*`pTEzM1 zwy-`pQGSTu&4s1}D0IEJ#-X8Dot1KoODjW=SjQPdC=^0RM>l-lKfxIrw1jx2^5}v3 zm}bGpZ?0Yw?^G%hlak|8pW6g0Aqku@`2Bvgwzb0u7~qU~q!8=NOZN9oH;^Y)AVMhC zW+%rd=e!0hE)kqD7)A&lPaDjT31Y0y5^`gC$$n!dnWRp(U?-*=U6{KGxZ#{J2Ea!8 zgY&^7kq9$Qm%F6Um}w1hOcrolTA4%?bxuU!oa6rFBxGc!C;Zyn{vCkFX9_T(0!+#s zM6_;Hb|dPXZhVTO;IX8Lzj$lzj4P=&QJza7i#cPe-yc9zQww0*a5^0z&M`DNg!n5z zxl0$-lIBRWZ7d(vQJHp3r~n|Oy^@GBhKGjX z9ne9Xf95VNnzXjZQVA6RB#E`0bM*CI1!t_?BDv#s8)F5b0ss-MFh+vV2XtEyxsJQP zindhY!fYx~o)UXDW=#qqrVlX&u*~PxAvmk3F8?|@Oi(`Fwru=iTlPh(wXBP8O*%vQ zSnw|hHhqXu0M6&?ULS-I(TR~0<0MJkU5* zWH)s5AvbGLEvb$)8&el64FDd^UfrEAOYqLle=b&4RmIZM(n^TP1i%3N7!HTG7Znw` z@1(#)AvDLlNh;=?s-J$VjmfXsRQBGh8m;y|5ozFC#Z=Q4ML1RNKbGfbzz>U)Ft#|AYMv?RdB@E3I({00000 LNkvXXu0mjf*W7{v literal 0 HcmV?d00001 diff --git a/images/miningxmr@2x.png b/images/miningxmr@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..aff06b4dd7f6835051695904bd415eeab7a8b981 GIT binary patch literal 2713 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 700 && !isAndroid) ? false : true + property bool isMining: false property var cameraUi property bool remoteNodeConnected: false property bool androidCloseTapped: false; diff --git a/pages/Mining.qml b/pages/Mining.qml index d6ce5e61..7d9896fb 100644 --- a/pages/Mining.qml +++ b/pages/Mining.qml @@ -241,6 +241,7 @@ Rectangle { updateStatusText() startSoloMinerButton.enabled = !walletManager.isMining() stopSoloMinerButton.enabled = !startSoloMinerButton.enabled + appWindow.isMining = walletManager.isMining() } MoneroComponents.StandardDialog { diff --git a/pages/Transfer.qml b/pages/Transfer.qml index bcb23d07..1dfbfcfd 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -660,6 +660,8 @@ Rectangle { // Light wallet is always ready pageRoot.enabled = true; root.warningContent = ""; + // check if daemon was already mining and add mining logo if true + middlePanel.miningView.update(); } } } diff --git a/pages/settings/Settings.qml b/pages/settings/Settings.qml index 5aabcccd..9c96c7de 100644 --- a/pages/settings/Settings.qml +++ b/pages/settings/Settings.qml @@ -46,6 +46,7 @@ ColumnLayout { Clipboard { id: clipboard } property bool viewOnly: false property int settingsHeight: 900 + property alias settingsStateViewState: settingsStateView.state Navbar{} diff --git a/qml.qrc b/qml.qrc index 74f100ca..167070dd 100644 --- a/qml.qrc +++ b/qml.qrc @@ -226,6 +226,8 @@ images/settings_navbar_side_active.png images/settings_local.png components/WarningBox.qml + images/miningxmr.png + images/miningxmr@2x.png images/eyeHide.png images/eyeShow.png