Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -r0dfba44fb7172b9458d161b3ed5f54527f93b698 -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 0dfba44fb7172b9458d161b3ed5f54527f93b698) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c) @@ -11,6 +11,7 @@ property alias loggedUser : _loggedInUser.text readonly property int currentScreen : _headerMenu.currentScreen property alias statusColor : _headerMenu.statusColor + property bool isCreateRx : false // set in slot in parent width : Variables.applicationWidth height : Variables.headerHeight @@ -50,12 +51,16 @@ } Text { id: _title - color : Colors.textMain - anchors.centerIn : parent - horizontalAlignment : Text.AlignHCenter - verticalAlignment : Text.AlignVCenter - font.pixelSize : Fonts.fontHeaderbarTitle - font.weight : Font.DemiBold + color : Colors.textMain + anchors { + horizontalCenter : parent.horizontalCenter + bottom : _headerMenu.top + } + height : parent.height + horizontalAlignment : Text.AlignHCenter + verticalAlignment : Text.AlignVCenter + font.pixelSize : Fonts.fontHeaderbarTitle + font.weight : Font.DemiBold } Item { id: _dateTimeItem @@ -145,8 +150,7 @@ extraSpace : _headerButtonRow.spacing visible : vTDOpMode.preTreatment || vTDOpMode.inTreatment || - vTDOpMode.postTreatment || - vTDOpMode.validateParameters + vTDOpMode.postTreatment onPressed : _treatmentAdjustmentVitals.open() } @@ -155,9 +159,9 @@ iconSize : Variables.headerIconDiameter iconImageSource : "qrc:/images/iPrescription" extraSpace : _headerButtonRow.spacing - visible : vTDOpMode.preTreatment || - vTDOpMode.inTreatment || - vTDOpMode.postTreatment + visible :( vTDOpMode.preTreatment || + vTDOpMode.inTreatment || + vTDOpMode.postTreatment ) && ! _root.isCreateRx onPressed : _headerbarPrescription.open() }