Index: simulator/plugins/alarms/interface.ui =================================================================== diff -u -r8bfab5e4d1dd4e3bc638f28e77b4811218b84c39 -r4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7 --- simulator/plugins/alarms/interface.ui (.../interface.ui) (revision 8bfab5e4d1dd4e3bc638f28e77b4811218b84c39) +++ simulator/plugins/alarms/interface.ui (.../interface.ui) (revision 4da03e2d7ca1895efdbdff0c59114cdca1bfd6b7) @@ -6,14 +6,14 @@ 0 0 - 939 - 828 + 472 + 652 &Alarms/&Alarm - + @@ -29,6 +29,285 @@ + + + + + color: rgb(238, 238, 236); +background-color: rgb(252, 175, 62); + + + Alarm Active List + + + Qt::AlignCenter + + + + + + + + + Accept + + + + + + + Reject + + + + + + + 999 + + + + + + + + 0 + 0 + + + + Reason + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + A0 + + + + + + + 999 + + + + + + + + + + + A1 + + + + + + + 999 + + + + + + + + + + + A2 + + + + + + + 999 + + + + + + + + + + + A3 + + + + + + + 999 + + + + + + + + + + + A4 + + + + + + + 999 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + A5 + + + + + + + 999 + + + + + + + + + + + A6 + + + + + + + 999 + + + + + + + + + + + A7 + + + + + + + 999 + + + + + + + + + + + A8 + + + + + + + 999 + + + + + + + + + + + A9 + + + + + + + 999 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + @@ -254,9 +533,6 @@ - - false - Mute @@ -293,12 +569,6 @@ 0 - - - 0 - 200 - - QAbstractItemView::NoEditTriggers @@ -458,13 +728,13 @@ - UNUSED_4 + NO_MINIMIZE Unchecked - ItemIsUserCheckable + ItemIsUserCheckable|ItemIsEnabled @@ -535,8 +805,18 @@ - - + + + + + 1 + + + 65535 + + + + @@ -555,16 +835,70 @@ - - - - 1 - - - 65535 - + + + + + + + + + + + NONE + + + + + U32 + + + + + S32 + + + + + F32 + + + + + BOOL + + + + + + + NONE + + + + + U32 + + + + + S32 + + + + + F32 + + + + + BOOL + + + + @@ -626,21 +960,39 @@ + btnAccept + btnReject + spnReason + spnP0 + spnP1 + spnP2 + spnP3 + spnP4 + spnP5 + spnP6 + spnP7 + spnP8 + spnP9 + btnSend + btnMute spnTopID rdoPriorityNone - rdoPriorityLow - rdoPriorityMed rdoPriorityHigh + rdoPriorityMed spnEscalatesIn - spnMuteTimeout - lstFlags - spnAlarmID tblTriggeredIDs + lstFlags + spnMuteTimeout tblStatusIDs - btnSend - btnMute btnTrigger btnClear + spnAlarmID + btnCondition + leDataField1 + leDataField2 + cbFieldDescriptor1 + cbFieldDescriptor2 + rdoPriorityLow @@ -708,5 +1060,21 @@ + + spnTopID + valueChanged(int) + btnSend + click() + + + 157 + 103 + + + 135 + 74 + + +