Index: sources/gui/qml/AlarmItem.qml
===================================================================
diff -u -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 -re2b8925fd32e359b3c440acd61e921f0be825a65
--- sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021)
+++ sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision e2b8925fd32e359b3c440acd61e921f0be825a65)
@@ -18,7 +18,9 @@
 
 // Project
 //  C++ imports
-import VAlarmStatus     0.1
+//import VAlarmStatus     0.1
+import VAlarmActiveList 0.1
+import VAlarmStatusHelper 0.1
 
 //  Qml imports
 import "qrc:/globals"
@@ -35,17 +37,19 @@
 
     anchors.fill: parent
 
-    VAlarmStatus     { id: vAlarmStatus     }
+    //VAlarmStatus     { id: vAlarmStatus     }
     VAlarmActiveList { id: vAlarmActiveList }
+    VAlarmStatusHelper { id: vAlarmStatusHelper }
 
+
     readonly property alias  backgroundColor: _alarmDialog.backgroundColor
-    readonly property alias  textColor      : _alarmDialog.textColor
-    readonly property string title          : vAlarmStatus.title
-    readonly property string message        : vAlarmStatus.message
-    readonly property alias  isSilenced     : vAlarmStatus.alarm_Flag_alarmsSilenced
-    readonly property alias  timeout        : vAlarmStatus.alarm_MuteTimeout
-    readonly property alias  alarm_AlarmID  : vAlarmStatus.alarm_AlarmID
-    readonly property alias  hasAlarm       : vAlarmStatus.hasAlarm
+    readonly property color  textColor      : "red" //_alarmDialog.textColor
+    readonly property string title          : vAlarmStatusHelper.alarmTop  //vAlarmStatus.title
+    readonly property string message        : vAlarmStatusHelper.alarmMessage //vAlarmStatus.message
+    readonly property bool  isSilenced     : false //vAlarmStatus.alarmsFlags
+    readonly property int  timeout        : 0 //vAlarmStatus.alarm_MuteTimeout
+    readonly property int  alarm_AlarmID  : vAlarmStatusHelper.alarmTop //vAlarmStatus.alarm_AlarmID
+    readonly property bool  hasAlarm       : vAlarmStatusHelper.alarmTop !== 0
 
     function alarmMinimize() {
         // The has alarm check has been added here to let other components call this function,
@@ -66,7 +70,8 @@
         // The has alarm check has been added here to let other components call this function,
         // without worrying about the alarmDialog popoing up without an alarm present.
         // Look at the PowerItem as an example.
-        if ( ! vAlarmStatus.hasAlarm ) return
+        //if ( ! vAlarmStatus.hasAlarm ) return
+        if (!hasAlarm) return
 
         // close the user confirmation dialog if the alarm dialog is going to be dispalyed
         _confirmDialog.close()
@@ -104,11 +109,15 @@
         function onClicked                      (        ) { alarmMaximize () }
         function onMuteClicked                  (        ) { vAlarmStatus.doSilence() }
     }
-    Connections { target: vAlarmStatus
-        function onDidAlarmRaise                (        ) { alarmMaximize  () }
-        function onDidAlarmEmpty                (        ) { alarmHide      () }
+    //Connections { target: vAlarmStatus
+    //    function onDidAlarmRaise                (        ) { alarmMaximize  () }
+    //    function onDidAlarmEmpty                (        ) { alarmHide      () }
+    //}
+    onHasAlarmChanged: {
+        console.log("HasAlarm" + hasAlarm)
+        if (hasAlarm) alarmMaximize()
+        else alarmHide()
     }
-
     // TODO : Later need to create a base Notification dialog class
     //        and inherit NotificationDialog and AlarmListDialog from that
     //        Better be the NotificationDialog defined as parent
@@ -117,28 +126,28 @@
     NotificationDialog { id : _alarmDialog
         // this will change later to the actual message text
         // and the instruction would be in the dialog content
-
-        titleText           :   vAlarmStatus.title
+        titleBarForeground: "red"
+        titleText           :   _root.title //"Title" //vAlarmStatus.title
         titlePixelSize      :   Fonts.fontPixelAlarmTitle
-        description         :   vAlarmStatus.message
+        description         :   _root.message //vAlarmStatus.message
         descriptionPixelSize:   Fonts.fontPixelAlarmMessage
-        alarmID             :   vAlarmStatus.alarm_AlarmID
-        isSilenced          :   vAlarmStatus.alarm_Flag_alarmsSilenced
-        timeout             :   vAlarmStatus.alarm_MuteTimeout
-        okVisible           :   vAlarmStatus.alarm_Flag_UserMustAck
-        resumeVisible       : ! vAlarmStatus.alarm_Flag_noResume
-        rinsebackVisible    : ! vAlarmStatus.alarm_Flag_noRinseback
-        endVisible          : ! vAlarmStatus.alarm_Flag_noEndTreatment
-        minVisible          : ! vAlarmStatus.alarm_Flag_noMinimize
-        titleFading         :   vTDOpMode.fault
-        countDown           :   vTreatmentStop.countDown
-        countDownVisible    :   vTDOpMode.inTreatment
-                                && (
-                                    vHDTreatmentStates.txStop
-                                ||  vHDTreatmentStates.txRinseback
-                                ||  vHDTreatmentStates.txEnd
-                                    )
-                                && vTreatmentStop.total
+        alarmID             :   0 //vAlarmStatus.alarmTop
+        isSilenced          :   false //vAlarmStatus.alarm_Flag_alarmsSilenced
+        timeout             :   0 //vAlarmStatus.alarm_MuteTimeout
+        okVisible           :   false //vAlarmStatus.alarm_Flag_UserMustAck
+        resumeVisible       : ! false //vAlarmStatus.alarm_Flag_noResume
+        rinsebackVisible    : ! false //vAlarmStatus.alarm_Flag_noRinseback
+        endVisible          : ! false //vAlarmStatus.alarm_Flag_noEndTreatment
+        minVisible          : ! false //vAlarmStatus.alarm_Flag_noMinimize
+        titleFading         :   false //vTDOpMode.fault
+        countDown           :   0 //vTreatmentStop.countDown
+        countDownVisible    :   false //vTDOpMode.inTreatment
+                                //&& (
+                                //    vHDTreatmentStates.txStop
+                                //||  vHDTreatmentStates.txRinseback
+                                //||  vHDTreatmentStates.txEnd
+                                //    )
+                                //&& vTreatmentStop.total
 
         onMuteClicked       : vAlarmStatus.doSilence            ()
         onResumeClicked     : vAlarmStatus.doUserActionResume   ()
@@ -148,21 +157,21 @@
     }
 
     AlarmListDialog { id : _alarmListDialog
-        isSilenced          :   vAlarmStatus.alarm_Flag_alarmsSilenced
-        timeout             :   vAlarmStatus.alarm_MuteTimeout
-        minVisible          : ! vAlarmStatus.alarm_Flag_noMinimize
+        isSilenced          :   false //vAlarmStatus.alarm_Flag_alarmsSilenced
+        timeout             :   0 //vAlarmStatus.alarm_MuteTimeout
+        minVisible          : ! false //vAlarmStatus.alarm_Flag_noMinimize
         onMuteClicked       :   vAlarmStatus.doSilence()
-        titleFading         :   vTDOpMode.fault
+        titleFading         :   true //vTDOpMode.fault
     }
 
-    Connections { target: vAlarmStatus
-        function onAlarm_PriorityChanged        ( vValue ) {
-            [
-                _alarmDialog.titleBarBackground,
-                _alarmDialog.titleBarForeground,
-                _alarmDialog.backgroundColor   ,
-                _alarmDialog.textColor         ,
-            ] = Colors.alarmPriorityColors(vValue)
-        }
-    }
+    //Connections { target: vAlarmStatus
+    //    function onAlarm_PriorityChanged        ( vValue ) {
+    //        [
+    //            _alarmDialog.titleBarBackground,
+    //            _alarmDialog.titleBarForeground,
+    //            _alarmDialog.backgroundColor   ,
+    //            _alarmDialog.textColor         ,
+    //        ] = Colors.alarmPriorityColors(vValue)
+    //    }
+    //}
 }