Index: sources/gui/qml/pages/treatment/TreatmentTrends.qml =================================================================== diff -u -raacca8cc53f5e4ff5abb6d7df3d5ad48c915645c -r0bb5f08eb3570de6bff3ce67ca502db129b59096 --- sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision aacca8cc53f5e4ff5abb6d7df3d5ad48c915645c) +++ sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision 0bb5f08eb3570de6bff3ce67ca502db129b59096) @@ -49,8 +49,8 @@ component Header: Rectangle { id: _header objectName : "_header" - property alias label : _labelText.text - property alias labelFontWeight : _labelText.font.weight + property alias label : _text.text + property alias labelFontWeight : _text.font.weight height : _private.topHeaderHeight radius : 10 color : Colors.treatmentSectionHeader @@ -67,8 +67,8 @@ } } - Text { id: _labelText - objectName : "_labelText" + Text { id: _text + objectName : "_text" anchors { left : parent.left leftMargin : Variables.defaultMargin @@ -152,8 +152,8 @@ } } - Rectangle { id: _horizontalDivider - objectName : "_horizontalDivider" + Rectangle { id: _divider + objectName : "_divider" anchors { bottom : parent.bottom left : parent.left @@ -441,7 +441,7 @@ } } - ScrollBar2 { id: _scrollbar + ScrollBarVH { id: _scrollbar objectName: "_scrollbar" anchors { bottom : parent.bottom @@ -452,7 +452,7 @@ rightMargin : Variables.defaultMargin } height : 5 - direction : ScrollBar2.Horizontal + direction : ScrollBarVH.Horizontal scrollColor : "#606060" flickable : _paramList opacity : _paramList.count > _paramList.visibleParamCount @@ -675,7 +675,7 @@ onModelCountChanged: { positionViewAtBeginning() } } - ScrollBar2 { id: _historyScrollbar + ScrollBarVH { id: _historyScrollbar objectName: "_historyScrollbar" anchors { top : _historyList.top @@ -685,7 +685,7 @@ } width : 5 scrollColor : "#606060" - direction : ScrollBar2.Vertical + direction : ScrollBarVH.Vertical flickable : _historyList opacity : _historyList.contentHeight > _historyList.height || _historyList.flicking || _historyList.dragging ? 1 : 0