Index: sources/gui/qml/AlarmItem.qml
===================================================================
diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r7a1509a80fed2dd51aa28b460acbf0227d0c96d7
--- sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 13d6a4fae2f910ab6e289ac9280258a94f734405)
+++ sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 7a1509a80fed2dd51aa28b460acbf0227d0c96d7)
@@ -46,7 +46,7 @@
         vAlarmStatus.doClearCondition()
     }
 
-    // Alarms
+    // Alarms dialog/bar navigation handling ----- vvvvv -----
     function alarmMinimize() {
         _alarmDialog    .visible = false
         _alarmListDialog.visible = false
@@ -69,18 +69,32 @@
         _alarmBar       .visible = false
     }
 
+    Connections { target: _alarmDialog
+        onMinimizeClicked   : vAlarmStatus.alarm_Flag_noMinimize ? alarmList()      : alarmMinimize()
+    }
+    Connections { target: _alarmListDialog
+        onMinimizeClicked   : vAlarmStatus.alarm_Flag_noMinimize ? alarmMaximize()  : alarmMinimize()
+    }
     Connections { target: _alarmBar
-        onMuteClicked       : vAlarmStatus.doSilence()
         onListClicked       : alarmList()
         onMaximizeClicked   : alarmMaximize()
         onClicked           : alarmMaximize()
     }
+    Connections { target: vAlarmStatus
+        onDidAlarmRaise: alarmMaximize()
+        onDidAlarmEmpty: alarmHide()
+    }
+    // ----- ^^^^^ -----
 
+    Connections { target: _alarmBar
+        onMuteClicked       : vAlarmStatus.doSilence()
+    }
+
     // TODO : Later need to create a base Notification dialog class
     //        and inherit NotificationDialog and AlarmListDialog from that
-    //        Beter be the NotificationDialog defined as parent
-    //        and two separate dialogs by the names of AlarmDialog , AlarmListDlialog creatd.
-    //        Same for the Notification Bar
+    //        Better be the NotificationDialog defined as parent
+    //        and create two separate dialogs by the names of AlarmDialog , AlarmListDlialog.
+    //        Same for the NotificationBar
     NotificationDialog { id : _alarmDialog
         // this will change later to the actual message text
         // and the instruction would be in the dialog content
@@ -101,68 +115,22 @@
         onRinsebackClicked  : vAlarmStatus.doUserActionRinseback()
         onEndClicked        : vAlarmStatus.doUserActionEnd      ()
         onOkClicked         : vAlarmStatus.doUserActionOk       ()
-        onMinimizeClicked   : {
-            if ( vAlarmStatus.alarm_Flag_noMinimize ) {
-                alarmList()
-            }
-            else {
-                alarmMinimize()
-                // when user minimizes the alarm it can stay minimized until otherwize is set
-                // by the next alarm status received.
-                // see also the "Connections { target: vAlarmStatus" implementation
-                vAlarmStatus.alarm_KeepMinimized = true
-            }
-        }
     }
 
     AlarmListDialog { id : _alarmListDialog
         isSilenced          :   vAlarmStatus.alarm_Flag_alarmsSilenced
         timeout             :   vAlarmStatus.alarm_MuteTimeout
         minVisible          : ! vAlarmStatus.alarm_Flag_noMinimize
         onMuteClicked       :   vAlarmStatus.doSilence()
-        onMinimizeClicked   : {
-            if ( vAlarmStatus.alarm_Flag_noMinimize ) {
-                alarmMaximize()
-            }
-            else {
-                alarmMinimize()
-            }
-        }
-
         titleFading         :   vHDOperationMode.fault
     }
 
     Connections { target: vAlarmStatus
-        onAlarm_Flag_noResumeChanged        : vAlarmStatus.alarm_KeepMinimized = false
-        onAlarm_Flag_noRinsebackChanged     : vAlarmStatus.alarm_KeepMinimized = false
-        onAlarm_Flag_noEndTreatmentChanged  : vAlarmStatus.alarm_KeepMinimized = false
-        onAlarm_Flag_UserMustAckChanged     : vAlarmStatus.alarm_KeepMinimized = false
-        onAlarm_AlarmIDChanged              : vAlarmStatus.alarm_KeepMinimized = false
-        onAlarm_Flag_alarmsSilencedChanged  : vAlarmStatus.alarm_KeepMinimized = vAlarmStatus.alarm_Flag_alarmsSilenced
         onAlarm_PriorityChanged: [
             _alarmDialog.titleBarBackground,
             _alarmDialog.titleBarForeground,
             _alarmDialog.backgroundColor   ,
             _alarmDialog.textColor         ,
         ] = Colors.alarmPriorityColors(vAlarmStatus.alarm_Priority)
-
-
-        onDidAlarmRaise: {
-            let silenceMinimize = false
-            if (vAlarmStatus.alarm_Flag_alarmsSilenced && silenceMinimize) {
-                // this is the response to the silence request
-                // so the dialog should be closed when the request accepted
-                // if not then if can stay minimized nothing happens
-                // if can't stay minimized then it has to be shown
-                alarmMinimize()
-            }
-            else {
-                if (! vAlarmStatus.alarm_KeepMinimized) {
-                    alarmMaximize()
-                }
-            }
-        }
-
-        onDidAlarmEmpty: alarmHide()
     }
 }