Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -re262d0097836365a0adebc78a211d10b851bf23f -r4021a9c20604b2ff1785a33214bb3538eb861c44
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision e262d0097836365a0adebc78a211d10b851bf23f)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 4021a9c20604b2ff1785a33214bb3538eb861c44)
@@ -9,6 +9,16 @@
 o_QQuickView                                                    = {                                                                                                                                                                                                                         "type": "QQuickView"                                                                                            }                                                                                                                                                                                                    
 o_Overlay                                                       = {"container": o_QQuickView,                                                                                                                                                                                               "type": "Overlay"                                                                                               }                                                                                                                                                                            
 o_standByScreen_MainHome                                        = {"container": o_Gui_MainView,                                                                                                                                                                                             "type": "MainHome"                                                                                              }
+standByScreen_MainHome                                          = {"container": o_Gui_MainView,                                                                                                                                                                                             "type": "MainHome"                                                                                              }
+treatmentStack                                                  = {"container": o_Gui_MainView,                                                                                                                                                                                             "type": "TreatmentStack"                                                                                        }
+startTreatmentButton                                            = {"container": standByScreen_MainHome,                                                 "id": "_startTreatmentRect",                                                                                                        "type": "TouchRect",                                "unnamed": 1                                                }
+mainTreatmentScreen                                             = {"container": treatmentStack,                                                         "id": "_treatmentHome",                                                                                                             "type": "TreatmentHome",                            "unnamed": 1                                                }
+startFluidButton                                                = {"container": mainTreatmentScreen,                                                    "id": "_startFluidButton",                                                                                                          "type": "TouchRect",                                "unnamed": 1                                                }
+salineDeliveredText                                             = {"container": mainTreatmentScreen,                                                    "objectName": "salineDescriptionText",                                                                                              "type": "Text"                                                                                                  }
+currentBolusVolume                                              = {"container": mainTreatmentScreen,                                                                                                                                                                                        "type": "Label",                                    "unnamed": 1                                                }
+treatmentSaline                                                 = {"container": mainTreatmentScreen,                                                    "objectName": "treatmentSaline",                                                                                                    "type": "TreatmentSaline"                                                                                       }
+salineProgressBar                                               = {"container": mainTreatmentScreen,                                                    "id": "_fluidProgressBar",                                                                                                          "type": "ProgressBar",                              "unnamed": 1                                                }
+#Create Treatment
 o_PreTreatmentCreateStack_PreTreatmentCreateStack               = {"container": o_Gui_MainView,                                                                                             "objectName": "_PreTreatmentCreateStack",                                                       "type": "PreTreatmentCreateStack"                                                                               }
 o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_PreTreatmentCreateStack_PreTreatmentCreateStack,                                                          "objectName": "_PreTreatmentCreate",                                                            "type": "PreTreatmentCreate"                                                                                    }
 o_PreTreatmentCreate_Prescription_Text                          = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,                                                                                                    "text": "Prescription",                 "type": "Text",                                     "unnamed": 1                                                }
@@ -23,15 +33,17 @@
 o_PreTreatmentCreate_durationControl_ValueAdjuster              = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_durationControl",                                                                                                          "type": "ValueAdjuster",                            "unnamed": 1                                                }
 o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster    = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinBolusVolumeControl",                                                                                                "type": "ValueAdjuster",                            "unnamed": 1                                                }
 o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinDispensingRateControl",                                                                                             "type": "ValueAdjuster",                            "unnamed": 1                                                }
-o_PreTreatmentCreate_heparinDispensingRateControl_OffText       = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,                                                                                                     "text": "OFF",                         "type": "Text",                                     "unnamed": 1                                                }
+o_PreTreatmentCreate_heparinDispensingRate_LabelUnitContainer   = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinDispensingRate",                                                                                                     "type": "LabelUnitContainer",                      "unnamed": 1,                                               }
+o_PreTreatmentCreate_heparinDispensingRateControl_OffText       = {"container": o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster,                                                                                                                                              "type": "Text",                                     "unnamed": 1                                                }
 o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster       = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinStopTimeControl",                                                                                                   "type": "ValueAdjuster",                            "unnamed": 1                                                }
 o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster  = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_dialysateTemperatureControl",                                                                                              "type": "ValueAdjuster",                            "unnamed": 1                                                }
 o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster     = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_salineBolusVolumeControl",                                                                                                 "type": "ValueAdjuster",                            "unnamed": 1                                                }
 o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjuster = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_bpMeasurementIntervalControl",                                                                                             "type": "ValueAdjuster",                            "unnamed": 1                                                }
-o_PreTreatmentCreate_OFF_Text                                   = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,                                                                                                    "text": "OFF",                          "type": "Text",                                     "unnamed": 1                                                }
-o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox= {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_bicarbonateConcentrateComboBox",                                                                                           "type": "BaseComboBox",                             "unnamed": 1                                                }
+o_PreTreatmentCreate_heparinBolusVolume_LabelUnitContainer      = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinBolusVolume",                                                                                                        "type": "LabelUnitContainer",                      "unnamed": 1                                                }
+o_PreTreatmentCreate_heparinOFF_Text                            = {"container": o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster,                                                                                                                                                 "type": "Text",                                     "unnamed": 1                                                }
+# o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox= {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_bicarbonateConcentrateComboBox",                                                                                           "type": "BaseComboBox",                             "unnamed": 1                                                }
 o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox          = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_dialyzerTypeComboBox",                                                                                                     "type": "BaseComboBox",                             "unnamed": 1                                                }
-o_saveButton_TouchRect                                          = {"container": o_Overlay, "id": "_saveButton",                                                                                                                                                                             "type": "TouchRect",                                "unnamed": 1                                                }
+o_saveButton_TouchRect                                          = {"container": o_Overlay,                                                               "id": "_saveButton",                                                                                                                                                                             "type": "TouchRect",                                "unnamed": 1                                                }
 o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox       = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_acidConcentrateComboBox",                                                                                                  "type": "BaseComboBox",                             "unnamed": 1                                                }
 o_PreTreatmentCreate_acidConcentrate_LabelUnitContainer         = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_acidConcentrate",                                                                                                          "type": "LabelUnitContainer",                       "unnamed": 1                                                }
 o_acidConcentrate_editbutton                                    = {"container": o_PreTreatmentCreate_acidConcentrate_LabelUnitContainer,                 "id": "_editButton",                                                                                                               "type": "IconButton",                               "unnamed": 1,     "visible": True                           }
@@ -41,8 +53,8 @@
 o_prescription_menuButton                                       = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_prescriptionMenu",                                                                                                         "type": "BaseComboBox",                             "unnamed": 1                                                }
 o_PreTreatmentCreate_dialysateFlowRate_LabelUnitContainer       = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_dialysateFlowRate",                                                                                                        "type": "LabelUnitContainer",                       "unnamed": 1                                                }                                    
 o_PreTreatmentCreate_duration_LabelUnitContainer                = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_duration",                                                                                                                 "type": "LabelUnitContainer",                       "unnamed": 1                                                }
-o_PreTreatmentCreate_heparinBolusVolume_LabelUnitContainer      = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinBolusVolume",                                                                                                        "type": "LabelUnitContainer",                      "unnamed": 1                                                }
-o_PreTreatmentCreate_heparinDispensingRate_LabelUnitContainer   = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinDispensingRate",                                                                                                     "type": "LabelUnitContainer",                      "unnamed": 1,                                               }
+# o_PreTreatmentCreate_heparinBolusVolume_LabelUnitContainer      = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinBolusVolume",                                                                                                        "type": "LabelUnitContainer",                      "unnamed": 1                                                }
+# o_PreTreatmentCreate_heparinDispensingRate_LabelUnitContainer   = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinDispensingRate",                                                                                                     "type": "LabelUnitContainer",                      "unnamed": 1,                                               }
 o_PreTreatmentCreate_heparinStopTime_LabelUnitContainer         = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_heparinStopTime",                                                                                                          "type": "LabelUnitContainer",                       "unnamed": 1                                                }                                                                        
 o_PreTreatmentCreate_bicarbonateConcentrate_LabelUnitContainer  = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_bicarbonateConcentrate",                                                                                                   "type": "LabelUnitContainer",                       "unnamed": 1                                                }
 o_PreTreatmentCreate_dialyzerType_LabelUnitContainer            = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate,         "id": "_dialyzerType",                                                                                                             "type": "LabelUnitContainer",                       "unnamed": 1                                                }