Index: shared/scripts/names.py
===================================================================
diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -r59636301fab15c81ae50b7ea7546b79e494189f8
--- shared/scripts/names.py	(.../names.py)	(revision b795e6250294344ef7b0396bae4648fb2aa306b3)
+++ shared/scripts/names.py	(.../names.py)	(revision 59636301fab15c81ae50b7ea7546b79e494189f8)
@@ -45,7 +45,7 @@
 o_poweroff_notification = {"container": o_Overlay     , "id": "_titleText"     , "type": "TitleText"  , "unnamed": 1, "visible": True, "type": "Text", "text": "System is shutting down"}
 o_poweroff_rejection    = {"container": o_Overlay     , "id": "_titleText"     , "type": "TitleText"  , "unnamed": 1, "visible": True, "type": "Text"}
 
-# Treatment Start Screen 
+# Main Treatment Screen 
 o_treatmentStart_TreatmentStart = {"container": o_QQuickView, "id": "_treatmentStart", "type": "TreatmentStart", "unnamed": 1, "visible": True}
 o_treatmentStart_backgroundRect_Rectangle = {"container": o_treatmentStart_TreatmentStart, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True}
 o_treatmentStart_flowsTouchArea_TreatmentFlows = {"container": o_treatmentStart_TreatmentStart, "id": "_flowsTouchArea", "type": "TreatmentFlows", "unnamed": 1, "visible": True}
@@ -99,31 +99,56 @@
 o_treatmentHome_START_TREATMENT_Text = {"container": o_treatmentHome, "text": "START TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
 o_treatmentStart_START_BOLUS_100_mL_Text = {"container": o_treatmentStart_TreatmentStart, "text": "START BOLUS (100 mL)", "type": "Text", "unnamed": 1, "visible": True}
 
+
 # Ultrafilration Adjustment
 o_Ultrafilration_Adjustment_StartScreen = {"container": o_Overlay,"objectName": "TreatmentAdjustmentUltrafiltrationStart", "type": "TreatmentAdjustmentBase", "id": "_treatmentAdjustmentUltrafiltrationStart"}
 o_Ultrafilration_Adjustment_PauseButton = {"container": o_Overlay, "type": "TouchRect", "id": "_pauseButton", "unnamed": 1, "visible": True}
 note_Ultrafiltration_needs_to_be_paused_to_edit_the_volume_Text = {"container": o_Overlay, "text": "Note: Ultrafiltration needs to be paused to edit the volume.", "type": "Text", "unnamed": 1, "visible": True}
 notificationBar_NotificationBar = {"container": o_Overlay, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True}
 
 o_pauseNotificationBar_NotificationBar = {"container": o_Overlay, "id":"_pausedNotification", "objectName": "NotificationBar", "type": "NotificationBar", "visible": True}
-o_pauseButton_TouchRect = {"container": o_Overlay, "id": "_pauseButton", "type": "TouchRect", "unnamed": 1, "visible": True}
-o_editButton_TouchRect = {"container": o_Overlay, "id": "_editButton", "type": "TouchRect", "unnamed": 1, "visible": True}
-o_resumeButton_TouchRect = {"container": o_Overlay, "id": "_resumeButton", "type": "TouchRect", "unnamed": 1, "visible": True}
-o_nextButton_TouchRect = {"container": o_Overlay, "id": "_nextButton", "type": "TouchRect", "unnamed": 1, "visible": True}
-o_backButton_BackButton = {"container": o_Overlay, "id": "_backButton", "type": "BackButton", "unnamed": 1, "visible": True}
-o_closeButton = {"container": o_Overlay, "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1, "visible": True}
+o_pauseButton_TouchRect     = {"container": o_Overlay, "id": "_pauseButton" , "type": "TouchRect"   , "unnamed": 1, "visible": True}
+o_editButton_TouchRect      = {"container": o_Overlay, "id": "_editButton"  , "type": "TouchRect"   , "unnamed": 1, "visible": True}
+o_resumeButton_TouchRect    = {"container": o_Overlay, "id": "_resumeButton", "type": "TouchRect"   , "unnamed": 1, "visible": True}
+o_nextButton_TouchRect      = {"container": o_Overlay, "id": "_nextButton"  , "type": "TouchRect"   , "unnamed": 1, "visible": True}
+o_backButton_BackButton     = {"container": o_Overlay, "id": "_backButton"  , "type": "BackButton"  , "unnamed": 1, "visible": True}
+o_closeButton               = {"container": o_Overlay, "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1, "visible": True}
 
-o_minUltrafiltration_Text = {"container": o_Overlay, "id": "_textMinimum", "type": "Text", "unnamed": 1, "visible": True}
-o_maxUltrafiltration_Text = {"container": o_Overlay, "id": "_textMaximum", "type": "Text", "unnamed": 1, "visible": True}
-#o_mdxUltrafiltration_Text = {"container": o_Overlay, "id": "_textMaximum", "type": "Text", "unnamed": 1, "visible": True}
+o_textVolume_Text = {"container": o_Overlay, "id": "_textVolume", "type": "Text", "unnamed": 1, "visible": True}
 
-o2_300_Text = {"container": o_Overlay, "text": "2.300", "type": "Text", "unnamed": 1, "visible": True}
+o_volumeSlider_Slider = {"container": o_Overlay, "id": "_volumeSlider", "type": "Slider", "unnamed": 1, "visible": True}
 
 o_treatmentStart_NotificationBar_NotificationBar = {"container": o_treatmentStart_TreatmentStart, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True}
 o_treatmentStart_0_000_Text = {"container": o_treatmentStart_TreatmentStart, "occurrence": 2, "text": "0.000", "type": "Text", "unnamed": 1, "visible": True}
+increase_UF_Rate_Text = {"container": o_Overlay, "text": "Increase UF Rate", "type": "Text", "unnamed": 1, "visible": True}
+increase_Treatment_Duration_Text = {"container": o_Overlay, "text": "Increase Treatment Duration", "type": "Text", "unnamed": 1, "visible": True}
+o_image_Image_2 = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClock+", "type": "Image", "unnamed": 1, "visible": True}
+o_image_Image = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iWave+", "type": "Image", "unnamed": 1, "visible": True}
+treatmentAdjustmentUltrafiltrationConfirm_TitleText_Text = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationConfirm_TitleText", "type": "Text", "visible": True}
 
-o_handler_Rectangle = {"container": o_Overlay, "id": "_handler", "type": "Rectangle", "unnamed": 1, "visible": True}
-o_volumeSlider_Slider = {"container": o_Overlay, "id": "_volumeSlider", "type": "Slider", "unnamed": 1, "visible": True}
-o0_100_Text = {"container": o_Overlay, "occurrence": 2, "text": "0.100", "type": "Text", "unnamed": 1, "visible": True}
-o4_800_Text = {"container": o_Overlay, "occurrence": 2, "text": "4.800", "type": "Text", "unnamed": 1, "visible": True}
+# Treatment Adjustment Ultrafiltration
+## Start Screen
+o_treatmentAdjustmentUltrafiltrationStart_Screen          = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationStart"          , "type": "ContentItem"  }
+o_treatmentAdjustmentUltrafiltrationStart_VolumeProgress  = {"container": o_treatmentAdjustmentUltrafiltrationStart_Screen, "id" : "_progressbarex"   , "type": "ProgressBarEx"}
+o_treatmentAdjustmentUltrafiltrationStart_PauseButton     = {"container": o_treatmentAdjustmentUltrafiltrationStart_Screen, "id" : "_pauseButton"     , "type": "TouchRect"    }
+o_treatmentAdjustmentUltrafiltrationStart_InformationText = {"container": o_treatmentAdjustmentUltrafiltrationStart_Screen, "id" : "_informationText" , "type": "Text"         }
 
+## Confirm Screen
+o_treatmentAdjustmentUltrafiltrationConfirm_Screen                   = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationConfirm"                 , "type": "ContentItem"          }
+o_treatmentAdjustmentUltrafiltrationConfirm_Title                    = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id" : "_titleText"              , "type": "Text"                 }
+o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate     = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_rateAdjustmentButton"    , "type": "UltrafiltrationButton"}
+o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_durationAdjustmentButton", "type": "UltrafiltrationButton"}
+### Rate Option
+o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_Title          = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate    , "id": "_title"         , "type": "Text"      }
+o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_Description    = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate    , "id": "_description"   , "type": "Text"      }
+o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_DiffImageWave  = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate    , "id": "_diffImageWave" , "type": "ImageWave" }
+o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_DiffImageClock = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate    , "id": "_diffImageClock", "type": "ImageClock"}
+### Duration Option
+o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_Title          = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration, "id": "_title"         , "type": "Text"      }
+o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_Description    = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration, "id": "_description"   , "type": "Text"      }
+o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_DiffImageWave  = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration, "id": "_diffImageWave" , "type": "ImageWave" }
+o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_DiffImageClock = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration, "id": "_diffImageClock", "type": "ImageClock"}
+
+
+
+