Index: sources/gui/qml/pages/ManagerStack.qml =================================================================== diff -u -r9782439f3b5c0f06e3eb31bfea9aea877abbdce4 -raafaecb45feeb45210f7f6ec46ff58eb07420e37 --- sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision 9782439f3b5c0f06e3eb31bfea9aea877abbdce4) +++ sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision aafaecb45feeb45210f7f6ec46ff58eb07420e37) @@ -113,129 +113,124 @@ ], ] - RxManagerList{ - anchors.top : _rxHeader.bottom - model: _dummy + Item{ + id: _listViewitem + anchors { + left : parent.left + right : parent.right + top : _rxHeader.bottom + } + height: parent.height - (Variables.mainMenuHeight + Variables.alarmDialogHeaderHeight) +// color: "green" + ListView{ + anchors.fill: _listViewitem + clip: true + spacing: Variables.defaultMargin + id: _listView + model: _dummy + delegate: _rxProfile + } } -// Item{ -// id: _listViewitem -// anchors { -// left : parent.left -// right : parent.right -// top : _rxHeader.bottom -// } -// height: parent.height - (Variables.mainMenuHeight + Variables.alarmDialogHeaderHeight) -//// color: "green" -// ListView{ -// anchors.fill: _listViewitem -// clip: true -// spacing: Variables.defaultMargin -// id: _listView -// model: _dummy -// delegate: _rxProfile -// } -// } -// Component { -// id: _rxProfile -// Rectangle { -// id: rxItem -// anchors { -// left : parent.left -// right : parent.right -// } -// height: 370 -// color: Colors.mainTreatmentLighterBlue -// radius: 5 -// required property string name -// required property string number -// required property int index -// required property string param1 -// required property string value1 -// required property string unit1 -// Column { -// id: _componentColumn + Component { + id: _rxProfile + Rectangle { + id: rxItem + anchors { + left : parent.left + right : parent.right + } + height: 370 + color: Colors.mainTreatmentLighterBlue + radius: 5 + required property string name + required property string number + required property int index + required property string param1 + required property string value1 + required property string unit1 + Column { + id: _componentColumn -// anchors { -// left : parent.left -// right : parent.right -// leftMargin: Variables.defaultMargin * 2 -// rightMargin: Variables.defaultMargin * 2 -// } -// Text { -// text: rxItem.name -// font.pointSize : Fonts.fontPixelButton * 1.4 -// width: parent.width -// horizontalAlignment: Text.AlignLeft -// color : Colors.pressuresText -// } -// Row { -// spacing: 5 -// width: parent.width -// anchors { -// left : _componentColumn.left -// } -// property int componentWidth: parent.width / 10 - 5 -// Repeater{ -// model: _managerHome.treatmentFields[rxItem.index] -// delegate: RxProfileComponent{ -//// id: _comp1 -// title : qsTr(modelData.title)//qsTr(rxItem.param1) -// height : 370 - (100 + Variables.defaultMargin * 2) -// width : parent.width / 10 - 5 -// value : modelData.value//rxItem.value1 -// unitText : modelData.units//rxItem.unit1 -// } -// } + anchors { + left : parent.left + right : parent.right + leftMargin: Variables.defaultMargin * 2 + rightMargin: Variables.defaultMargin * 2 + } + Text { + text: rxItem.name + font.pointSize : Fonts.fontPixelButton * 1.4 + width: parent.width + horizontalAlignment: Text.AlignLeft + color : Colors.pressuresText + } + Row { + spacing: 5 + width: parent.width + anchors { + left : _componentColumn.left + } + property int componentWidth: parent.width / 10 - 5 + Repeater{ + model: _managerHome.treatmentFields[rxItem.index] + delegate: RxProfileComponent{ +// id: _comp1 + title : qsTr(modelData.title)//qsTr(rxItem.param1) + height : 370 - (100 + Variables.defaultMargin * 2) + width : parent.width / 10 - 5 + value : modelData.value//rxItem.value1 + unitText : modelData.units//rxItem.unit1 + } + } -// Repeater { -// model: _managerHome.treatmentFields[rxItem.index] //10 -// delegate: -// Rectangle{ -// width: parent.width / 10 - 5 -// height: 370 - (100 + Variables.defaultMargin * 2) -// color: "green" -// } -// Column { -// anchors.centerIn: parent -// spacing: 2 + Repeater { + model: _managerHome.treatmentFields[rxItem.index] //10 + delegate: + Rectangle{ + width: parent.width / 10 - 5 + height: 370 - (100 + Variables.defaultMargin * 2) + color: "green" + } + Column { + anchors.centerIn: parent + spacing: 2 -// Text { -// text: modelData.title -// font.bold: true -// visible: modelData.title !== "" -// } + Text { + text: modelData.title + font.bold: true + visible: modelData.title !== "" + } -// Text { -// text: modelData.value -// font.pixelSize: 14 -// color: "white" -// visible: modelData.value !== "" -// } + Text { + text: modelData.value + font.pixelSize: 14 + color: "white" + visible: modelData.value !== "" + } -// Text { -// text: modelData.units -// font.pixelSize: 12 -// color: "lightgray" -// visible: modelData.units !== "" -// } -// } -// } -// } -// Text { -// text: 'Last Modified: ' + rxItem.number -// width: parent.width // Makes it stretch -// horizontalAlignment: Text.AlignRight -// font.pointSize : Fonts.fontPixelButton -// color : Colors.pressuresText -// } -// } -// } -// } + Text { + text: modelData.units + font.pixelSize: 12 + color: "lightgray" + visible: modelData.units !== "" + } + } + } + } + Text { + text: 'Last Modified: ' + rxItem.number + width: parent.width // Makes it stretch + horizontalAlignment: Text.AlignRight + font.pointSize : Fonts.fontPixelButton + color : Colors.pressuresText + } + } + } + } // PlaceHolderText {screenName: qsTr("Rx Profiles")} -// } - } + } onVisibleChanged: { if (visible) {