Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
===================================================================
diff -u -r726dc38cf98a8f0a827b2efeecfd32996d0eee90 -r5a2f0e2068f2998a9bf7377d39f2eecb0d4ad15a
--- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 726dc38cf98a8f0a827b2efeecfd32996d0eee90)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 5a2f0e2068f2998a9bf7377d39f2eecb0d4ad15a)
@@ -65,14 +65,16 @@
     // Ultrafiltration states
 
     // Saline Bolus states
-    ENUM_CHECK_O( GuiSalineStates, vData.mSalineState                                       ) {
-    ENUM_CHECK  ( GuiSalineStates, SALINE_BOLUS_STATE_IDLE                                  )
-    ENUM_CHECK  ( GuiSalineStates, SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP                   )
-    ENUM_CHECK  ( GuiSalineStates, SALINE_BOLUS_STATE_IN_PROGRESS                           )
-    ENUM_CHECK_C( GuiSalineStates, NUM_OF_SALINE_BOLUS_STATES                               ) }
-    ENUM_READ   ( GuiSalineStates, SALINE_BOLUS_STATE_IDLE                  , sbIdle        );
-    ENUM_READ   ( GuiSalineStates, SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP   , sbWaitPump    );
-    ENUM_READ   ( GuiSalineStates, SALINE_BOLUS_STATE_IN_PROGRESS           , sbRunning     );
+    ENUM_CHECK_O( GuiSalineStates, vData.mSalineState                                               ) {
+    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE                                           )
+    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE                            )
+    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE                             )
+    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE                          )
+    ENUM_CHECK_C( GuiSalineStates, NUM_OF_FLUID_BOLUS_STATES                                        ) }
+    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE                   , sbIdle                );
+    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE    , sbWaitPump            );
+    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE     , sbRunning             );
+    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE  , sbSubstitutionRunning );
 
     // Heparin States
     _heparin                = false;
@@ -113,12 +115,14 @@
     // Treatment states - Dialysis
     bool mDialysis              = vData.mSubMode            == GuiTreatmentStates   ::TREATMENT_DIALYSIS_STATE                       ;
     if ( mDialysis ) {
-    ENUM_CHECK_O( GuiDialysisState, vData.mDialysisState                                                        ) {
-    ENUM_CHECK  ( GuiDialysisState, DIALYSIS_UF_STATE                                                           )
-    ENUM_CHECK  ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE                                                    )
-    ENUM_CHECK_C( GuiDialysisState, NUM_OF_DIALYSIS_STATES                                                      ) }
-    ENUM_READ   ( GuiDialysisState, DIALYSIS_UF_STATE                                 , dyUltrafiltration       );
-    ENUM_READ   ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE                          , dySalineBolus           );
+    ENUM_CHECK_O( GuiDialysisState, vData.mDialysisState                                                            ) {
+    ENUM_CHECK  ( GuiDialysisState, DIALYSIS_UF_STATE                                                               )
+    ENUM_CHECK  ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE                                                        )
+    ENUM_CHECK  ( GuiDialysisState, DIALYSIS_UF_FLUID_BOLUS_STATE                                                   )
+    ENUM_CHECK_C( GuiDialysisState, NUM_OF_DIALYSIS_STATES                                                          ) }
+    ENUM_READ   ( GuiDialysisState, DIALYSIS_UF_STATE                                   , dyUltrafiltration         );
+    ENUM_READ   ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE                            , dyUltrafiltrationPaused   );
+    ENUM_READ   ( GuiDialysisState, DIALYSIS_UF_FLUID_BOLUS_STATE                       , dyFluidBolus              );
     }
     txDialysis  ( mDialysis ); // it's the main dialysis event so moved last to have all the sub-dialysis-states updated prior to.
 
@@ -179,10 +183,12 @@
         ENUM_CHECK  ( GuiBloodPrimeStates, BLOOD_PRIME_RAMP_STATE                                                   )
         ENUM_CHECK  ( GuiBloodPrimeStates, BLOOD_PRIME_RUN_STATE                                                    )
         ENUM_CHECK  ( GuiBloodPrimeStates, BLOOD_PRIME_PAUSED_STATE                                                 )
+        ENUM_CHECK  ( GuiBloodPrimeStates, BLOOD_PRIME_FLUID_BOLUS_STATE                                            )
         ENUM_CHECK_C( GuiBloodPrimeStates, NUM_OF_BLOOD_PRIME_STATES                                                ) }
-        ENUM_READ   ( GuiBloodPrimeStates, BLOOD_PRIME_RAMP_STATE                           , bpRamp                )
-        ENUM_READ   ( GuiBloodPrimeStates, BLOOD_PRIME_RUN_STATE                            , bpRun                 )
+        ENUM_READ   ( GuiBloodPrimeStates, BLOOD_PRIME_RAMP_STATE                           , bpRamp                );
+        ENUM_READ   ( GuiBloodPrimeStates, BLOOD_PRIME_RUN_STATE                            , bpRun                 );
         ENUM_READ   ( GuiBloodPrimeStates, BLOOD_PRIME_PAUSED_STATE                         , bpPaused              );
+        ENUM_READ   ( GuiBloodPrimeStates, BLOOD_PRIME_FLUID_BOLUS_STATE                    , bpFluidBolus          );
     }
     txBloodPrime ( mBloodPrime );
 
@@ -192,9 +198,11 @@
         ENUM_CHECK_O( GuiTreatmentEndStates, vData.mTreatmentEndState                                               ) {
         ENUM_CHECK  ( GuiTreatmentEndStates, TREATMENT_END_WAIT_FOR_RINSEBACK_STATE                                 )
         ENUM_CHECK  ( GuiTreatmentEndStates, TREATMENT_END_PAUSED_STATE                                             )
+        ENUM_CHECK  ( GuiTreatmentEndStates, TREATMENT_END_FLUID_BOLUS_STATE                                             )
         ENUM_CHECK_C( GuiTreatmentEndStates, NUM_OF_TREATMENT_END_STATES                                            ) }
         ENUM_READ   ( GuiTreatmentEndStates, TREATMENT_END_WAIT_FOR_RINSEBACK_STATE         , teWaitRinseback       );
         ENUM_READ   ( GuiTreatmentEndStates, TREATMENT_END_PAUSED_STATE                     , tePaused              );
+        ENUM_READ   ( GuiTreatmentEndStates, TREATMENT_END_FLUID_BOLUS_STATE                , teFluidBolus          );
     }
     txEnd ( mTreatmentEnd );
 
@@ -207,12 +215,14 @@
         ENUM_CHECK  ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE                              )
         ENUM_CHECK  ( GuiTreatmentPausedStates, TREATMENT_PAUSED_NO_RECIRC_STATE                                      )
         ENUM_CHECK  ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE                           )
+        ENUM_CHECK  ( GuiTreatmentPausedStates, TREATMENT_PAUSED_FLUID_BOLUS_STATE                                      )
         ENUM_CHECK_C( GuiTreatmentPausedStates, NUM_OF_TREATMENT_PAUSED_STATES                                      ) }
         ENUM_READ   ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_STATE               , tsRecirculate           )
         ENUM_READ   ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE, tsRecirculateDialysate  )
         ENUM_READ   ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE    , tsRecirculateBlood      )
         ENUM_READ   ( GuiTreatmentPausedStates, TREATMENT_PAUSED_NO_RECIRC_STATE            , tsRecirculateNo         )
         ENUM_READ   ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE , tsRecoverBloodDetect    )
+        ENUM_READ   ( GuiTreatmentPausedStates, TREATMENT_PAUSED_FLUID_BOLUS_STATE          , tsFluidBolus            )
     }
     txStop ( mTreatmentStop );