From 7922cb3034b3717716181dcc7083abdb9bd1d283 Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Tue, 16 Jun 2015 14:14:31 +0200 Subject: [PATCH] adds styling for a regular progressbar Commits to #44 --- resources/themes/cura/styles.qml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index 43bbb8c400..1f87538d30 100644 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -152,7 +152,30 @@ QtObject { } - property Component progressbar: Component{ + property Component progressbar_regular: Component{ + ProgressBarStyle { + background: Rectangle { + implicitWidth: UM.Theme.sizes.progressbar.width + implicitHeight: UM.Theme.sizes.progressbar.height + color: "transparent" + Item { + anchors.fill: parent + UM.AngledCornerRectangle { + cornerSize: UM.Theme.sizes.progressbar_control.height + color: UM.Theme.colors.progressbar_background + width: UM.Theme.sizes.progressbar.width + height: UM.Theme.sizes.progressbar.height + } + } + } + progress: UM.AngledCornerRectangle { + cornerSize: UM.Theme.sizes.progressbar_control.height + color: UM.Theme.colors.progressbar_control + } + } + } + + property Component progressbar_indeterminate: Component{ ProgressBarStyle { background: UM.AngledCornerRectangle { anchors.fill: parent @@ -168,7 +191,6 @@ QtObject { color: UM.Theme.colors.progressbar_background Item { anchors.fill: parent - anchors.margins: UM.Theme.sizes.progressbar_margin.width visible: control.indeterminate Row { Repeater {