Index: sources/gui/qml/components/LabelValue.qml =================================================================== diff -u -rab7efbd73d4a4c0a0a10886629f9a5975ca08315 -r7805806e4370be4d9207872e916f478875bd4ba6 --- sources/gui/qml/components/LabelValue.qml (.../LabelValue.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315) +++ sources/gui/qml/components/LabelValue.qml (.../LabelValue.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) @@ -11,29 +11,58 @@ property string topTextColor : Colors.textTextRectLabel property alias topTextFont : _topText.font + property string centerText : "" + property bool showCenterText : false + property bool leftAlign : false + property string bottomText : "" property string bottomTextColor : Colors.textTextRectLabel + property alias bottomTextFont : _bottomText.font + property string unitText : "" + clip: false Text { id: _topText anchors { top: parent.top - horizontalCenter: parent.horizontalCenter + left: leftAlign ? parent.left: undefined + horizontalCenter: leftAlign ? undefined : parent.horizontalCenter } - text: _root.topText color: topTextColor font.pixelSize: Fonts.fontPixelTextRectLabel } + Text { id: _centerText + anchors { + top : _topText.bottom + left : _topText.left + } + text: _root.centerText + color: topTextColor + font.pixelSize: 20 + } + Text { id: _bottomText anchors { - top: _topText.bottom - horizontalCenter: _topText.horizontalCenter + top: showCenterText ? _centerText.bottom :_topText.bottom + horizontalCenter: leftAlign ? undefined : _topText.horizontalCenter } text: _root.bottomText color: bottomTextColor font.pixelSize: Fonts.fontPixelTextRectExtra } + + Text { id: _unitText + anchors { + left: _bottomText.right + leftMargin: 5 + bottom: _bottomText.bottom + bottomMargin: 10 + } + text: _root.unitText + color: topTextColor + font.pixelSize: 22 + } }