Index: sources/gui/qml/compounds/BPHREntry.qml =================================================================== diff -u -rb07595ece768d4093d78ca1ef068a993ff4f70a3 -r596aa427447d3757005ae759c64c52ebb26b9503 --- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision b07595ece768d4093d78ca1ef068a993ff4f70a3) +++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 596aa427447d3757005ae759c64c52ebb26b9503) @@ -31,8 +31,10 @@ property alias diastolic : _bloodPressureDiastolic.text property alias heartRate : _heartRate.text - readonly property int controlWidth : width - Variables.defaultMargin * 4 + + readonly property int controlWidth : width - ( contentPadding * 2 ) readonly property int controlHeight : 75 + readonly property int contentPadding : Variables.defaultMargin * 7 readonly property bool isValid : _bloodPressureSystolic .isValid @@ -43,15 +45,14 @@ width : _container.width height : _container.height - anchors.fill: parent QtObject { id: _private property bool isBloodPressureCompareValid : (parseInt(_bloodPressureDiastolic.text) <= parseInt(_bloodPressureSystolic.text)) } Column { id: _container spacing : 15 - leftPadding : Variables.defaultMargin * 2 + leftPadding : _root.contentPadding anchors.fill : parent LabelUnitContainer { id: _bpContainer @@ -117,6 +118,7 @@ textInput.font.pixelSize : Fonts.fontPixelValueControl line.visible : false validator : IntValidator { bottom: vTreatmentVitals.heartRateMin; top : vTreatmentVitals.heartRateMax } + nextInput : _bloodPressureSystolic useQtNumPad : false showPlaceHolderText : true Index: sources/gui/qml/compounds/NumPad.qml =================================================================== diff -u -rb07595ece768d4093d78ca1ef068a993ff4f70a3 -r596aa427447d3757005ae759c64c52ebb26b9503 --- sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision b07595ece768d4093d78ca1ef068a993ff4f70a3) +++ sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision 596aa427447d3757005ae759c64c52ebb26b9503) @@ -123,11 +123,11 @@ Text { id: _title anchors { top : _root.top - topMargin : Variables.defaultMargin + topMargin : Variables.defaultMargin * 2.5 horizontalCenter: _root.horizontalCenter } font { - pixelSize : 26 + pixelSize : Fonts.fontPixelSection weight : Font.Medium } color : "white" @@ -140,7 +140,7 @@ horizontalCenter: parent.horizontalCenter } font { - pixelSize : 20 + pixelSize : 22 weight : Font.Medium } color : "#E0CDA9" @@ -152,8 +152,8 @@ topMargin : Variables.defaultMargin horizontalCenter: _root.horizontalCenter } - width : 300 - height : 75 + width : _root.width * 0.70 + height : 90 radius : 10 color : "#324867" @@ -185,7 +185,7 @@ top : _numRect.bottom topMargin : 5 } - font.pixelSize : 18 + font.pixelSize : 20 color : "white" } @@ -194,13 +194,13 @@ left : _root.left right : _root.right bottom : _root.bottom - margins : _numRect.visible ? 20 : 70 + margins : Variables.defaultMargin * 2 } columns : 3 columnSpacing : 2 rows : 4 rowSpacing : 2 - height : 275 + height : _root.height * 0.50 property bool replaceValueText: true property int cellWidth : _numPadGrid.width / columns @@ -215,19 +215,32 @@ delegate: Button { id: _keyButton width : _numPadGrid.cellWidth height : _numPadGrid.cellHeight - palette.buttonText : enabled ? "white" : "dimgrey" text : modelData === backSpace ? "" : modelData icon.source : modelData === backSpace ? modelData : "" - icon.width : 40 - icon.height : 40 + icon.height : 45 + icon.width : 45 enabled : modelData === "." ? precision > 0 : true - font.pixelSize : 30 - background: Rectangle { id: _keyBackground - color : _keyButton.pressed ? Colors.backgroundButtonSelectDark : - modelData === backSpace ? Qt.darker ("#263B57", 1.05) : - "#263B57" - } + contentItem: Rectangle { + anchors.fill : parent + color : _keyButton.pressed ? Colors.backgroundButtonSelectDark : + modelData === backSpace ? Qt.darker ("#263B57", 1.05) : + "#263B57" + Image { + anchors.centerIn: parent + source : _keyButton.icon.source + width : _keyButton.icon.width + height : _keyButton.icon.height + fillMode : Image.PreserveAspectFit + } + Text { + anchors.centerIn: parent + text : _keyButton.text + font.pixelSize : 40 + color : enabled ? "white" : "dimgrey" + } + } + onPressed: { if (modelData === backSpace ) { _numPadGrid.replaceValueText = false Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rb07595ece768d4093d78ca1ef068a993ff4f70a3 -r596aa427447d3757005ae759c64c52ebb26b9503 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision b07595ece768d4093d78ca1ef068a993ff4f70a3) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 596aa427447d3757005ae759c64c52ebb26b9503) @@ -118,8 +118,8 @@ readonly property int sliderCircleDiameter : 30 readonly property int pressuresProgressbarWidth : 725 - readonly property int numPadHeight : 545 - readonly property int numPadWidth : 450 + readonly property int numPadHeight : 675 + readonly property int numPadWidth : 525 readonly property int gridSelectionButtonHeight : 100 readonly property int gridSelectionButtonWidth : 375 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -r477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2 -r596aa427447d3757005ae759c64c52ebb26b9503 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 596aa427447d3757005ae759c64c52ebb26b9503) @@ -29,7 +29,8 @@ ModalDialog { id: _root contentItem.objectName: "TreatmentAdjustmentBase" //SquishQt testability - property string titleText: "" + property string titleText : "" + property alias titlePixelSize : _titleText.font.pixelSize property bool closeVisible: true property bool confirmVisible: false Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -rb07595ece768d4093d78ca1ef068a993ff4f70a3 -r596aa427447d3757005ae759c64c52ebb26b9503 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision b07595ece768d4093d78ca1ef068a993ff4f70a3) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 596aa427447d3757005ae759c64c52ebb26b9503) @@ -24,13 +24,17 @@ TreatmentAdjustmentBase { id: _root contentItem.objectName: "TreatmentAdjustmentVitals" titleText : qsTr("VITALS") + titlePixelSize : Fonts.fontPixelSection height : Variables.numPadHeight - width : 850 + width : 1000 x : numPad.isOpened ? Math.round((Variables.applicationWidth - width) / 2) - 200 : Math.round((Variables.applicationWidth - width) / 2) notification.textfontSize: 20 notification.visible: vTreatmentVitals.lastRead || vTreatmentAdjustmentVitals.adjustment_ReasonText + readonly property int buttonHeight : 65 + readonly property int buttonWidth : 200 + readonly property string intervalTextString : qsTr("Interval:" ) + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("OFF")) + " , " @@ -67,32 +71,25 @@ vTreatmentVitals.doSkip() } - BPHREntry { id: _bphrEntry } + BPHREntry { id: _bphrEntry + anchors { + fill: parent + topMargin: Variables.defaultMargin * 2 + } + } - Row { id: _buttonRow - spacing: Variables.defaultMargin * 4 + Column { id: _buttonRow + spacing: Variables.defaultMargin anchors { bottom : _root.contentItem.bottom - bottomMargin : notification.visible ? Variables.defaultMargin * 4.5 : Variables.defaultMargin * 2 + bottomMargin : notification.visible ? Variables.defaultMargin * 4.5 : Variables.defaultMargin * 3 horizontalCenter: _root.contentItem.horizontalCenter } - TouchRect { id : _requestButton - width : Variables.confirmButtonWidth - height : Variables.contentHeight - isDefault : true - - text { - text : qsTr("REQUEST") - font.bold : true - font.pixelSize : Fonts.fontPixelConfirm - } - - onClicked: vTreatmentAdjustmentVitals.doRequest() - } - ConfirmButton { id : _confirmButton + width : _root.buttonWidth + height : _root.buttonHeight enabled : _bphrEntry.isValid anchors { @@ -107,6 +104,20 @@ } } + TouchRect { id : _requestButton + width : _root.buttonWidth + height : _root.buttonHeight + isDefault : true + + text { + text : qsTr("MEASURE VITALS") + font.bold : true + font.pixelSize : Fonts.fontPixelConfirm + } + + onClicked: vTreatmentAdjustmentVitals.doRequest() + } + Behavior on anchors.bottomMargin { NumberAnimation { duration: 300} } }