diff --git a/LeftPanel.qml b/LeftPanel.qml index 51d0d70d..d9df22da 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -573,9 +573,11 @@ Rectangle { id: networkStatus anchors.left: parent.left anchors.right: parent.right + anchors.leftMargin: 4 + anchors.rightMargin: 4 anchors.bottom: (progressBar.visible)? progressBar.top : parent.bottom; connected: Wallet.ConnectionStatus_Disconnected - height: 40 * scaleRatio + height: progressBar.visible ? 40 * scaleRatio : 60 * scaleRatio } ProgressBar { @@ -595,6 +597,8 @@ Rectangle { anchors.bottom: parent.bottom syncType: qsTr("Daemon") visible: networkStatus.connected + anchors.leftMargin: 4 * scaleRatio + anchors.rightMargin: 4 * scaleRatio height: 62 * scaleRatio } } // menuRect diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml index c7950636..984ffd03 100644 --- a/components/NetworkStatusItem.qml +++ b/components/NetworkStatusItem.qml @@ -35,20 +35,6 @@ Rectangle { color: "transparent" property var connected: Wallet.ConnectionStatus_Disconnected - function getConnectionStatusImage(status) { - if (status == Wallet.ConnectionStatus_Connected) - return "../images/lightning.png" - else - return "../images/statusDisconnected.png" - } - - function getConnectionStatusColor(status) { - if (status == Wallet.ConnectionStatus_Connected) - return "white" - else - return "#AAAAAA" - } - function getConnectionStatusString(status) { if (status == Wallet.ConnectionStatus_Connected) { if(!appWindow.daemonSynced) @@ -72,13 +58,27 @@ Rectangle { anchors.top: parent.top width: 40 * scaleRatio height: 40 * scaleRatio + opacity: { + if(item.connected == Wallet.ConnectionStatus_Connected){ + return 1 + } else { + return 0.5 + } + } Image { anchors.top: parent.top anchors.topMargin: 6 anchors.right: parent.right anchors.rightMargin: 11 - source: getConnectionStatusImage(item.connected) + source: { + if(item.connected == Wallet.ConnectionStatus_Connected){ + return "../images/lightning.png" + } else { + return "../images/lightning-white.png" + } + } + //getConnectionStatusImage(item.connected) } } @@ -108,7 +108,7 @@ Rectangle { anchors.topMargin: 14 font.family: Style.fontMedium.name font.pixelSize: 20 * scaleRatio - color: getConnectionStatusColor(item.connected) + color: "white" text: getConnectionStatusString(item.connected) + translationManager.emptyString } } diff --git a/images/lightning-white.png b/images/lightning-white.png new file mode 100644 index 00000000..ae1d6fc9 Binary files /dev/null and b/images/lightning-white.png differ diff --git a/images/moneroIcon-28x28.png b/images/moneroIcon-28x28.png new file mode 100644 index 00000000..4ef14fd1 Binary files /dev/null and b/images/moneroIcon-28x28.png differ diff --git a/qml.qrc b/qml.qrc index 25c50f86..84c2f6c3 100644 --- a/qml.qrc +++ b/qml.qrc @@ -187,5 +187,7 @@ components/InlineButton.qml images/lightning.png images/leftPanelBg.jpg + images/moneroIcon-28x28.png + images/lightning-white.png