From 3245d7d860ab050efc27638edabbb052b1c7d4fd Mon Sep 17 00:00:00 2001 From: Jaquee Date: Wed, 23 Nov 2016 21:19:19 +0100 Subject: [PATCH] redesign daemon progress bar to fit smaller screens --- components/DaemonProgress.qml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/components/DaemonProgress.qml b/components/DaemonProgress.qml index 1ed533e3..dd6c24ac 100644 --- a/components/DaemonProgress.qml +++ b/components/DaemonProgress.qml @@ -26,13 +26,13 @@ // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import QtQuick 2.0 +import QtQuick 2.6 Item { id: item property int fillLevel: 0 - height: 44 - anchors.margins: 10 + height: 22 + anchors.margins:15 visible: false //clip: true @@ -56,7 +56,7 @@ Item { anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top - height: 18 + height: 22 //radius: 4 color: "#FFFFFF" @@ -66,25 +66,28 @@ 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") + Text { + id:progressText + anchors.bottom: parent.bottom + font.family: "Arial" + font.pixelSize: 12 + leftPadding: 8 + color: "#000" + height: 18 + verticalAlignment: Text.alignVCenter + text: qsTr("Synchronizing blocks") + } } }