Index: sources/view/VListModel.cpp
===================================================================
diff -u -rdea27f0df1a1de0a618162403df41a9a340d1263 -rfb1185f1c17778a9f8b300170d8d635a1532f6b4
--- sources/view/VListModel.cpp	(.../VListModel.cpp)	(revision dea27f0df1a1de0a618162403df41a9a340d1263)
+++ sources/view/VListModel.cpp	(.../VListModel.cpp)	(revision fb1185f1c17778a9f8b300170d8d635a1532f6b4)
@@ -1,41 +1,63 @@
 #include "VListModel.h"
 
+#include "GuiController.h"
+
+
 View::VListModel::VListModel(QObject *parent)
 {
     Q_UNUSED(parent)
+    ACTION_VIEW_CONNECTION(SettingsData);
 
-    _headerbarModel.setRoleNames({  { eRole_Text           , "text"         },
+    _headerbarModel.setRoleNames({{ eRole_Text           , "text"         },
                                   { eRole_Visible        , "visible"      },
                                   { eRole_Screen         , "screen"       },
                                   { eRole_StatusColor    , "statusColor"  },
                                   });
+
+    _waterSampleModel.setRoleNames({  { eRole_Text           , "text"         },
+                                      { eRole_Visible        , "visible"      },
+                                      });
     initModel();
 }
 
 void View::VListModel::initModel()
 {
-    _headerbarModel.insertRow( Treatment,{{  eRole_Text, tr("Treatment")},  { eRole_Visible, true   }, { eRole_Screen, Treatment}, { eRole_StatusColor,  "Transparent"   }});
-    _headerbarModel.insertRow( Trends   ,{{  eRole_Text, tr("Trends")   },  { eRole_Visible, true   }, { eRole_Screen, Trends   }, { eRole_StatusColor,  "Transparent"   }});
-    _headerbarModel.insertRow( Heparin  ,{{  eRole_Text, tr("Heparin")  },  { eRole_Visible, true   }, { eRole_Screen, Heparin  }, { eRole_StatusColor,  "Transparent"   }});
-    _headerbarModel.insertRow( HDF      ,{{  eRole_Text, tr("HDF")      },  { eRole_Visible, true   }, { eRole_Screen, HDF      }, { eRole_StatusColor,  "Transparent"   }});
+    _headerbarModel.clear();
+    _headerbarModel.insertRow( eTreatment,{{  eRole_Text, tr("Treatment")},  { eRole_Visible, true                   }, { eRole_Screen, eTreatment}, { eRole_StatusColor,  "Transparent"   }});
+    _headerbarModel.insertRow( eTrends   ,{{  eRole_Text, tr("Trends")   },  { eRole_Visible, true                   }, { eRole_Screen, eTrends   }, { eRole_StatusColor,  "Transparent"   }});
+    _headerbarModel.insertRow( eHeparin  ,{{  eRole_Text, tr("Heparin")  },  { eRole_Visible, _heparinSyringePump    }, { eRole_Screen, eHeparin  }, { eRole_StatusColor,  "Transparent"   }});
+    _headerbarModel.insertRow( eHDF      ,{{  eRole_Text, tr("HDF")      },  { eRole_Visible, true                   }, { eRole_Screen, eHDF      }, { eRole_StatusColor,  "Transparent"   }});
+
+    _waterSampleModel.clear();
+    _waterSampleModel.insertRow( eWaterSample       , {{  eRole_Text, tr("Water Sample")    },  { eRole_Visible, _roWaterMode   }});
+    _waterSampleModel.insertRow( eDialysateChecks   , {{  eRole_Text, tr("Dialysate Checks")},  { eRole_Visible, true           }});
 }
 
 void View::VListModel::setHeaderbarHeparinStatusColor (QString color)
 {
-    _headerbarModel.updateData(Heparin, eRole_StatusColor, color);
+    _headerbarModel.updateData(eHeparin, eRole_StatusColor, color);
 }
 
 void View::VListModel::setHeaderbarHDFStatusColor (QString color)
 {
-    _headerbarModel.updateData(HDF, eRole_StatusColor, color);
+    _headerbarModel.updateData(eHDF, eRole_StatusColor, color);
 }
 
 void View::VListModel::setHeaderbarHeparinVisible (bool visible)
 {
-    _headerbarModel.updateData(Heparin, eRole_Visible, visible);
+    _headerbarModel.updateData(eHeparin, eRole_Visible, visible);
 }
 
 void View::VListModel::setHeaderbarHDFVisible (bool visible)
 {
-    _headerbarModel.updateData(HDF, eRole_Visible, visible);
+    _headerbarModel.updateData(eHDF, eRole_Visible, visible);
 }
+
+void View::VListModel::onActionReceive(const SettingsData &)
+{
+    QString mCategory = Storage::Settings_Category_SettingsSystem;
+    FROMVARIANT( roWaterMode        , "Feature Configurations", "RoWaterMode"       , UInt );
+    FROMVARIANT( heparinSyringePump , "Feature Configurations", "HeparinSyringePump", UInt );
+
+    initModel();
+}