Index: shared/scripts/names.py =================================================================== diff -u -r4e525fac94941a1451bd54f2390f47ece7f4f1b0 -r832ebd77e926ca21aba6b238ef0b329acb7c7288 --- shared/scripts/names.py (.../names.py) (revision 4e525fac94941a1451bd54f2390f47ece7f4f1b0) +++ shared/scripts/names.py (.../names.py) (revision 832ebd77e926ca21aba6b238ef0b329acb7c7288) @@ -15,9 +15,6 @@ o_treatmentHome_createTreatment = {"container": o_treatmentHome, "id": "_createTreatmentRect", "type": "TouchRect" , "unnamed": 1, "visible": True} - -o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} -o_Overlay = {"container": o_Gui_MainView, "type": "Overlay", "unnamed": 1, "visible": True} o_borderRect_Rectangle = {"container": o_Overlay, "gradient": 0, "id": "_borderRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_minimizeButton_UpDownButton = {"container": o_Overlay, "gradient": 0, "id": "_minimizeButton", "type": "UpDownButton", "unnamed": 1, "visible": True} o_shape_Shape = {"container": o_Gui_MainView, "id": "_shape", "type": "Shape", "unnamed": 1, "visible": True} @@ -81,7 +78,7 @@ o_alarm_dialog_content = {"container": o_Overlay , "objectName": "_NotificationDialog" , "type": "ContentItem" } o_alarm_dialog_titleBar = {"container": o_alarm_dialog_content , "id" : "_titleBar" , "type": "Rectangle" } o_alarm_button_minimize = {"container": o_alarm_dialog_content , "id" : "_minimizeButton" , "type": "UpDownButton" ,"visible": True } -o_alarm_button_mute = {"container": o_alarm_dialog_content , "id" : "_muteButton" , "type": "MuteButton" ,"visible": True } +o_alarm_button_mute = {"container": o_alarm_dialog_content, "id": "_muteButton", "type": "MuteButton", "visible": True} o_alarm_button_mute_img = {"container": o_alarm_button_mute , "id" : "_image" , "type": "Image", "unnamed": 1, "visible": True} o_alarm_button_mute_min = {"container": o_alarm_button_mute , "id" : "_hourText" , "type": "Text" } o_alarm_button_mute_sec = {"container": o_alarm_button_mute , "id" : "_minuteText" , "type": "Text" } @@ -206,7 +203,13 @@ o_ultrafiltration_closeButton = {"container": o_Overlay, "id": "_closeButton", "type": "CloseButton", "unnamed": 1, "visible": True} o_backbutton_backbutton = {"container": o_Overlay, "id": "_backButton", "type": "BackButton", "unnamed": 1, "visible": True} o_notificationbar_response = {"container": o_Overlay, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} +o_ultrafilteration_pause_btn = {"container": o_Overlay, "text": "PAUSE ULTRAFILTRATION", "type": "Text", "unnamed": 1, "visible": True} +o_ultrafilteration_resume_btn = {"container": o_Overlay, "text": "RESUME ULTRAFILTRATION", "type": "Text", "unnamed": 1, "visible": True} +o_ultrafilteration_back_btn = {"container": o_Overlay, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} +o_ultrafilteration_texts ={"container": o_Overlay, "type": "Text", "unnamed": 1, "visible": True} +o_ultrafilteration_confirm_btn = {"container": o_Overlay, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} + #flows o_treatment_blood_flow_touch_area = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "FLOWS", "type": "Text", "unnamed": 1, "visible": True} o_treatmentStart_TreatmentStart = {"container": o_QQuickView, "id": "_treatmentStart", "type": "TreatmentStart", "unnamed": 1, "visible": True} @@ -389,6 +392,11 @@ o_stephead_indicator = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} #main treatment time duration +o_pop_screen = {"container": o_Overlay, "type": "PopupItem", "unnamed": 1, "visible": True} +o_treatmentHome = {"container": o_QQuickView , "id": "_treatmentHome" , "type": "TreatmentHome", "unnamed": 1, "visible": True} +o_Treatment_Paused = {"container": o_treatmentHome, "text": "Treatment Paused", "type": "Text", "unnamed": 1, "visible": True} +o_Overlay = {"container": o_Gui_MainView, "type": "Overlay", "unnamed": 1, "visible": True} +o_time_duration_confirm_button = {"container": o_Overlay, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} o_QQuickView = { "type": "QQuickView"} o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} o_treatmentHome = {"container": o_QQuickView , "id": "_treatmentHome" , "type": "TreatmentHome", "unnamed": 1, "visible": True} @@ -439,7 +447,7 @@ o_separatorLine_text={"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "gradient": 0, "id": "_separatorLine", "type": "Line", "unnamed": 1, "visible": True} o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_preTreatmentConsumablesStack", "type": "PreTreatmentConsumablesStack", "visible": True} - +o_pop_up_close_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1, "visible": True} #post screen o_busy_indicator = {"container": o_initialModeScreen_ScreenItem, "id": "_busyIndicator", "source": "qrc:/images/iBusy", "type": "Image", "unnamed": 1, "visible": True} o_done_indicator = {"container": o_initialModeScreen_ScreenItem, "id": "_checkIndicator", "source": "qrc:/images/iBusyDone", "type": "Image", "unnamed": 1, "visible": True}