Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rea51c0546c7061d225e7b9d8b754554c65f0d1b1 -r6f1f6a13eaa0453c86f37b878d891ac535d40932 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision ea51c0546c7061d225e7b9d8b754554c65f0d1b1) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 6f1f6a13eaa0453c86f37b878d891ac535d40932) @@ -201,6 +201,13 @@ readonly property int noRejectReason : 0 + readonly property int textBoxRadius : 5 + readonly property int textBoxBorderWidth : 2 + readonly property int adjustmentDialogWidth : applicationWidth * 0.7 + readonly property int adjustmentDialogHeight : applicationHeight * 0.7 + readonly property int adjustmentHeaderHeight : 100 + readonly property int adjustmentButtonMargin : 30 + // ---------- < PRS > Related Section ---------- // blood flow rate readonly property int bloodFlowMin : 100 // PRS 30 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -r89f5f4202db6669435cbed004a2cf3850602d29e -r6f1f6a13eaa0453c86f37b878d891ac535d40932 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 89f5f4202db6669435cbed004a2cf3850602d29e) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 6f1f6a13eaa0453c86f37b878d891ac535d40932) @@ -40,21 +40,33 @@ signal confirmClicked() signal backClicked() + width: Variables.adjustmentDialogWidth + height: Variables.adjustmentDialogHeight y: Math.round((Variables.applicationHeight - height) / 2) - Variables.headerHeight onVisibleChanged: { notificationText = "" } header: Item { id : _headerRect - implicitHeight: 120 + implicitHeight: Variables.adjustmentHeaderHeight // TODO: remove ConfirmButton later once it is moved out into screens that inherit this ConfirmButton { id : _confirmButton + anchors { + right: parent.right + verticalCenter: _backButton.verticalCenter + margins: Variables.adjustmentButtonMargin + } visible: _root.confirmVisible onClicked : confirmClicked() } BackButton { id : _backButton + anchors { + top: parent.top + left: parent.left + margins: Variables.adjustmentButtonMargin + } visible: _root.backVisible onClicked : backClicked() } @@ -63,18 +75,24 @@ text: titleText font { pixelSize: Fonts.fontPixelTitle - weight: Font.Medium + weight: Font.DemiBold } color: Colors.textMain - height: Variables.mainMenuHeight + width: contentWidth + height: contentHeight anchors { - top: parent.top + bottom: parent.bottom horizontalCenter: parent.horizontalCenter - margins: 35 + margins: Variables.defaultMargin } } CloseButton { id : _closeButton + anchors { + right: parent.right + verticalCenter: _backButton.verticalCenter + margins: Variables.adjustmentButtonMargin + } visible: _root.closeVisible onClicked : { closeClicked()