Index: leahi.qrc
===================================================================
diff -u -r810193ec7b4826c46c6f10813194d0c8bd7982f1 -r1bbb0fdab1fae1d066e3692416dba145fc35d0db
--- leahi.qrc (.../leahi.qrc) (revision 810193ec7b4826c46c6f10813194d0c8bd7982f1)
+++ leahi.qrc (.../leahi.qrc) (revision 1bbb0fdab1fae1d066e3692416dba145fc35d0db)
@@ -96,6 +96,7 @@
resources/images/CloudSync.png
resources/images/Information.png
resources/images/Storage.png
+ resources/images/help.png
sources/gui/qml/components/MainMenu.qml
@@ -143,14 +144,12 @@
sources/gui/qml/components/DebugDataColumn.qml
sources/gui/qml/components/RangeSlider.qml
sources/gui/qml/components/MuteButton.qml
- sources/gui/qml/components/UpDownButton.qml
sources/gui/qml/components/ImageText.qml
sources/gui/qml/components/WaitDone.qml
sources/gui/qml/components/TimeCircle.qml
sources/gui/qml/components/Footer.qml
sources/gui/qml/components/TextEntry.qml
sources/gui/qml/components/ScrollBar.qml
- sources/gui/qml/compounds/Fader.qml
sources/gui/qml/components/FooterStatic.qml
sources/gui/qml/components/TimeEntry.qml
sources/gui/qml/components/Label.qml
@@ -162,6 +161,7 @@
sources/gui/qml/components/ArrowButton.qml
sources/gui/qml/components/HeaderBar.qml
sources/gui/qml/components/HeaderBarPopup.qml
+ sources/gui/qml/components/AlarmButtonRow.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -r810193ec7b4826c46c6f10813194d0c8bd7982f1 -r1bbb0fdab1fae1d066e3692416dba145fc35d0db
--- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 810193ec7b4826c46c6f10813194d0c8bd7982f1)
+++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 1bbb0fdab1fae1d066e3692416dba145fc35d0db)
@@ -55,6 +55,9 @@
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"
readonly property color dialogShadowColor : "#334E759C"
readonly property color backgroundRangeRect : "#3e546e"
@@ -115,7 +118,7 @@
readonly property color textNotificationHighBg : red
readonly property color textNotificationHighFg : white
- readonly property color alarmTopBarHighBg : "#831913"
+ readonly property color alarmTopBarHighBg : red
readonly property color alarmTopBarHighFg : white
readonly property color alarmTopBarMedBg : "#db8f00"
@@ -150,25 +153,25 @@
case GuiActions.ALARM_PRIORITY_HIGH:
titleBg = alarmTopBarHighBg
titleFg = alarmTopBarHighFg
- contentBg = textNotificationHighBg
+ contentBg = white
contentFg = textNotificationHighFg
break
case GuiActions.ALARM_PRIORITY_MEDIUM:
titleBg = alarmTopBarMedBg
titleFg = alarmTopBarMedFg
- contentBg = textNotificationMedBg
+ contentBg = white
contentFg = textNotificationMedFg
break
case GuiActions.ALARM_PRIORITY_LOW:
titleBg = alarmTopBarLowBg
titleFg = alarmTopBarLowFg
- contentBg = textNotificationLowBg
+ contentBg = white
contentFg = textNotificationLowFg
break
default : // GuiActions.ALARM_PRIORITY_NONE
titleBg = backgroundButtonSelect
titleFg = textMain
- contentBg = backgroundDialog
+ contentBg = white
contentFg = textMain
}
return [titleBg ,
Index: sources/gui/qml/main.qml
===================================================================
diff -u -rfea3fc898bc7f77cc8d6daba4ebad5ea651f6ffc -r1bbb0fdab1fae1d066e3692416dba145fc35d0db
--- sources/gui/qml/main.qml (.../main.qml) (revision fea3fc898bc7f77cc8d6daba4ebad5ea651f6ffc)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 1bbb0fdab1fae1d066e3692416dba145fc35d0db)
@@ -339,14 +339,13 @@
// then cannot be anchored.
NotificationBar { id: _alarmBar
anchors.bottom : _mainMenu.top
- backgroundColor : _alarmItem.backgroundColor
+ color : _alarmItem.backgroundColor
textColor : _alarmItem.textColor
alarmID : _alarmItem.alarm_AlarmID
text : _alarmItem.title
textPixelSize : Fonts.fontPixelAlarmBarTitle
isSilenced : _alarmItem.isSilenced
timeout : _alarmItem.timeout
- backgroundFading : vTDOpMode.fault
z : 995
}