Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r6d843984ed0b24bc188f96020cd9cc9e18e09906 -r6d7a81af8acbaaf3ee3f722ccace021634507cb4 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6d843984ed0b24bc188f96020cd9cc9e18e09906) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6d7a81af8acbaaf3ee3f722ccace021634507cb4) @@ -72,8 +72,8 @@ ID_TDDebugText = 0xF1FF, ID_DDDebugText = 0xF2FF, - ID_HDGeneralEvent = 0xA400, - ID_DGGeneralEvent = 0xA500, + ID_HDGeneralEvent = 0xA40F, //// ----- @CRAPIZED: had to change to avoid duplication + ID_DGGeneralEvent = 0xA50F, //// ----- @CRAPIZED: had to change to avoid duplication ID_TDCheckIn = 0x1000, // 16 //// ----- @LEAHIZED @@ -277,6 +277,9 @@ ID_AdjustHeparinReq = 0x8A00, // 138 ID_AdjustHeparinRsp = 0x8B00, // 139 + ID_AdjustPressuresWideningReq = 0xA400, // 114 //// ----- @LEAHIZED + ID_AdjustPressuresWideningRsp = 0xA500, // 115 //// ----- @LEAHIZED + // Ultrafiltration ID_AdjustUltrafiltrationStateReq = 0x4700, // 71 //// ----- @LEAHIZED ID_AdjustUltrafiltrationStateRsp = 0x4800, // 72 //// ----- @LEAHIZED Index: sources/gui/qml/main.qml =================================================================== diff -u -r3454906bbb35aa2976572145068980bf691daf1c -r6d7a81af8acbaaf3ee3f722ccace021634507cb4 --- sources/gui/qml/main.qml (.../main.qml) (revision 3454906bbb35aa2976572145068980bf691daf1c) +++ sources/gui/qml/main.qml (.../main.qml) (revision 6d7a81af8acbaaf3ee3f722ccace021634507cb4) @@ -168,6 +168,7 @@ import "qrc:/dialogs" import "qrc:/dialogs/diagnostics" import "qrc:/dialogs/headerbar" +import "qrc:/dialogs/watersample" /*! * \brief Initialization and start point of the QML @@ -400,19 +401,20 @@ KeyboardItem { id: _keyboard } // Dialogs - AcidConcentrateAdjustment { id: _acidConcentrateAdjustment } - HeaderbarPrescription { id: _headerbarPrescription } - HeaderbarWiFi { id: _headerbarWifi } - HeaderbarSettings { id: _headerbarSettings } - HeaderbarInformation { id: _headerbarInformation } - TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals } - EndTreatmentDialog { id: _endTreatmentDialog } + AcidConcentrateAdjustment { id: _acidConcentrateAdjustment } + HeaderbarPrescription { id: _headerbarPrescription } + HeaderbarWiFi { id: _headerbarWifi } + HeaderbarSettings { id: _headerbarSettings } + HeaderbarInformation { id: _headerbarInformation } + WaterSampleDialog { id: _headerbarWaterSampleDialysate } + TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals } + EndTreatmentDialog { id: _endTreatmentDialog } - LockDialog { id: _lockDialog } - AlarmItem { id: _alarmItem ; z: 996 } - PowerItem { id: _powerItem ; z: 997 } - ConfirmDialog { id: _confirmDialog ; z: 998 } - DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } + LockDialog { id: _lockDialog } + AlarmItem { id: _alarmItem ; z: 996 } + PowerItem { id: _powerItem ; z: 997 } + ConfirmDialog { id: _confirmDialog ; z: 998 } + DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem // then cannot be anchored.