Index: denali.qrc =================================================================== diff -u -rb6f86ce89361e33d989f6a9d01eb94c344a6384f -rda551ce5083112de8dd027a264d9d4b7b98549f1 --- denali.qrc (.../denali.qrc) (revision b6f86ce89361e33d989f6a9d01eb94c344a6384f) +++ denali.qrc (.../denali.qrc) (revision da551ce5083112de8dd027a264d9d4b7b98549f1) @@ -33,6 +33,7 @@ sources/gui/qml/dialogs/NotificationDialog.qml sources/gui/qml/dialogs/AlarmListDialog.qml sources/gui/qml/dialogs/DiagnosticsDialog.qml + sources/gui/qml/dialogs/DryDemoDialog.qml resources/images/Logo d.png Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml =================================================================== diff -u -r9000da1a6517e4a81a82d9d9a4b671ee4178360b -rda551ce5083112de8dd027a264d9d4b7b98549f1 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 9000da1a6517e4a81a82d9d9a4b671ee4178360b) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision da551ce5083112de8dd027a264d9d4b7b98549f1) @@ -40,7 +40,7 @@ } function clear() { - _volumeSlider.reset ( _volumeSlider.defaultValue ) + _volumeSlider.reset ( _GuiView.dryDemoMode ? 2 : _volumeSlider.defaultValue ) _volumeSlider.isActive = _GuiView.dryDemoMode } @@ -96,7 +96,7 @@ topMargin: 425 } // The UF is active by default if the dryDemoMode - isActive: _GuiView.dryDemoMode ? true : false + isActive: _GuiView.dryDemoMode width : Variables.ultrafiltrationProgressbarWidth step : 0.100 stepSnap: true @@ -110,7 +110,7 @@ minText.font.pixelSize: Fonts.fontPixelFluidText maxText.font.pixelSize: Fonts.fontPixelFluidText // If dryDemoMode is enabled the default UF volume is 2 liters otherwise it should be - // 0 liters so the user can be picked + // 0 liters so the user can select the value defaultValue: _GuiView.dryDemoMode ? 2 : 0 onPressed: isActive = true @@ -140,5 +140,4 @@ _volumeSlider.isActive = true } } - }