Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -rfc329c788fe9453983072bee937ccbc95b4ed6e4 -r161d1431cc3507cd430f54af6aa47dab5145d472 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 161d1431cc3507cd430f54af6aa47dab5145d472) @@ -35,6 +35,10 @@ property alias timeout : _muteButton.timeout property int alarmID : -1 + property alias countDown : _timeoutText.countDown + property alias countDownVisible : _timeoutText.visible + + property bool resumeVisible : false property bool rinsebackVisible : false property bool endVisible : false @@ -113,6 +117,24 @@ } onClicked: _root.muteClicked() } + + TimeText { id: _timeoutText + property int countDown : 0 + seconds : countDown * 60 + + height: _titleBar.height + anchors { + verticalCenter : _titleBar.verticalCenter + right : _titleBar.right + rightMargin : _minimizeButton.width * 2 + } + textPixelSize : 30 + textWeight : Font.Normal + secondsVisible : false + hourZero : false + minuteZero : true + } + // TODO: disable this later. this is only for diagnostic purpose when alarm dialog covers the entire screen. MouseArea { anchors.fill: _icon @@ -121,14 +143,23 @@ } } - Text { id: _desc - objectName: "_NotificationDialog_Description" - color: Colors.textMain - font.pixelSize: Fonts.fontPixelButton + Rectangle { id: _descReect + color: Colors.transparent anchors { - horizontalCenter: parent.horizontalCenter; - verticalCenter: parent.verticalCenter; + fill : parent + topMargin : 5 + _titleBar .height + bottomMargin : 5 + _buttonGroup .height + _buttonGroup.spacing } + + Text { id: _desc + objectName: "_NotificationDialog_Description" + color: Colors.textMain + font.pixelSize: Fonts.fontPixelButton + anchors { + horizontalCenter: parent.horizontalCenter + verticalCenter : parent.verticalCenter + } + } } Row { id: _buttonGroup