Index: shared/scripts/names.py
===================================================================
diff -u -rab639c7acff8c8444f869f2ac898a1cd241efa87 -r3037246670bc9f00dff0acc09f82b5aca6cd2bb8
--- shared/scripts/names.py	(.../names.py)	(revision ab639c7acff8c8444f869f2ac898a1cd241efa87)
+++ shared/scripts/names.py	(.../names.py)	(revision 3037246670bc9f00dff0acc09f82b5aca6cd2bb8)
@@ -48,54 +48,19 @@
 o_cumulative_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True}
 
 
+
 #settings_Home
-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}
+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}
+o_service_home_text_obj = {"container": o_SettingsHome_SettingsHome_2, "type": "Text", "unnamed": 1, "visible": True}
+o_set_date_and_time_text = {"container": o_Gui_MainView, "text": "Set Date And Time", "type": "Text", "unnamed": 1, "visible": True}
+o_SettingsHome_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDateTime", "visible": True}
+o_set_date_and_time_text_obj = {"container": o_SettingsHome_SettingsHome, "type": "Text", "unnamed": 1, "visible": True}
+o_back_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iBack", "type": "Image", "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}
-#shutdown
-o_shutdown_btn= {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True}
-
 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_back_btn = {"container": o_Gui_MainView, "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_base_object={"container": o_SettingsBase_SettingsBase, "id": "_logTypeRow", "type": "Row", "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}
-
-
-
-#o_option_combo_box={"checkable": False, "container": o_Overlay, "id": "_logTypeDelegate", "type": "ItemDelegate", "unnamed": 1, "visible": True}
-#o_service_combo_box={"checkable": False, "container": o_Overlay, "id": "_logTypeDelegate", "text":"Service", "type": "ItemDelegate", "unnamed": 1, "visible": True}
-
-o_combo_box_text={"container": o_SettingsBase_SettingsBase, "echoMode": 0, "type": "TextField", "unnamed": 1, "visible": True}
-
-#slider
-o_sd_folder_slider = {"container": o_SettingsBase_SettingsBase, "id": "_sdcFolderView", "type": "ListView", "unnamed": 1, "visible": True}
-o_usb_folder_slider={"container": o_SettingsBase_SettingsBase, "id": "_usbFolderView", "type": "ListView", "unnamed": 1, "visible": True}
-o_slider_text = {"container": o_SettingsBase_SettingsBase, "text": "4.350", "type": "Text", "unnamed": 1, "visible": True}
-
-#SD Card Information
-o_sd_card_text = {"container": o_SettingsBase_SettingsBase, "text": "SD-Card (MB)\nFree : 0.000\nTotal: 0.000", "type": "Label", "unnamed": 1, "visible": True}
-o_sd_card_btn= {"container": o_SettingsBase_SettingsBase, "text": "SD", "type": "Label", "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}
-
-#USB drive Information
-# o_usb_text = {"container": o_SettingsBase_SettingsBase, "text": "USB Drive (MB)\nFree : 0.000\nTotal: 0.000", "type": "Label", "unnamed": 1, "visible": True}
-# o_usb_before_click= {"container": o_SettingsBase_SettingsBase, "text": 0, "type": "Label", "unnamed": 1, "visible": True}
-# o_usb_after_click={"container": o_SettingsBase_SettingsBase, "text": "USB", "type": "Label", "unnamed": 1, "visible": True}
-
-o_usb_folder_list= {"container": o_SettingsBase_SettingsBase, "id": "_usbFolderView", "type": "ListView", "unnamed": 1, "visible": True}
-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}
-#object on keyboard to switch to keypad
+o_settings_base_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "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}
 o_SettingsBase_SettingsDateTime = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDateTime", "visible": True}
@@ -108,12 +73,28 @@
 o_shutdown_text = {"container": o_Gui_MainView, "text": "SHUTDOWN", "type": "Text", "unnamed": 1, "visible": True}
 #alarm minimize button
 o_minimize_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iChevronDown", "type": "Image", "unnamed": 1, "visible": True}
-o_logTypeDelegate_ItemDelegate = {"checkable": False, "container": o_Overlay, "occurrence": 1, "type": "ItemDelegate", "unnamed": 1, "visible": True}
-o_checkable_false_container_container_o_Gui_MainView_type_Overlay_unnamed_1_visible_true_id_logTypeDelegate_occurrence_3_type_ItemDelegate_unnamed_1_visible_true_Text_1 = "{checkable='false' container={container=':o_Gui_MainView' type='Overlay' unnamed='1' visible='true'} id='_logTypeDelegate' occurrence='3' type='ItemDelegate' unnamed='1' visible='true'}.Text_1"
+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}
+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
+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}
+o_usb_folder_slider = {"container": o_SettingsBase_SettingsBase, "id": "_usbFolderView", "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}
 
 
-
-