Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -rf27e2cd32b03ade797a71947a8c9199c5e5a07e1 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision f27e2cd32b03ade797a71947a8c9199c5e5a07e1) @@ -189,7 +189,9 @@ let mMinimum = Number(_root.minimum.toFixed(decimal)) let mMaximum = Number(_root.maximum.toFixed(decimal)) - if(x < _handler.width) { + // the center of the handler is aligned on the snap point and half width shall be used to set as min not the entire width. + // also half of the hadler is out of slider min position when set on min, which proves the same as above. + if(x < ( _handler.width / 2 ) ) { // The outside of the slider, lower bound case return mMinimum } Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -rf27e2cd32b03ade797a71947a8c9199c5e5a07e1 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision f27e2cd32b03ade797a71947a8c9199c5e5a07e1) @@ -58,11 +58,11 @@ function clear() { reset(defaultValue) - active = false if ( toggleSwich ) { toggleSwich.checked = false toggleSwich.active = false } + _root.active = false } function reset(vValue) { Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -rf27e2cd32b03ade797a71947a8c9199c5e5a07e1 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision f27e2cd32b03ade797a71947a8c9199c5e5a07e1) @@ -33,7 +33,6 @@ signal treatmentEndClicked () header.backVisible : vTreatmentTime .time_IsLeft - header.backEnabled : _root.instructionIsLast onBackClicked : treatmentBackClicked() title.text : qsTr("Rinseback Setup") Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -rf27e2cd32b03ade797a71947a8c9199c5e5a07e1 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision f27e2cd32b03ade797a71947a8c9199c5e5a07e1) @@ -75,6 +75,7 @@ } function clear() { + _flickable.contentY = 0 _bloodFlowRate .clear() _dialysateFlowRate .clear() _duration .clear() Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -rf27e2cd32b03ade797a71947a8c9199c5e5a07e1 --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision f27e2cd32b03ade797a71947a8c9199c5e5a07e1) @@ -90,6 +90,8 @@ } function doExport() { + notificationText = _logTypeCombo.displayText + " " + + qsTr("log export to USB in progress ... ") refreshModels() switch (_logTypeCombo.currentIndex) { @@ -149,7 +151,9 @@ function onDidUSBDriveRemove ( ) { _usbFolderColumn. clearModel ( ) } function onDidExportLog ( vValue ) { _usbFolderColumn. clearModel ( ) } function onDidUSBDriveMount ( ) { _usbFolderColumn.updateModel ( ) } - function onDidExport ( ) { _usbFolderColumn.updateModel ( ) } + function onDidExport ( ) { _usbFolderColumn.updateModel ( ) + notificationText = _logTypeCombo.displayText + " " + + qsTr("log export to USB is complete") } } USBButton { id: _usbEjectButton @@ -193,6 +197,7 @@ // FIXME: This combobox needs to be a global Component ComboBox { id : _logTypeCombo onCurrentIndexChanged : { + notificationText = "" _root.updatePanels(currentIndex) } enabled : ! _GuiView.exportRunning && ! isUpdatePanels Index: sources/wifi/WifiInterface.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -rf27e2cd32b03ade797a71947a8c9199c5e5a07e1 --- sources/wifi/WifiInterface.cpp (.../WifiInterface.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/wifi/WifiInterface.cpp (.../WifiInterface.cpp) (revision f27e2cd32b03ade797a71947a8c9199c5e5a07e1) @@ -398,7 +398,7 @@ _processGenerateWPASupplicant.start(script, QStringList() << vNetwork.ssid() << vPassword - << _wpaSupplicantConfPath + << iface() << securityType); }