Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r72550dbbd6db8eab40aad38956b32f99416600c8 --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 72550dbbd6db8eab40aad38956b32f99416600c8) @@ -73,12 +73,13 @@ } Text { id: _loggedInUser - color : Colors.textMain + color : Colors.mainTreatmentOrange anchors.top : parent.top anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment : Text.AlignHCenter verticalAlignment : Text.AlignVCenter font.pixelSize : Fonts.fontHeaderbarUser + font.weight : Font.DemiBold } Text { id: _title Index: sources/gui/qml/compounds/BPHREntry.qml =================================================================== diff -u -r7a1dcc43829f3e6435064abf93b55ffb012a8697 -r72550dbbd6db8eab40aad38956b32f99416600c8 --- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 7a1dcc43829f3e6435064abf93b55ffb012a8697) +++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 72550dbbd6db8eab40aad38956b32f99416600c8) @@ -74,8 +74,9 @@ top : parent.top topMargin : Variables.defaultMargin / 2 } - - source: "qrc:/images/iVitalsRed" + sourceSize.width : Variables.notificationBarIconHeight + sourceSize.height : Variables.notificationBarIconHeight + source : "qrc:/images/iVitalsRed" } LabelValue { id: _bloodPressure @@ -85,9 +86,9 @@ top : parent.top } height : parent.height / 3 - width : parent.width / 5 - topTextFont.pixelSize : Fonts.fontPixelTitle - topTextFont.weight : Font.Medium + width : parent.width / 6 + topTextFont.pixelSize : Fonts.fontHeaderbarTitle + topTextFont.weight : Font.Bold topText : Variables.notSetVariable(vTreatmentVitals.systolic, 2) + "/" + Variables.notSetVariable(vTreatmentVitals.diastolic, 2) bottomText : Variables.unitTextBloodPressure bottomTextFont.pixelSize: Fonts.fontPixelContainerUnitSmall @@ -100,9 +101,9 @@ top : parent.top } height : parent.height / 3 - width : parent.width / 5 - topTextFont.pixelSize : Fonts.fontPixelTitle - topTextFont.weight : Font.Medium + width : parent.width / 6 + topTextFont.pixelSize : Fonts.fontHeaderbarTitle + topTextFont.weight : Font.Bold topText : Variables.notSetVariable(vTreatmentVitals.heartRate, 2) bottomText : Variables.unitTextHeartBeat bottomTextFont.pixelSize: Fonts.fontPixelContainerUnitSmall @@ -136,7 +137,7 @@ Text { id: _intervalText font.pixelSize : Fonts.fontPixelTouchAreaTitle - font.weight : Font.Light + font.weight : Font.Normal font.italic : true verticalAlignment : Text.AlignBottom color : Colors.offWhite @@ -147,8 +148,9 @@ Row { id: _lastRecordedRow anchors { - bottom : parent.bottom - left : parent.left + bottom : parent.bottom + bottomMargin: Variables.defaultMargin / 2 + left : parent.left } spacing: 5 @@ -164,7 +166,7 @@ Text { id: _lastRecordedText font.pixelSize : Fonts.fontPixelTouchAreaTitle - font.weight : Font.Light + font.weight : Font.Normal font.italic : true verticalAlignment : Text.AlignBottom color : Colors.offWhite Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r8f6ecb60abf6d47d4554cfd3019ca496d79b6f69 -r72550dbbd6db8eab40aad38956b32f99416600c8 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 8f6ecb60abf6d47d4554cfd3019ca496d79b6f69) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 72550dbbd6db8eab40aad38956b32f99416600c8) @@ -37,6 +37,7 @@ readonly property color lightModeAutoStep : "#3682ED" readonly property color darkModeAlarmStopState : "#304053" readonly property color lightModeAlarmStopState : "#FFECEC" + readonly property color darkModeAutoStep : "#DF9101" readonly property color separatorLine : "#5f809d" readonly property color backgroundMain : "#1A344D" //// ----- @LEAHIZED Index: sources/gui/qml/main.qml =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r72550dbbd6db8eab40aad38956b32f99416600c8 --- sources/gui/qml/main.qml (.../main.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/qml/main.qml (.../main.qml) (revision 72550dbbd6db8eab40aad38956b32f99416600c8) @@ -342,7 +342,7 @@ readonly property color modeBackgroundColor : vSettings.darkMode ? Colors.panelBackground : Colors.offWhite readonly property color modeBackgroundDialogColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite readonly property color modeSelctedColor : vSettings.darkMode ? Colors.darkModeSelect : Colors.lightModeSelect - readonly property color modeAutoStepColor : vSettings.darkMode ? Colors.statusTextPaused : Colors.lightModeAutoStep + readonly property color modeAutoStepColor : vSettings.darkMode ? Colors.darkModeAutoStep : Colors.lightModeAutoStep readonly property color modeAutoStepProgressColor : vSettings.darkMode ? Colors.borderButton : Colors.statusTextPaused readonly property color modeTextColor : vSettings.darkMode ? Colors.offWhite : Colors.backgroundMainMenu readonly property color modeButtonColor : vSettings.darkMode ? Colors.borderButton : Colors.backgroundMainMenu Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r72550dbbd6db8eab40aad38956b32f99416600c8 --- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision 72550dbbd6db8eab40aad38956b32f99416600c8) @@ -49,9 +49,9 @@ if (visible) { rebuildMap() _mainMenu.hidden = true - _headerBar.activeStack = stackView + _headerBar.activeStack = vSettings.advancedMode ? _pretreatmentInstallation.stackView : stackView _root.stackStepIndex = 0 - _headerBar.userMode = vSettings.advancedMode ? qsTr("[Advanced]") : "" + _headerBar.userMode = vSettings.advancedMode ? qsTr("Advanced Mode") : "" } else { @@ -227,12 +227,12 @@ } // Pages - PreTreatmentBase { id: _pretreatmentConcentrates; stepIndex: PreTreatmentStack.Step.Concentrates; instructionBased: true } - PreTreatmentInstallStack { id: _pretreatmentInstallation; stepIndex: PreTreatmentStack.Step.Installation } - PreTreatmentSelfTests { id: _pretreatmentSelfTests; stepIndex: PreTreatmentStack.Step.SelfTests } - PreTreatmentPrime { id: _pretreatmentPrime; stepIndex: PreTreatmentStack.Step.Prime } - PreTreatmentCreate { id: _pretreatmentCreate; stepIndex: PreTreatmentStack.Step.CreateRx } - PreTreatmentBase { id: _pretreatmentConnect; stepIndex: PreTreatmentStack.Step.Connect; instructionBased: true } + PreTreatmentBase { id: _pretreatmentConcentrates; stepIndex: PreTreatmentStack.Step.Concentrates; instructionBased: true } + PreTreatmentInstallStack { id: _pretreatmentInstallation; stepIndex: PreTreatmentStack.Step.Installation } + PreTreatmentSelfTests { id: _pretreatmentSelfTests; stepIndex: PreTreatmentStack.Step.SelfTests } + PreTreatmentPrime { id: _pretreatmentPrime; stepIndex: PreTreatmentStack.Step.Prime } + PreTreatmentCreate { id: _pretreatmentCreate; stepIndex: PreTreatmentStack.Step.CreateRx; showCreateRxHeaderButton: false } + PreTreatmentBase { id: _pretreatmentConnect; stepIndex: PreTreatmentStack.Step.Connect; showCreateRxHeaderButton: false; instructionBased: true } // Slots Connections { target: vTDOpMode Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -rfb1185f1c17778a9f8b300170d8d635a1532f6b4 -r72550dbbd6db8eab40aad38956b32f99416600c8 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision fb1185f1c17778a9f8b300170d8d635a1532f6b4) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 72550dbbd6db8eab40aad38956b32f99416600c8) @@ -153,7 +153,7 @@ ] // TODO: SRS 405/406 Test Mode instead add Q_PROPERTY to monitor state??? - onServiceModeChanged: _headerBar.userMode = serviceMode ? "[Service]" : "" + onServiceModeChanged: _headerBar.userMode = serviceMode ? "Service" : "" SettingsHome { id : _settingsHome itemIndex : SettingsStack.Home Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -r7a1dcc43829f3e6435064abf93b55ffb012a8697 -r72550dbbd6db8eab40aad38956b32f99416600c8 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 7a1dcc43829f3e6435064abf93b55ffb012a8697) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 72550dbbd6db8eab40aad38956b32f99416600c8) @@ -32,7 +32,7 @@ y : Math.round((Variables.applicationHeight - height) / 2) notification.textfontSize : 20 - notification.visible : vTreatmentVitals.lastRead || vTreatmentAdjustmentVitals.adjustment_ReasonText + notification.visible : vTreatmentAdjustmentVitals.adjustment_ReasonText notification.anchors.rightMargin: numPad.isOpened ? 10 : 0 // fix margins when numpad is open and notifiction is displayed backgroundItemZ : numPad.isOpened ? 0 : -1 @@ -44,7 +44,8 @@ property alias numPad : _numPad - readonly property string rejectionTextString : qsTr("Rejected Reason: %1").arg(vTreatmentAdjustmentVitals.adjustment_ReasonText) + readonly property string rejectionTextString : vTreatmentAdjustmentVitals.adjustment_ReasonText ? qsTr("Rejected Reason: %1").arg(vTreatmentAdjustmentVitals.adjustment_ReasonText) : + "" function update(vSystolic, vDiastolic ,vHeartRate) { _bphrEntry.systolic = vSystolic ? vSystolic : ""