Index: sources/gui/qml/AlarmItem.qml
===================================================================
diff -u -ra8f982318e444fb1f92ca2e6c1f3446fe9506c2e -rf68b226e67eb500758ee94fe015df48931240013
--- sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision a8f982318e444fb1f92ca2e6c1f3446fe9506c2e)
+++ sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision f68b226e67eb500758ee94fe015df48931240013)
@@ -51,7 +51,6 @@
         vAlarmStatus.doClearCondition()
     }
 
-    // Alarms dialog/bar navigation handling ----- vvvvv -----
     function alarmMinimize() {
         // 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.
@@ -91,26 +90,22 @@
     }
 
     Connections { target: _alarmDialog
-        onMinimizeClicked   : vAlarmStatus.alarm_Flag_noMinimize ? alarmList()      : alarmMinimize()
+        function onMinimizeClicked              (        ) { if ( vAlarmStatus.alarm_Flag_noMinimize ) alarmList    (); else alarmMinimize(); }
     }
     Connections { target: _alarmListDialog
-        onMinimizeClicked   : vAlarmStatus.alarm_Flag_noMinimize ? alarmMaximize()  : alarmMinimize()
+        function onMinimizeClicked              (        ) { if ( vAlarmStatus.alarm_Flag_noMinimize ) alarmMaximize(); else alarmMinimize(); }
     }
     Connections { target: _alarmBar
-        onListClicked       : alarmList()
-        onMaximizeClicked   : alarmMaximize()
-        onClicked           : alarmMaximize()
+        function onListClicked                  (        ) { alarmList     () }
+        function onMaximizeClicked              (        ) { alarmMaximize () }
+        function onClicked                      (        ) { alarmMaximize () }
+        function onMuteClicked                  (        ) { vAlarmStatus.doSilence() }
     }
     Connections { target: vAlarmStatus
-        onDidAlarmRaise: alarmMaximize()
-        onDidAlarmEmpty: alarmHide()
+        function onDidAlarmRaise                (        ) { alarmMaximize  () }
+        function 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
     //        Better be the NotificationDialog defined as parent
@@ -152,11 +147,13 @@
     }
 
     Connections { target: vAlarmStatus
-        onAlarm_PriorityChanged: [
-            _alarmDialog.titleBarBackground,
-            _alarmDialog.titleBarForeground,
-            _alarmDialog.backgroundColor   ,
-            _alarmDialog.textColor         ,
-        ] = Colors.alarmPriorityColors(vAlarmStatus.alarm_Priority)
+        function onAlarm_PriorityChanged        ( vValue ) {
+            [
+                _alarmDialog.titleBarBackground,
+                _alarmDialog.titleBarForeground,
+                _alarmDialog.backgroundColor   ,
+                _alarmDialog.textColor         ,
+            ] = Colors.alarmPriorityColors(vValue)
+        }
     }
 }