Index: leahi.pro
===================================================================
diff -u -r3c07dc803109f716937b692cb4a67a5324bb9ca3 -r66ed4277f1a2219554e1920f3701c1eb438e9a0a
--- leahi.pro (.../leahi.pro) (revision 3c07dc803109f716937b692cb4a67a5324bb9ca3)
+++ leahi.pro (.../leahi.pro) (revision 66ed4277f1a2219554e1920f3701c1eb438e9a0a)
@@ -180,6 +180,7 @@
sources/model/MModel.h \
sources/model/MAbstract.h \
sources/model/MAbstractDynamic.h \
+ sources/model/MListModel.h \
sources/device/DeviceModels.h \
\ # ---------- Models - TD - Data //// ----- @LEAHIZED
sources/model/td/data/MTDOpModeData.h \
@@ -496,6 +497,7 @@
\ # ---------- Models ----------
sources/model/MAbstract.cpp \
sources/model/MAbstractDynamic.cpp \
+ sources/model/MListModel.cpp \
sources/device/DeviceModels.cpp \
\ # ---------- Models - TD - Data - States
sources/model/td/data/MTDOpModeData.cpp \
Index: leahi.qrc
===================================================================
diff -u -r21041955990385205ec1aca17ef51fc1fd9a4b29 -r66ed4277f1a2219554e1920f3701c1eb438e9a0a
--- leahi.qrc (.../leahi.qrc) (revision 21041955990385205ec1aca17ef51fc1fd9a4b29)
+++ leahi.qrc (.../leahi.qrc) (revision 66ed4277f1a2219554e1920f3701c1eb438e9a0a)
@@ -42,6 +42,9 @@
sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
+
+ sources/gui/qml/dialogs/headerbar/WiFiDialog.qml
+
resources/images/Logo d.png
resources/images/Logo DialityT.png
@@ -156,6 +159,7 @@
sources/gui/qml/components/LabelValue.qml
sources/gui/qml/components/ArrowButton.qml
sources/gui/qml/components/HeaderBar.qml
+ sources/gui/qml/components/HeaderBarPopup.qml
sources/gui/qml/components/AlarmButtonRow.qml
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -r21041955990385205ec1aca17ef51fc1fd9a4b29 -r66ed4277f1a2219554e1920f3701c1eb438e9a0a
--- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 21041955990385205ec1aca17ef51fc1fd9a4b29)
+++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 66ed4277f1a2219554e1920f3701c1eb438e9a0a)
@@ -54,6 +54,7 @@
readonly property color backgroundUltrafiltrationButton : "#31568F"
readonly property color textValueUltrafiltrationButtonFg: "#98aec2"
+ readonly property color dialogText : "#343434"
readonly property color alarmDialogText : "#343434"
readonly property color alarmDialogGreyText : "#838080"
readonly property color alarmDialog : "#FEFEFE"
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r21041955990385205ec1aca17ef51fc1fd9a4b29 -r66ed4277f1a2219554e1920f3701c1eb438e9a0a
--- sources/gui/qml/main.qml (.../main.qml) (revision 21041955990385205ec1aca17ef51fc1fd9a4b29)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 66ed4277f1a2219554e1920f3701c1eb438e9a0a)
@@ -26,7 +26,8 @@
import VHDAccelerometer 0.1
import VHDSyringePump 0.1
import VHDBloodLeak 0.1
-import VHDAirBubble 0.1
+import VTDAirBubble 0.1
+import VTDAirPump 0.1
import VTDAirTrap 0.1
import VTDVoltage 0.1
import VTDValves 0.1
@@ -90,19 +91,22 @@
import VPreTreatmentAdjustmentStartTreatment 0.1
// ---
import VDGDrainPump 0.1
-import VDGHeaters 0.1
+import VDDHeaters 0.1
import VDGLoadCellReadings 0.1
import VDGOperationMode 0.1
-import VDGPressures 0.1
+import VDDPressures 0.1
import VDGROPump 0.1
import VDGReservoir 0.1
-import VDGTemperatures 0.1
-import VDGValvesStates 0.1
+import VDDConcentratePump 0.1
+import VDDTemperatures 0.1
+import VDDDialysatePump 0.1
+import VDDValvesStates 0.1
import VTreatmentCreate 0.1
import VDGAccelerometer 0.1
import VDDConductivity 0.1
import VDDGenDialysate 0.1
import VDDLevel 0.1
+import VDDBloodLeak 0.1
// In-Treatment - Adjustemnt
import VTreatmentAdjustmentDuration 0.1
import VTreatmentAdjustmentFlows 0.1
@@ -133,6 +137,7 @@
import "qrc:/components"
import "qrc:/dialogs"
import "qrc:/dialogs/diagnostics"
+import "qrc:/dialogs/headerbar"
/*!
* \brief Initialization and start point of the QML
@@ -190,7 +195,8 @@
VGeneralEvent { id: vGeneralEvent }
VHDAccelerometer { id: vHDAccelerometer }
VHDSyringePump { id: vHDSyringePump }
- VHDAirBubble { id: vHDAirBubble }
+ VTDAirBubble { id: vTDAirBubble }
+ VTDAirPump { id: vTDAirPump }
VHDBloodLeak { id: vHDBloodLeak }
VTDAirTrap { id: vTDAirTrap }
VTDVoltage { id: vTDVoltage }
@@ -211,18 +217,21 @@
VTreatmentStop { id: vTreatmentStop }
// ---- DG
VDGDrainPump { id: vDGDrainPump }
- VDGHeaters { id: vDGHeaters }
+ VDDHeaters { id: vDDHeaters }
VDGLoadCellReadings { id: vDGLoadCellReadings }
VDGOperationMode { id: vDGOperationMode }
- VDGPressures { id: vDGPressures }
+ VDDPressures { id: vDDPressures }
VDGROPump { id: vDGROPump }
VDGReservoir { id: vDGReservoir }
- VDGTemperatures { id: vDGTemperatures }
- VDGValvesStates { id: vDGValvesStates }
+ VDDConcentratePump { id: vDDConcentratePump }
+ VDDTemperatures { id: vDDTemperatures }
+ VDDDialysatePump { id: vDDDialysatePump }
+ VDDValvesStates { id: vDDValvesStates }
VDGAccelerometer { id: vDGAccelerometer }
VDDConductivity { id: vDDConductivity }
VDDGenDialysate { id: vDDGenDialysate }
VDDLevel { id: vDDLevel }
+ VDDBloodLeak { id: vDDBloodLeak }
// --- Pre-Treatment Progress Data
VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment }
VDGFilterFlush { id: vDGFilterFlush }
@@ -334,6 +343,7 @@
// keyboard should always be before AlarmItem to not to covet it.
KeyboardItem { id: _keyboard }
+ WiFiDialog { id: _wifiDialog }
LockDialog { id: _lockDialog }
AlarmItem { id: _alarmItem ; z: 996 }
PowerItem { id: _powerItem ; z: 997 }