Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -r8f83b92860a33498ea7856e63afef0a10ee11923 -r376859852f4d1a07263c44524aec347db29e0133 --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 8f83b92860a33498ea7856e63afef0a10ee11923) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 376859852f4d1a07263c44524aec347db29e0133) @@ -20,6 +20,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/compounds" /*! * \brief Contains the Alarm Dialog Implementation @@ -28,7 +29,6 @@ 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 @@ -39,6 +39,7 @@ signal muteClicked() signal minimizeClicked() + signal itemClicked(int vIndex) property bool titleFading : false Fader { @@ -96,7 +97,28 @@ } } + TouchGrid { id: _alarmsGrid + visible : vAlarmActiveList.adjustment_Accepted + anchors.top : _titleBar.bottom + anchors.horizontalCenter: parent.horizontalCenter + itemsValueLeftMargin : 70 + height : Variables.dialogHeight - _titleBar.height //+ Variables.minVGap2 + width : parent.width + colCount : 1 + rowCount : 10 + itemWidth : Variables.dialogWidth - Variables.minVGap2*2 + itemHeight : 58 + rowSpacing : 0 + lineColor : Colors.backgroundMain + itemsText : vAlarmActiveList.alarmIDs // [ 100, 200, 300, 400, 500, 600, 700, 800, 9999 ] + itemsValue : vAlarmActiveList.alarmTexts // [ "Alarm\nAtal Matal Tootoole 1", "Alarm\nGave hasan checjoore 2", "Alarm\nNa Shir Dare Na Pestoon 3", "Alarm\nGavesho bordan hendestoon 4", "Alarm 5", "Alarm 6", "Alarm 7", "Alarm 8", "Alarm 9" ]// vAlarmActiveList + itemsTouchable : [ 1,1,1,1,1,1,1,1,1,1 ] + onItemClicked : _root.itemClicked(vIndex) + } + Text { id: _desc + visible : ! vAlarmActiveList.adjustment_Accepted + text : vAlarmActiveList.status objectName: "_NotificationDialog_Description" color: Colors.textMain font.pixelSize: Fonts.fontPixelButton