Index: sources/view/hd/alarm/VAlarmStatus.cpp
===================================================================
diff -u -re1eed343ea59863ce6f04253b85f3a636786dab2 -rd619b1355f03ab8e2e53956908bda66fea542224
--- sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision e1eed343ea59863ce6f04253b85f3a636786dab2)
+++ sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision d619b1355f03ab8e2e53956908bda66fea542224)
@@ -14,26 +14,45 @@
  */
 #include "VAlarmStatus.h"
 
-using namespace Gui;
-using namespace View;
+// Project
+#include "GuiController.h"
 
-VAlarmStatus::VAlarmStatus(QObject *parent)
-{
-    Q_UNUSED(parent);
+VIEW_DEF_CLASS_ADJUSTMENT(VAlarmStatus, AlarmStatusData)
 
-    connect(&_GuiController, SIGNAL(didActionReceive(AlarmStatusData)),
-            this           , SLOT(onActionReceive(AlarmStatusData)));
+void VAlarmStatus::initConnections() {
+    ACTION_VIEW_CONNECTION(AlarmStatusData              );
+    ADJUST_VIEW_CONNECTION(AlarmAcknowledgeRequestData  );
+    ADJUST_VIEW_CONNECTION(AlarmSilenceRequestData      );
+    ADJUST_VIEW_CONNECTION(AlarmUserActionRequestData   );
+}
 
-    connect(this,            SIGNAL(requestActionTransmit(GuiActionType,QVariantList)),
-            &_GuiController, SLOT(doActionTransmit(GuiActionType,QVariantList)));
+void View::VAlarmStatus::doNotifyUserAction(
+        bool vOK        ,
+        bool vResume    ,
+        bool vRinseback ,
+        bool vEnd       )
+{
+    AlarmUserActionRequestData data;
+    if (vOK        ) { data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_ACK            ; goto lOut; }
+    if (vResume    ) { data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_RESUME         ; goto lOut; }
+    if (vRinseback ) { data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_RINSEBACK      ; goto lOut; }
+    if (vEnd       ) { data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_END_TREATMENT  ; goto lOut; }
+lOut:
+    emit didAdjustment(data);
+}
 
-    connect(this,            SIGNAL(requestAlarmAcknowledge(AlarmAcknowledgeRequestData)),
-            &_GuiController, SLOT(doAdjustment(AlarmAcknowledgeRequestData)));
-
-    connect(this,            SIGNAL(requestAlarmSilence(AlarmSilenceRequestData)),
-            &_GuiController, SLOT(doAdjustment(AlarmSilenceRequestData)));
+/*!
+ * \brief VAlarmStatus::requestSilence
+ *  Send out a request to silence alarms
+ */
+void View::VAlarmStatus::doSilence()
+{
+    AlarmSilenceRequestData data;
+    data.state = 1;
+    emit didAdjustment(data);
 }
 
+
 void VAlarmStatus::onActionReceive(const AlarmStatusData &vData)
 {
     GuiAlarmID alarmID = static_cast<GuiAlarmID>(vData.mTop);
@@ -44,7 +63,7 @@
     }
 
     if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) {
-        emit noAlarm();
+        emit didAlarmEmpty();
         return;
     }
 
@@ -76,7 +95,7 @@
     // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_4           ));
     alarm_Flag_alarmsCondition  (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION      ));
 
-    emit raiseAlarm();
+    emit didAlarmRaise();
 }
 
 /*!
@@ -132,25 +151,3 @@
     return QString("%0").arg(static_cast<GuiAlarmID>(alarm_AlarmID()));
     // coco end
 }
-
-/*!
- * \brief VAlarmStatus::requestOkay
- *  Send out a request to acknowledge this alarmID
- */
-void VAlarmStatus::onRequestOkay(GuiAlarmID alarmID)
-{
-    AlarmAcknowledgeRequestData data;
-    data.alarmID = (quint32)alarmID;
-    emit requestAlarmAcknowledge(data);
-}
-
-/*!
- * \brief VAlarmStatus::requestSilence
- *  Send out a request to silence alarms
- */
-void VAlarmStatus::onRequestSilence()
-{   
-    AlarmSilenceRequestData data;
-    data.state = 1;
-    emit requestAlarmSilence(data);
-}