Index: sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml
===================================================================
diff -u -r0bb5f08eb3570de6bff3ce67ca502db129b59096 -r16aaf5ab7e1c58199754a132d624a470295d3440
--- sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml	(.../WaterSampleDialog.qml)	(revision 0bb5f08eb3570de6bff3ce67ca502db129b59096)
+++ sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml	(.../WaterSampleDialog.qml)	(revision 16aaf5ab7e1c58199754a132d624a470295d3440)
@@ -26,11 +26,11 @@
     height          : Variables.dialogHeight
     clip            : true
 
-    readonly property bool timeout: vWaterSample.timeout
+    readonly property bool timeout      : vWaterSample.timeout
 
     onTimeoutChanged: {
         if ( _root.timeout ) {
-            _menu.index = WaterSampleDialog.WaterSample
+            _menu.index =  _WaterSampleDialog.WaterSample
             _root.open()
         }
     }
@@ -40,8 +40,8 @@
         Dialysate
     }
 
-    WaterSamplePage             { id: _waterSample;         visible : vSettings.roWaterMode ? _menu.index === WaterSampleDialog.WaterSample : false ;   }
-    WaterSampleDialysatePage    { id: _dialysateChecks;     visible : vSettings.roWaterMode ? _menu.index === WaterSampleDialog.Dialysate   : true  ;   }
+    WaterSamplePage             { id: _waterSample;         visible : vWaterSampleModel.isROFeatured ? _menu.index === WaterSampleDialog.WaterSample : false ;   }
+    WaterSampleDialysatePage    { id: _dialysateChecks;     visible : vWaterSampleModel.isROFeatured ? _menu.index === WaterSampleDialog.Dialysate   : true  ;   }
 
     MainMenu { id: _menu
         anchors {
@@ -69,7 +69,7 @@
 
     CloseButton { id : _closeButton
 
-        visible:  vSettings.roWaterMode ? _waterSample.isPrimary: true
+        visible:  vWaterSampleModel.isROFeatured ? _waterSample.isPrimary : true
 
         onClicked : {
             _root.close()