Index: shared/scripts/names.py =================================================================== diff -u -rbec0c66d0ec74cf5478cb360e0d640cd9b32775f -r2b68cf8ce895e5dccf80c4fafc378d827d35cbcd --- shared/scripts/names.py (.../names.py) (revision bec0c66d0ec74cf5478cb360e0d640cd9b32775f) +++ shared/scripts/names.py (.../names.py) (revision 2b68cf8ce895e5dccf80c4fafc378d827d35cbcd) @@ -61,12 +61,10 @@ o_PreTreatmentBase_backgroundRect_Rectangle = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_PreTreatmentBase_confirmButton_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} - #standbymode o_MainHome_MainHome = {"container": o_Gui_MainView, "objectName": "_MainHome", "type": "MainHome", "visible": True} o_standby_page = {"container": o_MainHome_MainHome, "type": "Column", "unnamed": 1, "visible": True} - #alarm list o_alarm_list_container = {"container": o_Overlay, "id": "_flickable", "type": "Flickable", "unnamed": 1, "visible": True} o_notification_bar_alarm_list_button = {"container": o_Gui_MainView, "id": "_alarmListImage", "source": "qrc:/images/iList", "type": "Image", "unnamed": 1, "visible": True} @@ -117,7 +115,6 @@ o_alarm_not_silence_img = {"container": o_alarm_dialog_content, "id": "_muteButton", "type": "MuteButton", "visible": True} o_alarm_silence_img = {"container": o_alarm_dialog_content, "id": "_muteButton", "type": "MuteButton", "visible": True} - #in-treatment o_blood_priming = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "Blood Priming", "type": "Text", "unnamed": 1, "visible": True} o_blood_priming_value_by_default = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "0 mL", "type": "Text", "unnamed": 1, "visible": True} @@ -132,7 +129,6 @@ o_uf_maximum_title = {"container": o_Overlay, "text": "0.600", "type": "Text", "unnamed": 1, "visible": True} o_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True} - # Saline bolus objects o_treatmentHome = {"container": o_QQuickView , "id": "_treatmentHome" , "type": "TreatmentHome", "unnamed": 1, "visible": True} o_treatmentStart_TreatmentStart = {"container": o_QQuickView, "id": "_treatmentStart", "type": "TreatmentStart", "unnamed": 1, "visible": True} @@ -227,7 +223,6 @@ o_blood_flow_slider = {"container": o_Overlay, "id": "_bloodFlowSlider", "type": "Slider", "unnamed": 1, "visible": True} o_treatmentHome_NotificationBar_NotificationBarSmall = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "objectName": "NotificationBar", "type": "NotificationBarSmall", "visible": True} - #settings_Home o_service_text = {"container": o_Gui_MainView, "text": "Service", "type": "Text", "unnamed": 1, "visible": True} o_SettingsHome_SettingsHome_2 = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True} @@ -416,8 +411,6 @@ o_progress_bar = {"container": o_postModeScreen_ScreenItem, "type": "ProgressBar", "unnamed": 1, "visible": True} - - # #create_treatment # #vital time interval # #create_custom treatment testcase @@ -962,8 +955,6 @@ 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} - - # 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} @@ -973,16 +964,18 @@ # #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} -#USB drive Information -o_usb_folder_file = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True} -o_usb_folder_id = {"container": o_SettingsBase_SettingsBase, "type": "Text", "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} +o_SettingsBase_SettingsExportLogs = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsExportLogs", "visible": True} +o_SettingsBase_sdcFolderView_ListView = {"container": o_SettingsBase_SettingsExportLogs, "id": "_sdcFolderView", "type": "ListView", "unnamed": 1, "visible": True} + #device log objects o_SettingsBase_progressCircle_ProgressCircle = {"container": o_SettingsBase_SettingsBase, "id": "_progressCircle", "type": "ProgressCircle", "unnamed": 1, "visible": True} o_SettingsBase_usbFolderRectangle_Rectangle = {"container": o_SettingsBase_SettingsBase, "gradient": 0, "id": "_usbFolderRectangle", "type": "Rectangle", "unnamed": 1, "visible": True} o_SettingsBase_progressCircle_ProgressCircle_2 = {"container": o_SettingsBase_SettingsBase, "id": "_progressCircle", "occurrence": 2, "type": "ProgressCircle", "unnamed": 1, "visible": True} o_SettingsBase_image_Image = {"container": o_SettingsBase_SettingsBase, "id": "_image", "source": "qrc:/images/iEject", "type": "Image", "unnamed": 1, "visible": True} + #cloudsync o_mainItem_Item = o_mainItem_Item = {"container": o_Gui_MainView, "id": "_mainItem", "type": "Item", "unnamed": 1, "visible": True} o_PostTreatmentStack_PostTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PostTreatmentStack", "type": "PostTreatmentStack", "visible": True} @@ -1058,3 +1051,4 @@ progress_bar = {"container": o_initialModeScreen_ScreenItem, "id": "_textMaximum", "type": "Text", "unnamed": 1, "visible": False} o_alarm_text = {"container": o_Overlay, "id": "_desc", "objectName": "_NotificationDialog_Description", "type": "Text", "visible": True} o_SettingsBase_mouseArea_MouseArea = {"container": o_SettingsBase_SettingsWiFi, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} +