Index: shared/scripts/names.py
===================================================================
diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r0641bc72e2338b37ace48847abf301374b6620f6
--- shared/scripts/names.py	(.../names.py)	(revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4)
+++ shared/scripts/names.py	(.../names.py)	(revision 0641bc72e2338b37ace48847abf301374b6620f6)
@@ -37,12 +37,15 @@
 # settings menu item
 o_settingsHome            = {"container": o_QQuickView  , "id": "_settingsHome"  , "type": "ScreenItem", "unnamed": 1, "visible": True}
 o_settingsHome_background = {"container": o_settingsHome, "id": "_backgroundRect", "type": "Rectangle" , "unnamed": 1, "visible": True}
+o_diagnostics             = {"container": o_settingsHome, "id": "_item_diagnostics", "type": "SettingsItem", "visible": True}
+o_diagnostics_ScreenItem = {"container": o_QQuickView, "id": "_diagnostics", "type": "ScreenItem", "unnamed": 1, "visible": True}
 
 # Modal Dialog
 o_modalDialog           = {"container": o_Overlay     , "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True}
 
 # Power off
 o_poweroffButton        = {"container": o_settingsHome, "id": "_poweroffButton", "type": "TouchRect"  , "unnamed": 1, "visible": True}
+#o_poweroffButton        = {"container": o_diagnostics_ScreenItem, "id": "_poweroffButton", "type": "TouchRect", "unnamed": 1, "visible": True}
 o_poweroff_shutdown     = {"container": o_QQuickView  , "id": "_shutdownRect"  , "type": "TouchRect"  , "unnamed": 1, "visible": True}
 o_poweroff_cancel       = {"container": o_QQuickView  , "id": "_cancelTouch"   , "type": "TouchRect"  , "unnamed": 1, "visible": True}
 o_poweroff_notification = {"container": o_Overlay     , "id": "_titleText"     , "type": "TitleText"  , "unnamed": 1, "visible": True, "type": "Text", "text": "System is shutting down"}
@@ -87,10 +90,13 @@
 o_treatmentStart_59_Text = {"container": o_treatmentStart_TreatmentStart, "text": 59, "type": "Text", "unnamed": 1, "visible": True}
 
 # Alarm Status
-o_ALARM_ID_MESSAGE = {"container": o_QQuickView, "id": "_alarm", "type": "Rectangle", "objectName": "NotificationBar", "visible": True}
+o_qquickview_alarm = {"type": "QQuickView", "unnamed": 1, "visible": True}
+o_alarm_dialog = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True}
+o_okay_alarm = {"container": o_Overlay, "id": "_okay", "type": "TouchRect", "unnamed": 1, "visible": True}
+o_alarm_bar = {"container": o_qquickview_alarm, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True}
 o_treatmentStart_SalineTouchArea_TreatmentFluid = {"container": o_treatmentStart_TreatmentStart, "id": "_SalineTouchArea", "type": "TreatmentFluid", "unnamed": 1, "visible": True}
 o_treatmentStart_heparinTouchArea_TreatmentFluid = {"container": o_treatmentStart_TreatmentStart, "id": "_heparinTouchArea", "type": "TreatmentFluid", "unnamed": 1, "visible": True}
-
+o_dismiss_alarm = {"container": o_Overlay, "id": "_dismiss", "type": "TouchRect", "unnamed": 1, "visible": True}
 o_treatmentStart_TimeText_TimeText = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText", "type": "TimeText", "visible": True}
 o_treatmentStart_TimeText_hour_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_hour", "type": "Text", "visible": True}
 o_treatmentStart_TimeText_minute_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_minute", "type": "Text", "visible": True}
@@ -131,21 +137,21 @@
 o_treatmentAdjustmentUltrafiltrationPaused_EditButton      = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_editButton"        , "type": "TouchRect"       }
 o_treatmentAdjustmentUltrafiltrationPaused_ResumeButton    = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_resumeButton"      , "type": "TouchRect"       }
 o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_notification"      , "type": "NotificationBar" }
-o_treatmentAdjustmentUltrafiltrationPaused_PausedText      = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_pausedNotification", "type": "NotificationBar" }
+o_treatmentAdjustmentUltrafiltrationPaused_PausedText      = {"container": o_treatmentAdjustmentUltrafiltrationPaused_Screen, "id": "_pausedNotification", "type": "NotificationBarSmall" }
 
 ## Edit Screen
 o_treatmentAdjustmentUltrafiltrationEdit_Screen          = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationEdit"           , "type": "ContentItem"     }
 o_treatmentAdjustmentUltrafiltrationEdit_NextButton      = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_nextButton"        , "type": "TouchRect"       }
 o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_notification"      , "type": "NotificationBar" }
-o_treatmentAdjustmentUltrafiltrationEdit_PausedText      = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_pausedNotification", "type": "NotificationBar" }
+o_treatmentAdjustmentUltrafiltrationEdit_PausedText      = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_pausedNotification", "type": "NotificationBarSmall" }
 o_treatmentAdjustmentUltrafiltrationEdit_VolumeSlider    = {"container": o_treatmentAdjustmentUltrafiltrationEdit_Screen, "id": "_volumeSlider"      , "type": "Slider"          }
 
 ## 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_ConfirmButton            = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_confirmButton"           , "type": "TouchRect"            }
 o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar          = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_notification"            , "type": "NotificationBar"      }
-o_treatmentAdjustmentUltrafiltrationConfirm_PausedText               = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_pausedNotification"      , "type": "NotificationBar"      }
+o_treatmentAdjustmentUltrafiltrationConfirm_PausedText               = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_pausedNotification"      , "type": "NotificationBarSmall" }
 o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate     = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_rateAdjustmentButton"    , "type": "UltrafiltrationButton"}
 o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration = {"container": o_treatmentAdjustmentUltrafiltrationConfirm_Screen, "id": "_durationAdjustmentButton", "type": "UltrafiltrationButton"}
 ### Rate Option
@@ -230,6 +236,7 @@
 o_settingsHome_PressureOcclusionData_DialysateOutletPumpOcclusion = {"container": o_settingsHome, "objectName": "_PressureOcclusionData4", "type": "Text"}
 
 # Setting CANBusFaultCountText
-o_settingsHome_canbusFaultCount           = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" }
+o_settingsHome_canbusFaultCount         = {"container": o_settingsHome, "id": "_canbusFaultCountText", "type": "Text" }
+blood_sitting_too_long_alarm_5_min_Text = {"container": o_Overlay, "text": "Blood sitting too long alarm (>5 min). ", "type": "Text", "unnamed": 1, "visible": True}