Index: denali.pro.user =================================================================== diff -u -reb23f842f5b153622da276cdd167d98ea4d7ef04 -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 --- denali.pro.user (.../denali.pro.user) (revision eb23f842f5b153622da276cdd167d98ea4d7ef04) +++ denali.pro.user (.../denali.pro.user) (revision 1d43ff790e6a3fb03d371bb5bde9c2d432d299b6) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 --- denali.qrc (.../denali.qrc) (revision 45ce6e781782be5de1480a1e7acecd1d272bcc84) +++ denali.qrc (.../denali.qrc) (revision 1d43ff790e6a3fb03d371bb5bde9c2d432d299b6) @@ -10,6 +10,7 @@ sources/gui/qml/dialogs/PowerOff.qml sources/gui/qml/dialogs/AutoHideInfo.qml sources/gui/qml/dialogs/NotificationDialog.qml + sources/gui/qml/dialogs/AlarmListDialog.qml resources/images/Settings_gear_setting_tools-128.png @@ -40,6 +41,7 @@ resources/images/mute.png resources/images/chevron-down.png resources/images/chevron-up.png + resources/images/list.png sources/gui/qml/components/MainMenu.qml Index: resources/images/AlarmBell.png =================================================================== diff -u Binary files differ Index: resources/images/AlarmBellSilent.png =================================================================== diff -u Binary files differ Index: resources/images/doted-list.png =================================================================== diff -u Binary files differ Index: resources/images/list.png =================================================================== diff -u Binary files differ Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -r43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1 -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 1d43ff790e6a3fb03d371bb5bde9c2d432d299b6) @@ -34,16 +34,17 @@ visible : _text.text height : Variables.notificationHeight color : Colors.textNotificationNoneBg - //radius : Variables.dialogRadius + radius : Variables.dialogRadiusHalf anchors { bottom : parent.bottom left : parent.left right : parent.right } - signal maximizeClicked() - signal muteClicked() signal clicked() + signal muteClicked() + signal listClicked() + signal maximizeClicked() Image { id: _icon @@ -84,7 +85,7 @@ onClicked : _root.enableMute ? _root.muteClicked(): _root.clicked() } - UpDownButton { + UpDownButton { id: _updownButton isUp: true anchors { verticalCenter : _root.verticalCenter @@ -93,4 +94,27 @@ } onClicked: _root.maximizeClicked() } + + TouchRect { id: _alarmsList + height: 45 + width : height + + color : Colors.transparent + borderColor : Colors.white + + anchors { + verticalCenter : _root.verticalCenter + right : _updownButton.left + rightMargin : Variables.silenceIconMargin * 2 + } + + Image { id: _image + anchors.centerIn: parent + height : 25 + width : 25 + source : "qrc:/images/iList" + } + + onClicked: _root.listClicked() + } } Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u --- sources/gui/qml/dialogs/AlarmListDialog.qml (revision 0) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (revision 1d43ff790e6a3fb03d371bb5bde9c2d432d299b6) @@ -0,0 +1,100 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file NotificationDialog.qml + * \author (last) Peter Lucia + * \date (last) 06-Oct-2020 + * \author (original) Peter Lucia + * \date (original) 02-Jun-2020 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief Contains the Alarm Dialog Implementation + */ +ModalDialog { id : _root + contentItem.objectName: "_NotificationDialog" // SquishQt + + property alias titleText : _title.text; + property alias description : _desc.text; + property alias titleBarForeground : _title.color + property alias titleBarBackground : _titleBar.color + property alias isSilenced : _muteButton.isSilenced + property alias timeout : _muteButton.timeout + property int alarmID : -1 + + radius : Variables.dialogRadiusHalf + + signal muteClicked() + signal minimizeClicked() + + Rectangle { id: _titleBar + color : Colors.backgroundButtonSelect + height : Variables.mainMenuHeight + width : _root.width + radius : _root.radius + + Image { + id: _icon + source: "qrc:/images/iList" + anchors.horizontalCenter: _title.horizontalCenter + anchors.verticalCenter: _title.verticalCenter + anchors.horizontalCenterOffset: -_title.width + Variables.dialogIconHorizontalOffset; + height : 45 + width : 45 + } + + Text { id: _title + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + text: qsTr("Alarm list") + anchors.centerIn: _titleBar; + } + + MouseArea { id: _minimizeArea + anchors.fill: parent + onClicked : _root.minimizeClicked() + } + + UpDownButton { + isUp: false + anchors { + verticalCenter : _titleBar.verticalCenter + right : _titleBar.right + rightMargin : Variables.silenceIconMargin + } + onClicked: _root.minimizeClicked() + } + + MuteButton { id: _muteButton + anchors { + verticalCenter : _titleBar.verticalCenter + left : _titleBar.left + leftMargin : Variables.silenceIconMargin + } + onClicked: _root.muteClicked() + } + } + + Text { id: _desc + objectName: "_NotificationDialog_Description" + color: Colors.textMain + font.pixelSize: Fonts.fontPixelButton + anchors { + horizontalCenter: parent.horizontalCenter; + verticalCenter: parent.verticalCenter; + } + } +} Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -re1eed343ea59863ce6f04253b85f3a636786dab2 -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision e1eed343ea59863ce6f04253b85f3a636786dab2) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 1d43ff790e6a3fb03d371bb5bde9c2d432d299b6) @@ -44,7 +44,8 @@ // the isSilenced is helping not to show this dialog maximized and // then if the silence is set minimize it immediately // this behaviour doesn't look nice on the screen and it bounces - visible: description && ! isSilenced + visible : description && ! isSilenced + radius : Variables.dialogRadiusHalf signal muteClicked() signal minimizeClicked() @@ -54,9 +55,8 @@ signal endClicked() signal okClicked() - radius: 5 Rectangle { id: _titleBar - color : Colors.alarmTopBarHighBg + color : Colors.backgroundButtonSelect height : Variables.mainMenuHeight width : _root.width radius : _root.radius Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 45ce6e781782be5de1480a1e7acecd1d272bcc84) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 1d43ff790e6a3fb03d371bb5bde9c2d432d299b6) @@ -146,9 +146,9 @@ break default : // GuiActions.ALARM_PRIORITY_NONE titleBg = backgroundButtonSelect - titleFg = textButton + titleFg = textMain contentBg = backgroundDialog - contentFg = textButton + contentFg = textMain } return [titleBg , titleFg , Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1 -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 1d43ff790e6a3fb03d371bb5bde9c2d432d299b6) @@ -48,14 +48,15 @@ readonly property int touchRectHeight : 85 //K:D //70 readonly property int touchRectRadius : 45 - readonly property int titleBottomPadding : 25 + readonly property int titleBottomPadding : 25 readonly property int columnSpacing : 25 //K:D //20 readonly property int dialogMargin : mainMenuHeight * 2 readonly property int dialogWidth : applicationWidth - dialogMargin readonly property int dialogHeight : applicationHeight - dialogMargin readonly property int dialogRadius : 10 + readonly property int dialogRadiusHalf : 5 readonly property int rangeRectMargin : 1 readonly property int rangeRectRadius : 2 Index: sources/gui/qml/main.qml =================================================================== diff -u -r71784f783e4e2c0eadebef28eefb0fc53534ba66 -r1d43ff790e6a3fb03d371bb5bde9c2d432d299b6 --- sources/gui/qml/main.qml (.../main.qml) (revision 71784f783e4e2c0eadebef28eefb0fc53534ba66) +++ sources/gui/qml/main.qml (.../main.qml) (revision 1d43ff790e6a3fb03d371bb5bde9c2d432d299b6) @@ -143,32 +143,46 @@ // Alarms function alarmMinimize() { - _alarm_dialog .visible = false - _alarm_bar .visible = true + _alarmDialog .visible = false + _alarmListDialog.visible = false + _alarmBar .visible = true } function alarmMaximize() { - _alarm_dialog .visible = true - _alarm_bar .visible = false + _alarmDialog .visible = true + _alarmListDialog.visible = false + _alarmBar .visible = false } + function alarmList() { + _alarmDialog .visible = false + _alarmListDialog.visible = true + _alarmBar .visible = false + } function alarmHide() { - _alarm_dialog .visible = false - _alarm_bar .visible = false + _alarmDialog .visible = false + _alarmListDialog.visible = false + _alarmBar .visible = false } - NotificationBar { id : _alarm_bar - backgroundColor : _alarm_dialog.backgroundColor - textColor : _alarm_dialog.textColor + NotificationBar { id : _alarmBar + backgroundColor : _alarmDialog.backgroundColor + textColor : _alarmDialog.textColor anchors.bottom : _mainMenu.top text : vAlarmStatus.text; isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced timeout : vAlarmStatus.alarm_MuteTimeout onMuteClicked : vAlarmStatus.doSilence() + onListClicked : alarmList() onMaximizeClicked : alarmMaximize() onClicked : alarmMaximize() } - NotificationDialog { id : _alarm_dialog + // TODO : Later need to create a base Notification dialog class + // and inherit NotificationDialog and AlarmListDialog from that + // Beter be the NotificationDialog defined as parent + // and two separate dialogs by the names of AlarmDialog , AlarmListDlialog creatd. + // Same for the Notification Bar + NotificationDialog { id : _alarmDialog // this will change later to the actual message text // and the instruction would be in the dialog content titleText : "Alarm" @@ -195,29 +209,40 @@ } } + AlarmListDialog { id : _alarmListDialog + onMinimizeClicked : { + alarmMinimize() + // when used minimizes the alarm it can stay minimized until otherwize is set + // by the next alarm status received. + // see also the "Connections { target: vAlarmStatus" implementation + // vAlarmStatus.alarm_KeepMinimized = true + } + } + // 9 - Others Text { // TEST : Application version should be moved into the information screen later. - color: Colors.textMain + color : Colors.textMain anchors { - right: parent.right - margins: 5 - bottom: parent.bottom + top : parent.top + right : parent.right + topMargin : 35 + rightMargin : 125 } - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignBottom + horizontalAlignment : Text.AlignRight + verticalAlignment : Text.AlignBottom - height: Variables.mainMenuHeight - text: Qt.application.version + height : 25 + text : Qt.application.version font.pixelSize: 14 } Rectangle { // TEST : SD-Card not present should be handled with better indication(s). color : ! _GuiView.sdIsReady ? "red" : _GuiView.sdIsReadOnly ? "gray" : "green" anchors { - right : parent.right - bottom : parent.bottom - bottomMargin: 35 - rightMargin: 10 + top : parent.top + right : parent.right + topMargin : 15 + rightMargin : 125 } width : 25 height: 25 @@ -259,10 +284,10 @@ onAlarm_Flag_alarmsSilencedChanged : vAlarmStatus.alarm_KeepMinimized = vAlarmStatus.alarm_Flag_alarmsSilenced onAlarm_PriorityChanged: { [ - _alarm_dialog.titleBarBackground, - _alarm_dialog.titleBarForeground, - _alarm_dialog.backgroundColor , - _alarm_dialog.textColor , + _alarmDialog.titleBarBackground, + _alarmDialog.titleBarForeground, + _alarmDialog.backgroundColor , + _alarmDialog.textColor , ] = Colors.alarmPriorityColors(vAlarmStatus.alarm_Priority) }