diff --git a/components/DaemonProgress.qml b/components/DaemonProgress.qml index 1ed533e3..5fac2079 100644 --- a/components/DaemonProgress.qml +++ b/components/DaemonProgress.qml @@ -31,8 +31,8 @@ import QtQuick 2.0 Item { id: item property int fillLevel: 0 - height: 44 - anchors.margins: 10 + height: 22 + anchors.margins:15 visible: false //clip: true @@ -42,7 +42,6 @@ Item { fillLevel = progressLevel console.log("target block: ",progressLevel) progressText.text = qsTr("Synchronizing blocks %1/%2").arg(currentBlock.toFixed(0)).arg(targetBlock.toFixed(0)); - console.log("Progress text: " + progressText.text); // TODO: lower daemon block height cache, ttl and refresh interval? @@ -56,8 +55,8 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - height: 18 - //radius: 4 + height: 22 + radius: 2 color: "#FFFFFF" Rectangle { @@ -66,25 +65,33 @@ Item { anchors.bottom: parent.bottom anchors.left: parent.left anchors.margins: 2 + height: bar.height property int maxWidth: parent.width - 4 width: (maxWidth * fillLevel) / 100 - color: { - if(item.fillLevel < 99) return "#FF6C3C" + if(item.fillLevel < 99 ) return "#FF6C3C" //if(item.fillLevel < 99) return "#FFE00A" return "#36B25C" } } - } - Text { - id:progressText - anchors.bottom: parent.bottom - font.family: "Arial" - font.pixelSize: 12 - color: "#545454" - text: qsTr("Synchronizing blocks") + Rectangle { + color:"#333" + anchors.bottom: parent.bottom + anchors.left: parent.left + anchors.leftMargin: 8 + + Text { + id:progressText + anchors.bottom: parent.bottom + font.family: "Arial" + font.pixelSize: 12 + color: "#000" + text: qsTr("Synchronizing blocks") + height:18 + } + } } } diff --git a/components/MenuButton.qml b/components/MenuButton.qml index 95790662..50238bd8 100644 --- a/components/MenuButton.qml +++ b/components/MenuButton.qml @@ -36,7 +36,7 @@ Rectangle { property alias symbol: symbolText.text signal clicked() - height: 64 + height: (appWindow.height >= 800) ? 64 : 60 color: checked ? "#FFFFFF" : "#1C1C1C" Item { diff --git a/main.qml b/main.qml index 5f28e415..0293b806 100644 --- a/main.qml +++ b/main.qml @@ -954,7 +954,7 @@ ApplicationWindow { } property int maxWidth: leftPanel.width + 655 + rightPanel.width - property int maxHeight: 700 + property int minHeight: 720 MouseArea { id: resizeArea hoverEnabled: true @@ -991,9 +991,9 @@ ApplicationWindow { appWindow.width -= dx else appWindow.width = parent.maxWidth - if(appWindow.height - dy > parent.maxHeight) + if(appWindow.height - dy > parent.minHeight) appWindow.height -= dy - else appWindow.height = parent.maxHeight + else appWindow.height = parent.minHeight previousPosition = pos } }