Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -r16a8f25568b4636ebc31e76c86a8031940cc4ad7 -r5292af384a2d6a77e9fe40396eee96be27c69719 --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 16a8f25568b4636ebc31e76c86a8031940cc4ad7) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 5292af384a2d6a77e9fe40396eee96be27c69719) @@ -25,8 +25,7 @@ /*! * \brief Contains the Alarm Dialog Implementation */ -ModalDialog { id : _root - contentItem.objectName: "_NotificationDialog" // SquishQt +Item { id : _root property alias titleText : _title.text; property alias titleBarForeground : _title.color @@ -39,8 +38,7 @@ property color contentbackgroundColor : Colors.offWhite property int headerOverlap : 30 - backgroundColor : contentbackgroundColor - radius : Variables.alarmDialogRadius + anchors.fill: parent signal muteClicked() signal minimizeClicked() @@ -51,7 +49,7 @@ color : Colors.backgroundButtonSelect height : Variables.alarmDialogHeaderHeight + _root.headerOverlap width : _root.width - radius : _root.radius + radius : Variables.alarmDialogRadius clip : true Image { @@ -126,21 +124,18 @@ TouchGrid { id: _alarmGrid anchors { - top : _content.top - topMargin : Variables.minVGap - bottom : _root.bottom - bottomMargin : Variables.mainMenuHeight + Variables.minVGap - horizontalCenter: parent.horizontalCenter + fill : parent + leftMargin : 50 + rightMargin : 50 } visible : vAlarmActiveList.adjustment_Accepted alignCenter : false - width : _content.width - Variables.minVGap * 2 // * 2 : for each side height : _content.height - Variables.minVGap * 2 - _titleBar.height // * 2 : for each side colCount : 1 rowCount : vAlarmActiveList.alarmIDs.length itemHeight : 75 - itemWidth : _content.width - Variables.minVGap * (2 + 1) // * 2 : for each side & the +1 to not cover the scrollbar + itemWidth : width rowSpacing : 0 colSpacing : 0 lineColor : Colors.alarmDialogText