Index: sources/gui/qml/components/StepBullet.qml =================================================================== diff -u -reefe8acbe5b10deb379c5e4ceabeaa95d429410e -r725cf5096e9664a0b6b1c4e4e902d1673bd976a9 --- sources/gui/qml/components/StepBullet.qml (.../StepBullet.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) +++ sources/gui/qml/components/StepBullet.qml (.../StepBullet.qml) (revision 725cf5096e9664a0b6b1c4e4e902d1673bd976a9) @@ -26,18 +26,19 @@ * \brief A filled circle with text below it, used to build a step-by-step progress indicator */ Item { id: _root + readonly property color color : _circle.border.color + property string text : "" + property bool complete : false + property bool current : false + property color colorComplete : Colors.borderButton + property color colorInComplete : Colors.borderDisableButton + QtObject { id: _private - readonly property real diameter : _root.active ? 15 : 10 + readonly property real diameter : 15 + } - readonly property color color : _circle.color - - property string text : "" - property bool active : false - property color colorActive : Colors.createTreatmentActive - property color colorInactive : Colors.createTreatmentInactive - height : 35 width : _private.diameter @@ -49,7 +50,9 @@ height : _private.diameter width : _private.diameter radius : _private.diameter - color : _root.active ? _root.colorActive : _root.colorInactive + color : _root.current ? Colors.transparent : _root.complete ? _root.colorComplete : Colors.transparent + border.color: _root.current ? colorComplete : _root.complete ? _root.colorComplete : _root.colorInComplete + border.width: 2 } Text { id: _text @@ -59,7 +62,7 @@ horizontalCenter: _circle.horizontalCenter } text : _root.text - color : _root.active ? Colors.textMain : _root.colorInactive + color : _root.current ? Colors.textMain : _root.complete ? Colors.textMain : _root.colorInComplete } }