Index: shared/scripts/names.py =================================================================== diff -u -r3321e8fd5c07f2fe7aa8134160ba206a90235da8 -rb20bf1d72b0cb790a0e8966b405b769d306fcf0e --- shared/scripts/names.py (.../names.py) (revision 3321e8fd5c07f2fe7aa8134160ba206a90235da8) +++ shared/scripts/names.py (.../names.py) (revision b20bf1d72b0cb790a0e8966b405b769d306fcf0e) @@ -243,7 +243,6 @@ o_SettingsBase_SettingsDateTime = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDateTime", "visible": True} o_SettingsBase_mouseArea_MouseArea = {"container": o_SettingsBase_SettingsDateTime, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} o_eject_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iEject", "type": "Image", "unnamed": 1, "visible": True} -o_arrow_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} o_SettingsBase_SettingsBase = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", "visible": True} o_settings_base_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} o_service_date_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} @@ -1006,22 +1005,54 @@ o_minimize_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iChevronDown", "type": "Image", "unnamed": 1, "visible": True} o_SettingsHome_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True} o_settings_home_text_obj = {"container": o_SettingsHome_SettingsHome, "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_Information_Text = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} o_SettingsDateTime_mouseArea_MouseArea_2 = {"container": o_SettingsBase_SettingsDateTime, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} o_SettingsHome_mouseArea_MouseArea_2_set_date_time = {"container": o_SettingsHome_SettingsHome, "id": "_mouseArea", "occurrence": 7, "type": "MouseArea", "unnamed": 1, "visible": True} + # service screen o_SettingsBase_SettingsBase = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", "visible": True} o_services_screen_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} o_export_logs_text = {"container": o_SettingsBase_SettingsBase, "text": "Export Logs", "type": "Text", "unnamed": 1, "visible": True} o_combo_box= {"container": o_SettingsBase_SettingsBase, "id": "_logTypeCombo", "type": "ComboBox", "unnamed": 1, "visible": True} o_option_combo_box={"container": o_Overlay, "type": "Text", "unnamed": 1, "visible": True} -# #Export button + +# service information screen +o_SettingsHome_touchItem_TouchRect_service_information = {"container": o_SettingsHome_SettingsHome_2, "id": "_touchItem", "type": "TouchRect", "unnamed": 1, "visible": True} +o_SettingsBase_backbutton_service_information_mouseArea_MouseArea_2 = {"container": o_SettingsBase_SettingsBase, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} + +# service volume and brightness screen +o_SettingsHome_mousearea_service_volume_and_brightness = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_SettingsVolumeBrightness = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsVolumeBrightness", "visible": True} +o_SettingsBase_backbutton_service_vandb_mouseArea_MouseArea_3 = {"container": o_SettingsBase_SettingsVolumeBrightness, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} + +# service wifi screen +o_SettingsHome_mousearea_service_wifi = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 4, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_SettingsWiFi = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsWiFi", "visible": True} +o_SettingsHome_backbutton_mousearea_service_wifi = {"container": o_SettingsBase_SettingsWiFi, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_service_wifi_scan_button_mouseArea_MouseArea_2 = {"container": o_SettingsBase_SettingsWiFi, "id": "_mouseArea", "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True} +#o_SettingsBase_Wi_Fi_Text = {"container": o_SettingsBase_SettingsWiFi, "type": "Text", "unnamed": 1, "visible": True} + +# service bluetooth cuff screen +o_SettingsHome_mousearea_service_bluetooth_cuff = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 5, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsHome_backbutton_mousearea_service_bluetooth_cuff = {"container": o_SettingsBase_SettingsBase, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_service_bluetooth_cuff_scan_button_mouseArea_MouseArea_3 = {"container": o_SettingsBase_SettingsBase, "id": "_mouseArea", "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_The_Bluetooth_cuff_pair_clear_error_1001_Text = {"container": o_SettingsBase_SettingsBase, "text": "The Bluetooth cuff pair clear error. [1001]", "type": "Text", "unnamed": 1, "visible": True} + +# service dg cleaning screen +o_SettingsHome_mousearea_service_dg_cleaning = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 6, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsHome_backbutton_mousearea_service_dg_cleaning = {"container": o_SettingsBase_SettingsBase, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_SettingsDG = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDG", "visible": True} +o_SettingsBase_service_dg_cleaning_scan_button_mouseArea_MouseArea_4 = {"container": o_SettingsBase_SettingsDG, "id": "_mouseArea", "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True} + +#Export button o_export_btns = {"container": o_SettingsBase_SettingsBase,"id": "_logTypeExportButton", "type": "ExportButton", "unnamed": 1, "visible": True} o_export_btn = {"container": o_export_btns, "text": "Export", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_SettingsExportLogs = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsExportLogs", "visible": True} o_SettingsBase_export_button_mouseArea_MouseArea_2 = {"container": o_SettingsBase_SettingsExportLogs, "id": "_mouseArea", "occurrence": 5, "type": "MouseArea", "unnamed": 1, "visible": True} -o_SettingsHome_export_log_mouseArea_MouseArea = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 8, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsHome_export_log_mouseo_SettingsBase_service_bluetooth_cuff_scan_button_mouseArea_MouseArea_3Area_MouseArea = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 8, "type": "MouseArea", "unnamed": 1, "visible": True} o_SettingsBase_export_log_backButton_BackButton = {"container": o_SettingsBase_SettingsExportLogs, "objectName": "_backButton", "type": "BackButton", "visible": True} o_SettingsHome_service_confirmButton_TouchRect = {"container": o_SettingsHome_SettingsHome_2, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} +o_SettingsHome_export_log_mouseArea_MouseArea = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 8, "type": "MouseArea", "unnamed": 1, "visible": True} #USB drive and SD crad Information o_usb_folder_slider = {"container": o_SettingsBase_SettingsBase, "id": "_usbFolderView", "type": "ListView", "unnamed": 1, "visible": True} @@ -1035,7 +1066,6 @@ o_shutdownRect_TouchRect = {"container": o_Overlay, "id": "_shutdownRect", "type": "TouchRect", "unnamed": 1, "visible": True} o_cancelTouch_TouchRect = {"container": o_Overlay, "id": "_cancelTouch", "type": "TouchRect", "unnamed": 1, "visible": True} - ##Below set of objects are belongs to Disinfection-it is the combination of Heat,Flush and chemical disinfection. #Disinfection o_DisinfectStack_DisinfectStack = {"container": o_Gui_MainView, "objectName": "_DisinfectStack", "type": "DisinfectStack", "visible": True} @@ -1199,8 +1229,6 @@ #Manager 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} @@ -1214,3 +1242,4 @@ o_time_duration_confirmButton_TouchRect_2 = {"container": o_Overlay, "id": "_confirmButton", "type": "TouchRect", "unnamed": 1, "visible": True} o_treatment_duration = {"container": o_treatmentHome, "objectName": "TreatmentTime", "type": "TreatmentTime", "visible": True} o_pop_up_close_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1, "visible": True} +