Index: denali.pro =================================================================== diff -u -r9abc1790bb39fb52bf5a2bd113bc8957e4a1fc30 -r13e65c3d271d503c2e2e2f1f20736652c470f8cc --- denali.pro (.../denali.pro) (revision 9abc1790bb39fb52bf5a2bd113bc8957e4a1fc30) +++ denali.pro (.../denali.pro) (revision 13e65c3d271d503c2e2e2f1f20736652c470f8cc) @@ -54,6 +54,7 @@ sources/cloudsync \ sources/abstract \ sources/model \ + sources/model/confirm \ sources/model/settings \ sources/model/ui/data \ sources/model/hd/adjustment \ @@ -76,6 +77,7 @@ sources/model/dg/adjustment \ sources/model/dg/adjustment/settings \ sources/view \ + sources/view/confirm \ sources/view/settings \ sources/view/pretreatment \ sources/view/ui/data \ @@ -126,6 +128,8 @@ sources/model/MAbstract.h \ sources/model/MAbstractDynamic.h \ sources/device/DeviceModels.h \ + \ # ---------- Models - confirm + sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST sources/model/dg/data/post/MDGPostFinalResultData.h \ sources/model/dg/data/post/MDGPostSingleResultData.h \ @@ -135,10 +139,11 @@ sources/model/settings/MSettings.h \ sources/model/settings/MWifiNetwork.h \ sources/model/settings/MBluetooth.h \ + sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h \ - sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h \ - sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.h \ + sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \ + sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.h \ sources/model/hd/alarm/MAlarmTriggered.h \ @@ -263,9 +268,10 @@ sources/view/VTreatmentCreate.h \ sources/view/VEventSpy.h \ sources/view/VView.h \ - sources/view/VPowerOff.h \ sources/view/VGeneralEvent.h \ sources/device/DeviceView.h \ + \ # ---------- Views - CONFIRM + sources/view/confirm/VConfirm.h \ \ # ---------- Views - POST sources/view/dg/data/post/VDGPOSTData.h \ \ # ---------- Views - Settings @@ -275,7 +281,8 @@ sources/view/settings/VNetworkModel.h \ sources/view/settings/VAdjustmentVersions.h \ sources/view/settings/VAdjustmentAlarmVolume.h \ - sources/view/settings/VAdjustmentService.h \ + sources/view/settings/VAdjustmentServiceMode.h \ + sources/view/settings/VAdjustmentServiceDates.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ sources/view/hd/alarm/VAlarmActiveList.h \ @@ -381,7 +388,7 @@ sources/device/DeviceController.cpp \ sources/model/ui/data/MUIBloodPressureData.cpp \ sources/storage/Settings.cpp \ - sources/storage/TreatmentLog.cpp \ + sources/storage/TreatmentLog.cpp \ sources/view/hd/data/post/VHDPOSTData.cpp \ sources/wifi/WifiInterface.cpp \ sources/bluetooth/BluetoothInterface.cpp \ @@ -390,6 +397,8 @@ sources/model/MAbstract.cpp \ sources/model/MAbstractDynamic.cpp \ sources/device/DeviceModels.cpp \ + \ # ---------- Models - CONFIRM + sources/model/confirm/MDuetConfirmHDi.cpp \ \ # ---------- Models - POST sources/model/dg/data/post/MDGPostFinalResultData.cpp \ sources/model/dg/data/post/MDGPostSingleResultData.cpp \ @@ -398,10 +407,11 @@ \ # ---------- Models - settings sources/model/settings/MSettings.cpp \ sources/model/settings/MBluetooth.cpp \ + sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp \ - sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp \ - sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.cpp \ + sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \ + sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.cpp \ sources/model/hd/alarm/MAlarmMapping.cpp \ @@ -518,9 +528,10 @@ \ # ---------- Views ---------- sources/view/VTreatmentCreate.cpp \ sources/view/VEventSpy.cpp \ - sources/view/VPowerOff.cpp \ sources/view/VGeneralEvent.cpp \ sources/device/DeviceView.cpp \ + \ # ---------- Views - CONFIRM + sources/view/confirm/VConfirm.cpp \ \ # ---------- Views - POST sources/view/dg/data/post/VDGPOSTData.cpp \ \ # ---------- Views - Alarm @@ -533,7 +544,8 @@ sources/view/settings/VNetworkModel.cpp \ sources/view/settings/VAdjustmentVersions.cpp \ sources/view/settings/VAdjustmentAlarmVolume.cpp \ - sources/view/settings/VAdjustmentService.cpp \ + sources/view/settings/VAdjustmentServiceMode.cpp \ + sources/view/settings/VAdjustmentServiceDates.cpp \ \ # ---------- Views - HD - Adjustment sources/view/VAdjustmentResponseBase.cpp \ \ # ---------- Views - HD - Adjustment - common