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-16 15:58:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1289

Browse source 
791c267 fix Leftpanel overlay
This commit is contained in:
luigi1111 2018-04-22 19:59:43 -05:00
commit c94ed65700
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
LeftPanel.qml
View file

@ -252,7 +252,9 @@ Rectangle {
Flickable {
id:flicker
contentHeight: 500 * scaleRatio
contentHeight: (progressBar.visible)? menuColumn.height + separator.height +
networkStatus.height + progressBar.height + daemonProgressBar.height :
menuColumn.height + separator.height + networkStatus.height
anchors.fill: parent
clip: true
@ -568,15 +570,26 @@ Rectangle {
} // Flickable
Rectangle {
id: separator
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 0
anchors.rightMargin: 0
anchors.bottom: networkStatus.top;
height: 10 * scaleRatio
color: "black"
}
NetworkStatusItem {
id: networkStatus
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 4
anchors.rightMargin: 4
anchors.leftMargin: 0
anchors.rightMargin: 0
anchors.bottom: (progressBar.visible)? progressBar.top : parent.bottom;
connected: Wallet.ConnectionStatus_Disconnected
height: 58 * scaleRatio
height: 48 * scaleRatio
}
ProgressBar {
@ -584,7 +597,7 @@ Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: daemonProgressBar.top
height: 35 * scaleRatio
height: 48 * scaleRatio
syncType: qsTr("Wallet")
visible: networkStatus.connected
}

2
components/NetworkStatusItem.qml
View file

@ -34,7 +34,7 @@ import "../components" as MoneroComponents
Rectangle {
id: item
color: "transparent"
color: "black"
property var connected: Wallet.ConnectionStatus_Disconnected
function getConnectionStatusString(status) {

2
components/ProgressBar.qml
View file

@ -37,7 +37,7 @@ Rectangle {
property string syncType // Wallet or Daemon
property string syncText: qsTr("%1 blocks remaining: ").arg(syncType)
visible: false
color: "transparent"
color: "black"
function updateProgress(currentBlock,targetBlock, blocksToSync, statusTxt){
if(targetBlock > 0) {