Index: shared/scripts/names.py =================================================================== diff -u -rf05e6da0255174d1f253f620970a370a7b5fd814 -r381a940e04972afc743fbbdb6e2e382092954dbf --- shared/scripts/names.py (.../names.py) (revision f05e6da0255174d1f253f620970a370a7b5fd814) +++ shared/scripts/names.py (.../names.py) (revision 381a940e04972afc743fbbdb6e2e382092954dbf) @@ -207,6 +207,7 @@ o_ultrafilteration_texts ={"container": o_Overlay, "text": "", "type": "Text", "unnamed": 1, "visible": True} o_ultrafilteration_confirm_btn = {"container": o_Overlay, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} o_ultrafilteration_next_btn = {"container": o_Overlay, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} + treatmentAdjustmentUltrafiltrationEdit_ContentItem = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationEdit", "type": "ContentItem", "visible": True} o_progressRect_ProgressRect = {"container": o_Overlay, "gradient": 0, "id": "_progressRect", "type": "ProgressRect", "unnamed": 1, "visible": True} @@ -1109,11 +1110,13 @@ o_manager_Text = {"container": o_Gui_MainView, "text": "Manager", "type": "Text", "unnamed": 1, "visible": True} o_treatment_management = {"container": o_Gui_MainView, "text": "Treatment Management", "type": "Text", "unnamed": 1, "visible": True} -======= + o_treatmentHome_mouseArea_MouseArea_2 = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "id": "_mouseArea", "occurrence": 15, "type": "MouseArea", "unnamed": 1, "visible": True} o_treatmentStack_TreatmentStack = {"container": o_Gui_MainView, "objectName": "TreatmentStack", "type": "TreatmentStack", "visible": True} o_treatmentStack_modal_MouseArea = {"container": o_treatmentStack_TreatmentStack, "id": "_modal", "type": "MouseArea", "unnamed": 1, "visible": False} o_treatment_text = {"container": o_treatmentStack_TreatmentStack, "text": "Treatment", "type": "Text", "unnamed": 1, "visible": True} o_trending_text = {"container": o_treatmentStack_TreatmentStack, "text": "Trending", "type": "Text", "unnamed": 1, "visible": True} o_main_settings_text = {"container": o_treatmentStack_TreatmentStack, "text": "Settings", "type": "Text", "unnamed": 1, "visible": True} ->>>>>>> main_treatment_heparin +o_treatmentAdjustmentUltrafiltrationEdit_ContentItem = {"container": o_Overlay, "objectName": "TreatmentAdjustmentUltrafiltrationEdit", "type": "ContentItem", "visible": True} +o_mouseArea_MouseArea_ultrafiltration = {"container": ":o_Overlay", "id": "_mouseArea", "occurrence": 6, "type": "MouseArea", "unnamed": 1, "visible": True} +