Index: leahi.qrc =================================================================== diff -u -r9c0335bc7f5a2b591a9c6241b00ebb9510ea611a -r290835d1a861d8fe7a716d061f0b079d9cfff75a --- leahi.qrc (.../leahi.qrc) (revision 9c0335bc7f5a2b591a9c6241b00ebb9510ea611a) +++ leahi.qrc (.../leahi.qrc) (revision 290835d1a861d8fe7a716d061f0b079d9cfff75a) @@ -215,6 +215,7 @@ sources/gui/qml/components/BaseChart.qml sources/gui/qml/components/ReviewContainer.qml sources/gui/qml/components/LegendItem.qml + sources/gui/qml/components/DryBicartDisconnectButton.qml sources/gui/qml/compounds/PressureRangeSlider.qml Index: sources/gui/qml/components/DryBicartDisconnectButton.qml =================================================================== diff -u --- sources/gui/qml/components/DryBicartDisconnectButton.qml (revision 0) +++ sources/gui/qml/components/DryBicartDisconnectButton.qml (revision 290835d1a861d8fe7a716d061f0b079d9cfff75a) @@ -0,0 +1,28 @@ +// Qt +import QtQuick 2.12 + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +IconButton { id : _root + iconSize : Variables.headerIconDiameter + iconImageSource : "" + + ProgressCircle { id: _progressCircle + anchors.centerIn : parent + diameter : _root.height - 10 + circleShadowColor : Colors.mainTreatmentLighterBlue + thickness : 4 + minimum : 0 + maximum : vTreatmentDryBicartDisconnect.total + value : vTreatmentDryBicartDisconnect.progress + + Text { id: _progressPercent + anchors.centerIn: parent + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelStepCurrent + text : _progressCircle.value + "%" + } + } +} Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 -r290835d1a861d8fe7a716d061f0b079d9cfff75a --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 290835d1a861d8fe7a716d061f0b079d9cfff75a) @@ -170,11 +170,17 @@ rightMargin : _headerButtonRow.spacing } + DryBicartDisconnectButton {id : _dryBicartDisconnectButton + extraSpace : _headerButtonRow.spacing + visible : _dryBicartDisconnectDialog.show + + onPressed : _dryBicartDisconnectDialog.open() + } + TreatmentCompleteButton { id : _treatmentCompleteButton extraSpace : _headerButtonRow.spacing visible : vTDTreatmentStates.txEnd - onPressed : _endTreatmentDialog.open() } IconButton { id : _waterSample Index: sources/gui/qml/compounds/DryBicartDisconnect.qml =================================================================== diff -u -r9c0335bc7f5a2b591a9c6241b00ebb9510ea611a -r290835d1a861d8fe7a716d061f0b079d9cfff75a --- sources/gui/qml/compounds/DryBicartDisconnect.qml (.../DryBicartDisconnect.qml) (revision 9c0335bc7f5a2b591a9c6241b00ebb9510ea611a) +++ sources/gui/qml/compounds/DryBicartDisconnect.qml (.../DryBicartDisconnect.qml) (revision 290835d1a861d8fe7a716d061f0b079d9cfff75a) @@ -8,7 +8,7 @@ ProcessStatusView { id: _root property bool isDialog: false - title : _root.isDialog ? qsTr("Disconnect Dry Bicarb Cartridge") : qsTr("Bicarb Cartridge Options") + title : _root.isDialog ? qsTr("Disconnect Dry Bicarbonate Cartridge") : qsTr("Bicarb Cartridge Options") leftButtonText : vTreatmentDryBicartDisconnect.drainInProgress ? qsTr("Cancel") : qsTr("Drain") centerButtonText : qsTr("Depressurize") rightButtonText : isDialog ? qsTr("Done") : "" @@ -19,7 +19,7 @@ progressText : vTreatmentDryBicartDisconnect.drainInProgress ? qsTr("Draining Bicart...") : vTreatmentDryBicartDisconnect.depressurizeInProgress ? qsTr("Depressurizing...") : vTreatmentDryBicartDisconnect.progress >= vTreatmentDryBicartDisconnect.total && - vTreatmentDryBicartDisconnect.total > 0 ? qsTr("Complete") : "" + vTreatmentDryBicartDisconnect.total > 0 ? qsTr("Complete") : "" minimum : 0 @@ -30,4 +30,20 @@ vTreatmentAdjustmentDryBicartDisconnect.doDrain() onCenterPressed : vTreatmentAdjustmentDryBicartDisconnect.doDepressurize() onRightPressed : vTreatmentAdjustmentDryBicartDisconnect.doDone() + + + Text { id: _additionalDescription + anchors { + top : _root.top + topMargin : Variables.defaultMargin * 4 + horizontalCenter: parent.horizontalCenter + } + visible : _root.isDialog + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelTextRectExtra + font.weight : Font.Medium + text : qsTr("Disconnect your consumables per your clinic's instructions") + } + + } Index: sources/gui/qml/compounds/ProcessStatusView.qml =================================================================== diff -u -r9c0335bc7f5a2b591a9c6241b00ebb9510ea611a -r290835d1a861d8fe7a716d061f0b079d9cfff75a --- sources/gui/qml/compounds/ProcessStatusView.qml (.../ProcessStatusView.qml) (revision 9c0335bc7f5a2b591a9c6241b00ebb9510ea611a) +++ sources/gui/qml/compounds/ProcessStatusView.qml (.../ProcessStatusView.qml) (revision 290835d1a861d8fe7a716d061f0b079d9cfff75a) @@ -9,6 +9,7 @@ Item { id: _root property alias title : _title.text + property alias titleFont : _title.font property alias progressText : _progressText.text property alias minimum : _progressCircle.minimum property alias maximum : _progressCircle.maximum @@ -37,11 +38,8 @@ } ProgressCircle { id: _progressCircle - anchors { - top : _title.bottom - topMargin : Variables.defaultMargin * 4 - horizontalCenter: parent.horizontalCenter - } + anchors.centerIn : parent + anchors.verticalCenterOffset: Variables.defaultMargin * -2 diameter : 175 circleShadowColor : Colors.mainTreatmentLighterBlue thickness : 10 Index: sources/gui/qml/dialogs/DryBicartDisconnectDialog.qml =================================================================== diff -u -r9c0335bc7f5a2b591a9c6241b00ebb9510ea611a -r290835d1a861d8fe7a716d061f0b079d9cfff75a --- sources/gui/qml/dialogs/DryBicartDisconnectDialog.qml (.../DryBicartDisconnectDialog.qml) (revision 9c0335bc7f5a2b591a9c6241b00ebb9510ea611a) +++ sources/gui/qml/dialogs/DryBicartDisconnectDialog.qml (.../DryBicartDisconnectDialog.qml) (revision 290835d1a861d8fe7a716d061f0b079d9cfff75a) @@ -16,8 +16,14 @@ onShowChanged: _root.show ? _root.open() : _root.close() DryBicartDisconnect { id: _drainBicarbCartridge - anchors.fill : parent - isDialog : true + anchors { + fill : parent + topMargin : Variables.defaultMargin * 2 + bottomMargin : Variables.notificationHeight + Variables.defaultMargin + } + + isDialog : true + titleFont.pixelSize : Fonts.fontPixelSection } CloseButton { id : _closeButton @@ -26,7 +32,6 @@ } } - // Drain consumabnles Connections { target: vTreatmentAdjustmentDryBicartDisconnect function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentDryBicartDisconnect.adjustment_Accepted ) { @@ -36,5 +41,4 @@ } } } - } Fisheye: Tag 290835d1a861d8fe7a716d061f0b079d9cfff75a refers to a dead (removed) revision in file `sources/gui/qml/dialogs/DryBicartDisconnectDialog.qml.autosave'. Fisheye: No comparison available. Pass `N' to diff?