Index: shared/scripts/names.py =================================================================== diff -u -r2c7da26ac2ba169d208a91e591ff7a1e494abead -redaed8bef65561113afab047c420fb310eb55295 --- shared/scripts/names.py (.../names.py) (revision 2c7da26ac2ba169d208a91e591ff7a1e494abead) +++ shared/scripts/names.py (.../names.py) (revision edaed8bef65561113afab047c420fb310eb55295) @@ -56,6 +56,7 @@ #settings_Home +o_SettingsBase_SettingsBase = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", "visible": True} o_settings_Text = {"container": o_Gui_MainView, "text": "Settings", "type": "Text", "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} @@ -74,8 +75,8 @@ device_settings_screen = {"container": o_Gui_MainView, "text": "Treatment", "type": "Text", "unnamed": 1, "visible": True} o_SettingsHome_SettingsHome_2 = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True} o_SettingsHome_Wi_Fi_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "Wi-Fi", "type": "Text", "unnamed": 1, "visible": True} -o_Gui_MainView_2 = {"type": "Gui::MainView", "unnamed": 1, "visible": True} -o_SettingsBase_SettingsWiFi = {"container": o_Gui_MainView_2, "objectName": "_SettingsBase", "type": "SettingsWiFi", "visible": True} +o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} +o_SettingsBase_SettingsWiFi = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsWiFi", "visible": True} o_SettingsBase_Wi_Fi_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Wi-Fi", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_IP_Address_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "IP Address", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Gateway_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Gateway", "type": "Text", "unnamed": 1, "visible": True} @@ -86,18 +87,35 @@ o_SettingsHome_Bluetooth_Cuff_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "Bluetooth Cuff", "type": "Text", "visible": True} o_SettingsBase_Devices_Label = {"container": o_SettingsBase_SettingsBase, "text": "Devices", "type": "Label", "unnamed": 1, "visible": True} o_SettingsBase_Bluetooth_Cuff_Text = {"container": o_SettingsBase_SettingsBase, "text": "Bluetooth Cuff", "type": "Text", "unnamed": 1, "visible": True} -o_SettingsBase_SettingsDG = {"container": o_Gui_MainView_2, "objectName": "_SettingsBase", "type": "SettingsDG", "visible": True} +o_SettingsBase_SettingsDG = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDG", "visible": True} o_SettingsBase_DG_Cleaning_Text = {"container": o_SettingsBase_SettingsDG, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True} o_SettingsHome_DG_Cleaning_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Water_Flush_Text = {"container": o_SettingsBase_SettingsDG, "text": "Water Flush", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Heat_Disinfection_Text = {"container": o_SettingsBase_SettingsDG, "text": "Heat Disinfection", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Chemical_Disinfection_Text = {"container": o_SettingsBase_SettingsDG, "text": "Chemical Disinfection", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_backButton_BackButton = {"container": o_SettingsBase_SettingsWiFi, "gradient": 0, "objectName": "_backButton", "type": "BackButton", "visible": True} -o_back_button = {"container": o_Gui_MainView_2, "text": "BACK", "type": "Text", "unnamed": 1, "visible": False} +o_back_button = {"container": o_Gui_MainView, "text": "BACK", "type": "Text", "unnamed": 1, "visible": False} o_SettingsBase_SCAN_Text_2 = {"container": o_SettingsBase_SettingsBase, "text": "SCAN", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_ssidText_Text = {"container": o_SettingsBase_SettingsWiFi, "id": "_ssidText", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_input_TextInput = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_SettingsBase_input_TextInput_2 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_SettingsBase_input_TextInput_3 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_SettingsBase_input_TextInput_4 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} + + +o_services_screen_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} +o_settings_text = {"container":o_Gui_MainView , "text": "Settings", "type": "Text", "unnamed": 1, "visible": True} +o_service_text = {"container": o_Gui_MainView , "text": "Service", "type": "Text", "unnamed": 1, "visible": True} +o_userConfirmation_UserConfirmation = {"container": o_Gui_MainView, "objectName": "UserConfirmation", "type": "UserConfirmation", "visible": True} +o_service_text_title = {"container": o_userConfirmation_UserConfirmation, "text": "Service Password", "type": "Text", "unnamed": 1, "visible": True} +o_password_text_field = {"container": o_userConfirmation_UserConfirmation, "id": "_password", "type": "TextEntry", "unnamed": 1, "visible": True} +o_show_password = {"container": o_userConfirmation_UserConfirmation, "id": "_showPassword", "source": "qrc:/images/iEye", "type": "Image", "unnamed": 1, "visible": True} +o_switch_keyboard_to_keypad = {"container": o_Gui_MainView, "text": "&123", "type": "Text", "unnamed": 1, "visible": True} o_keyboard_object = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} +#virtal keypad input field +o_keypad_input = {"container": o_Gui_MainView, "id": "_keyText", "type": "Text", "unnamed": 1, "visible": True} +#virtal keypad back space key +o_back_space_key = {"container": o_Gui_MainView, "id": "_backspaceKeyIcon", "source": "qrc:/plugins/QtQuick/VirtualKeyboard/Styles/denali/images/iBackspace.svg", "type": "Image", "unnamed": 1, "visible": True} +o_service_confirm_btn = {"container": o_userConfirmation_UserConfirmation, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} +o_userConfirmation_backButton_BackButton = {"container": o_userConfirmation_UserConfirmation, "gradient": 0, "objectName": "_backButton", "type": "BackButton", "visible": True} +o_service_back_btn = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True}