Index: .gitignore =================================================================== diff -u --- .gitignore (revision 0) +++ .gitignore (revision c65859e54930664100dfdff13afa019e05ae23b6) @@ -0,0 +1,4 @@ + +etc/reports/alarms/AlarmMapping.csv + +etc/reports/alarms/AlarmMapping.py Index: sources/gui/qml/components/HeaderBarPopup.qml =================================================================== diff -u -red8be1a75c2b1b3cc9f5e919fd38e135f707eac6 -rc65859e54930664100dfdff13afa019e05ae23b6 --- sources/gui/qml/components/HeaderBarPopup.qml (.../HeaderBarPopup.qml) (revision ed8be1a75c2b1b3cc9f5e919fd38e135f707eac6) +++ sources/gui/qml/components/HeaderBarPopup.qml (.../HeaderBarPopup.qml) (revision c65859e54930664100dfdff13afa019e05ae23b6) @@ -31,7 +31,7 @@ modal : false closePolicy : Dialog.CloseOnPressOutside y : Variables.headerHeight + 5 - backgroundColor : "#D2D6DB" + backgroundColor : "#FEFEFE" showDropShadow : true onImplicitWidthChanged: Qt.callLater(function() { if (button) { adjustPosition(_root.button) } }) Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r67557d6769a1719e2a1c068303bda9816075dd84 -rc65859e54930664100dfdff13afa019e05ae23b6 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 67557d6769a1719e2a1c068303bda9816075dd84) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision c65859e54930664100dfdff13afa019e05ae23b6) @@ -53,6 +53,7 @@ property bool isRoundedEnds : true property bool hasBorder : true + property bool showMinMaxText : true property color borderColor : Colors.borderDisableButton signal activeChanged() @@ -162,13 +163,13 @@ } minText { - visible : true + visible : _root.showMinMaxText anchors.topMargin: Variables.sliderTextMargin font.pixelSize : Fonts.fontPixelSliderMarker font.bold : false } maxText { - visible : true + visible : _root.showMinMaxText anchors.topMargin: Variables.sliderTextMargin font.pixelSize : Fonts.fontPixelSliderMarker font.bold : false Index: sources/gui/qml/dialogs/headerbar/SettingsDialog.qml =================================================================== diff -u -r67557d6769a1719e2a1c068303bda9816075dd84 -rc65859e54930664100dfdff13afa019e05ae23b6 --- sources/gui/qml/dialogs/headerbar/SettingsDialog.qml (.../SettingsDialog.qml) (revision 67557d6769a1719e2a1c068303bda9816075dd84) +++ sources/gui/qml/dialogs/headerbar/SettingsDialog.qml (.../SettingsDialog.qml) (revision c65859e54930664100dfdff13afa019e05ae23b6) @@ -6,9 +6,8 @@ HeaderBarPopup { id: _root readonly property int sliderWidth : 430 readonly property color sliderBkgndColor : Colors.dialogShadowColor - readonly property color valueColor : "#3D8EEF" + readonly property color valueColor : Colors.dialogValueColor - height : 310 padding : Variables.defaultMargin QtObject { id: _private @@ -22,7 +21,6 @@ contentItem: Column { id : _dialogColumn anchors.centerIn : parent width : _private.columnWidth - height : _root.height spacing : Variables.defaultMargin Column { id: _brightness @@ -53,6 +51,8 @@ Slider { id : _brightnessSlider anchors.horizontalCenter: parent.horizontalCenter width : _root.sliderWidth + height : 10 + showMinMaxText : false step : 1 // no zero minimum : 1 maximum : 5 @@ -75,7 +75,6 @@ } } } - Item { height: 10; width: 10} // spacer item Line { id: _divider anchors.horizontalCenter: parent.horizontalCenter @@ -111,6 +110,8 @@ Slider { id : _volumeSlider anchors.horizontalCenter: parent.horizontalCenter width : _root.sliderWidth + height : 10 + showMinMaxText : false step : 1 // no zero minimum : 1 maximum : 5 Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r67557d6769a1719e2a1c068303bda9816075dd84 -rc65859e54930664100dfdff13afa019e05ae23b6 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 67557d6769a1719e2a1c068303bda9816075dd84) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision c65859e54930664100dfdff13afa019e05ae23b6) @@ -56,6 +56,7 @@ readonly property color textValueUltrafiltrationButtonFg: "#98aec2" readonly property color dialogText : "#343434" readonly property color dialogShadowColor : "#334E759C" + readonly property color dialogValueColor : "#3D8EEF" readonly property color backgroundRangeRect : "#3e546e" readonly property color highlightProgressBar : "#3d8eef"