Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r72550dbbd6db8eab40aad38956b32f99416600c8 -r320972a712c31e94413056591634859b4b3d564e --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 72550dbbd6db8eab40aad38956b32f99416600c8) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 320972a712c31e94413056591634859b4b3d564e) @@ -55,6 +55,7 @@ readonly property color mainTreatmentOrange : "#FFB836" readonly property color mainTreatmentIsoBlue : "#C3F9FF" readonly property color alarmButton : borderButton + readonly property color progressGreen :"#3B8E54" readonly property color sliderHighlightColor : "orange" readonly property color sliderProgressBorderActive : white Index: sources/gui/qml/pages/settings/SettingsBase.qml =================================================================== diff -u -rccea9f498ece7b6f75e97d85c9312e67b736f98a -r320972a712c31e94413056591634859b4b3d564e --- sources/gui/qml/pages/settings/SettingsBase.qml (.../SettingsBase.qml) (revision ccea9f498ece7b6f75e97d85c9312e67b736f98a) +++ sources/gui/qml/pages/settings/SettingsBase.qml (.../SettingsBase.qml) (revision 320972a712c31e94413056591634859b4b3d564e) @@ -39,8 +39,7 @@ property alias title : _titleText.text property alias notificationText : _information.text - property alias notificationFontSize: _information.textfontSize - property int notificationMargin : 0 + property alias notificationAnchor : _information.anchors property alias backVisible : _backButton .visible property alias backEnabled : _backButton .enabled @@ -116,7 +115,6 @@ text : "" anchors { bottom : undefined - verticalCenterOffset: _root.notificationMargin verticalCenter : _backButton.verticalCenter left : _backButton.right right : _confirmButton.left Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -r80e196a153549a10b01ddc52fdd3c4f09d215da6 -r320972a712c31e94413056591634859b4b3d564e --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 80e196a153549a10b01ddc52fdd3c4f09d215da6) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 320972a712c31e94413056591634859b4b3d564e) @@ -85,8 +85,11 @@ confirmVisible : false backEnabled : ! _GuiView.exportRunning - notificationMargin : Variables.defaultMargin * 2 - notificationFontSize : Fonts.fontPixelStepNormal + notificationAnchor { + bottom : _root.bottom + bottomMargin : 90 + verticalCenter : undefined + } function refreshModels() { _usbFolderColumn.clearModel() @@ -246,7 +249,7 @@ anchors.left : parent.left width : _contentRect.columnWidthFolder - height : parent.height - ( Variables.notificationHeight + Variables.defaultMargin ) + height : parent.height - ( Variables.notificationHeight + Variables.defaultMargin * 4) // FIXME: there has to be a View for this, and the timer should be removed and an event driven signal should be implemented there. function updateModel() { @@ -431,7 +434,7 @@ anchors.right : parent.right width : _contentRect.columnWidthFolder - height : parent.height - ( Variables.notificationHeight + Variables.defaultMargin ) + height : parent.height - ( Variables.notificationHeight + Variables.defaultMargin * 4) // FIXME: there has to be a View for this, and the timer should be removed and an event driven signal should be implemented there. function updateModel() { @@ -516,7 +519,7 @@ rightMargin : Variables.defaultMargin } - color : _GuiView.exportRunning ? Colors.borderButtonSelected : Colors.transparent + color : _GuiView.exportRunning ? Colors.progressGreen : Colors.transparent bgColor : Colors.transparent width : parent.width height : parent.height Index: sources/gui/qml/pages/treatment/TreatmentHeparin.qml =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r320972a712c31e94413056591634859b4b3d564e --- sources/gui/qml/pages/treatment/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/qml/pages/treatment/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 320972a712c31e94413056591634859b4b3d564e) @@ -359,7 +359,6 @@ textColor : Colors.white imageSource : "" text : "" - anchors.bottomMargin: _root.notificationMargin }