Index: leahi.qrc =================================================================== diff -u -r18567640c36d4bd3d2fa37ac929987cec7476309 -rf3cb87e84d6cb1034f2527ed44ceb119f59c4c77 --- leahi.qrc (.../leahi.qrc) (revision 18567640c36d4bd3d2fa37ac929987cec7476309) +++ leahi.qrc (.../leahi.qrc) (revision f3cb87e84d6cb1034f2527ed44ceb119f59c4c77) @@ -170,6 +170,7 @@ sources/gui/qml/components/Footer.qml sources/gui/qml/components/TextEntry.qml sources/gui/qml/components/ScrollBar.qml + sources/gui/qml/components/ScrollBar2.qml sources/gui/qml/components/FooterStatic.qml sources/gui/qml/components/TimeEntry.qml sources/gui/qml/components/Label.qml @@ -281,6 +282,7 @@ sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml sources/gui/qml/pages/treatment/TreatmentHeparin.qml sources/gui/qml/pages/treatment/TreatmentHDF.qml + sources/gui/qml/pages/treatment/TreatmentTrends.qml sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml Index: sources/gui/qml/dialogs/AlarmDialog.qml =================================================================== diff -u -r18567640c36d4bd3d2fa37ac929987cec7476309 -rf3cb87e84d6cb1034f2527ed44ceb119f59c4c77 --- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 18567640c36d4bd3d2fa37ac929987cec7476309) +++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision f3cb87e84d6cb1034f2527ed44ceb119f59c4c77) @@ -201,7 +201,7 @@ anchors { bottom : _alarmID.top - bottomMargin : Variables.defaultMargin * 2 + bottomMargin : Variables.defaultMargin * 6 left : parent.left leftMargin : Variables.defaultMargin * 4 } Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r2f524fd1b0badc222cd772417234770e5488cf56 -rf3cb87e84d6cb1034f2527ed44ceb119f59c4c77 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 2f524fd1b0badc222cd772417234770e5488cf56) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision f3cb87e84d6cb1034f2527ed44ceb119f59c4c77) @@ -92,6 +92,9 @@ readonly property color panelBackgroundColor : "#12FFFFFF" readonly property color panelBorderColor : "#4DB5B5B5" readonly property color panelInvalidBorderColor : "#FFA500" + readonly property color panelBackground : "#2A3F53" + readonly property color panelBorder : "#324C65" + readonly property color heparinPanelBorderColor         : "#CC42556B" readonly property color heparinSectionHeader            : "#384B60" readonly property color statusActive : "#339D47"