Index: sources/gui/qml/pages/treatment/TreatmentSection.qml =================================================================== diff -u -r93b7d7da5dea9e0392e139b59117eb0315d6c343 -r6c3a4b048006ebd90c85cfa943d2b9615dc808f3 --- sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision 93b7d7da5dea9e0392e139b59117eb0315d6c343) +++ sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision 6c3a4b048006ebd90c85cfa943d2b9615dc808f3) @@ -26,15 +26,17 @@ property alias contentArea : _contentArea property bool enableDropShadow: true - signal editClicked - signal lockClicked + signal editClicked() + signal lockClicked() + signal expandingClicked() color: Colors.treatmentSectionMain radius: 15 TreatmentSectionHeader { id: _header - onEditClicked : _root.editClicked() - onLockClicked : _root.lockClicked() + onEditClicked : _root.editClicked() + onLockClicked : _root.lockClicked() + onExpandingClicked : _root.expandingClicked() } ContentArea { id : _contentArea Index: sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml =================================================================== diff -u -rec9c06478bddf4cadf546aa4a49bb18b224f3b50 -r6c3a4b048006ebd90c85cfa943d2b9615dc808f3 --- sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50) +++ sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision 6c3a4b048006ebd90c85cfa943d2b9615dc808f3) @@ -24,11 +24,14 @@ property bool editEnabled : true property bool showLock : false property bool showEdit : true + property bool showExpanding : false + property int titleLeftMargin: Variables.defaultMargin * 2 property bool setEditActive : true // set to disable edit no matter what - signal editClicked - signal lockClicked + signal editClicked() + signal lockClicked() + signal expandingClicked() color : Colors.treatmentSectionHeader height : Variables.contentHeight + (Variables.defaultMargin * 2) @@ -58,6 +61,20 @@ color: Colors.textTextRectLabel } + ArrowButton {id : _expandingArrows + objectName : "expandingArrows" + + anchors { + verticalCenter : _title.verticalCenter + right : _editButton.left + rightMargin : Variables.defaultMargin * 2 + } + iconSize : Variables.iconButtonSize + visible : showExpanding + expandingArrow : true + onClicked : _root.expandingClicked() + } + IconButton { id : _lockButton anchors { verticalCenter : _title.verticalCenter Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -rf723048b0efe2edf7cb08b9bba2ef67c55917503 -r6c3a4b048006ebd90c85cfa943d2b9615dc808f3 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 6c3a4b048006ebd90c85cfa943d2b9615dc808f3) @@ -45,15 +45,18 @@ property int tmpPressure : vTreatmentPressureOcclusion.tmpPressure header.title : qsTr("Pressures") + " (" + qsTr("mmHg") + ")" + header.showExpanding : true contentArea.anchors.topMargin : Variables.defaultMargin + onExpandingClicked : vTreatmentAdjustmentPressuresWidening.doAdjustment() + function checkMinimum (minimum, lowerBound) { return lowerBound < minimum ? lowerBound : minimum } function checkMaximum (maximum, upperBound) { return upperBound > maximum ? upperBound : maximum } contentItem: Column { id: _column property int cellHeight : Variables.contentHeight / 3 - property int cellWidth : contentItem.width * 0.75 + property int cellWidth : contentItem.width * 0.9 spacing : Variables.defaultMargin * 4 topPadding : Variables.defaultMargin @@ -99,19 +102,4 @@ pressure : _root.tmpPressure } } - - ArrowButton {id : _expandingArrows - objectName : "expandingArrows" - - anchors { - top : header.bottom - topMargin : Variables.defaultMargin - right : parent.right - rightMargin : Variables.defaultMargin - } - - expandingArrow : true - - onClicked : vTreatmentAdjustmentPressuresWidening.doAdjustment() - } }