Index: denali.pro
===================================================================
diff -u -r066258b65a1c41afe3828c92d2606d2642505d72 -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f
--- denali.pro	(.../denali.pro)	(revision 066258b65a1c41afe3828c92d2606d2642505d72)
+++ denali.pro	(.../denali.pro)	(revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f)
@@ -1,5 +1,6 @@
 QT += widgets qml quick serialbus concurrent
 CONFIG += c++17 warn_on
+# CONFIG += disable-desktop
 QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps # see .ii
 
 #CONFIG  += disable_crc
@@ -51,6 +52,7 @@
     sources/model \
     sources/model/settings \
     sources/model/hd/adjustment \
+    sources/model/hd/adjustment/settings \
     sources/model/hd/adjustment/pretreatment \
     sources/model/hd/adjustment/treatment \
     sources/model/hd/adjustment/posttreatment \
@@ -61,6 +63,7 @@
     sources/model/hd/data/posttreatment \
     sources/model/dg/data \
     sources/model/dg/adjustment \
+    sources/model/dg/adjustment/settings \
     sources/view \
     sources/view/settings \
     sources/view/hd/adjustment \
@@ -87,6 +90,9 @@
     sources/AlarmGenerator.h \
     sources/ApplicationPost.h \
     \ # Controllers
+    sources/model/dg/adjustment/settings/MAdjustDGRequests.h \
+    sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
+    sources/storage/Settings.h \
     sources/ApplicationController.h \
     \ # ---------- Models ----------
     sources/model/MModel.h \
@@ -101,7 +107,9 @@
     \ # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustRequestsBase.h \
     sources/model/hd/adjustment/MAdjustPowerOff.h \
-    sources/model/hd/adjustment/MAdjustHDVersionsResponse.h \
+    \ # ---------- Models - HD - Adjustment - Settings
+    sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h \
+    sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \
@@ -153,7 +161,9 @@
     sources/model/hd/data/treatment/MTreatmentRecirculateData.h \
     sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h \
     \ # ---------- Models - DG - Adjustment
-    sources/model/dg/adjustment/MAdjustDGVersionsResponse.h \
+    \ # ---------- Models - DG - Adjustment - Settings
+    sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h \
+    sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
     sources/model/dg/data/MDGFilterFlushData.h \
     \ # ---------- Models - DG - Data
@@ -182,15 +192,18 @@
     sources/gui/GuiView.h \
     sources/gui/GuiController.h \
     \ # ---------- Views ----------
-    sources/storage/Settings.h \
     sources/view/VTreatmentCreate.h \
     sources/view/VEventSpy.h \
     sources/view/VView.h \
     sources/view/VPowerOff.h \
+    \ # ---------- Views - Settings
+    sources/view/settings/VDateTime.h \
+    sources/view/settings/VSettings.h \
+    sources/view/settings/VAdjustmentVersions.h \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.h \
     \ # ---------- Views - HD - Adjustment
-    sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h \
+    sources/view/VAdjustmentResponseBase.h \
     \ # ---------- Views - HD - Adjustment - Pre-Treatment
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \
@@ -202,7 +215,6 @@
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \
     \ # ---------- Views - HD - Adjustment - In-Treatment
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentResponseBase.h \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \
@@ -263,11 +275,7 @@
     \ # Utility
     sources/utility/crc.h \
     sources/utility/format.h \
-    sources/utility/types.h \
-    sources/view/settings/VSettings.h
-#    sources/configuration/display.h \
-#    sources/configuration/sound.h \
-#    sources/storage/settings.h \
+    sources/utility/types.h
 
 SOURCES += \
     \ # common
@@ -278,6 +286,7 @@
     sources/AlarmGenerator.cpp \
     sources/ApplicationPost.cpp \
     \ # Controllers
+    sources/storage/Settings.cpp \
     sources/ApplicationController.cpp \
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
@@ -290,7 +299,9 @@
     sources/model/hd/alarm/MAlarmClearedCondition.cpp \
     \ # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustPowerOff.cpp \
-    sources/model/hd/adjustment/MAdjustHDVersionsResponse.cpp \
+    \ # ---------- Models - HD - Adjustment - Settings
+    sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp \
+    sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \
@@ -340,7 +351,9 @@
     sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp \
     sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp \
     \ # ---------- Models - DG - Adjustment
-    sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp \
+    \ # ---------- Models - DG - Adjustment - Settings
+    sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp \
+    sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
     sources/model/dg/data/MDGFilterFlushData.cpp \
     \ # ---------- Models - DG - Data
@@ -368,14 +381,17 @@
     sources/gui/GuiView.cpp \
     sources/gui/GuiController.cpp \
     \ # ---------- Views ----------
-    sources/storage/Settings.cpp \
     sources/view/VTreatmentCreate.cpp \
     sources/view/VEventSpy.cpp \
     sources/view/VPowerOff.cpp \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.cpp \
+    \ # ---------- Views - Settings
+    sources/view/settings/VSettings.cpp \
+    sources/view/settings/VDateTime.cpp \
+    sources/view/settings/VAdjustmentVersions.cpp \
     \ # ---------- Views - HD - Adjustment
-    sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp \
+    sources/view/VAdjustmentResponseBase.cpp \
     \ # ---------- Views - HD - Adjustment - Pre-Treatment
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \
@@ -387,7 +403,6 @@
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \
     sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \
     \ # ---------- Views - HD - Adjustment - In-Treatment
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentResponseBase.cpp \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.cpp \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp \
@@ -450,10 +465,8 @@
     \ # Utility
     sources/utility/crc.cpp \
     sources/utility/format.cpp \
-    sources/utility/types.cpp \
-    sources/view/settings/VSettings.cpp
+    sources/utility/types.cpp
 
-
 RESOURCES += \
     denali.qrc