Index: sources/gui/qml/AlarmItem.qml
===================================================================
diff -u -r0f83de066c8a116195a3cc60577d597ef9654c55 -r18567640c36d4bd3d2fa37ac929987cec7476309
--- sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 0f83de066c8a116195a3cc60577d597ef9654c55)
+++ sources/gui/qml/AlarmItem.qml	(.../AlarmItem.qml)	(revision 18567640c36d4bd3d2fa37ac929987cec7476309)
@@ -39,8 +39,8 @@
     VAlarmStatus     { id: vAlarmStatus     }
     VAlarmActiveList { id: vAlarmActiveList }
 
-    readonly property alias  backgroundColor: _alarmDialog.titleBarBackground
-    readonly property alias  textColor      : _alarmDialog.textColor
+    readonly property alias  backgroundColor: _notificationDialog.titleBarBackground
+    readonly property alias  textColor      : _notificationDialog.textColor
     readonly property string title          : vAlarmStatus.title
     readonly property alias  isSilenced     : vAlarmStatus.alarm_Flag_alarmsSilenced
     readonly property alias  timeout        : vAlarmStatus.alarm_MuteTimeout
@@ -53,9 +53,7 @@
         // Look at the PowerItem as an example.
         if ( ! vAlarmStatus.hasAlarm ) return
 
-
-        _alarmDialog    .visible = false
-        _alarmListDialog.visible = false
+        _notificationDialog.close()
         _alarmBar       .visible = true
     }
     function alarmMaximize() {
@@ -74,21 +72,18 @@
         if ( _root._DEBUG_DISABLE_MAXIMIZE_ ) {
             alarmMinimize()
         } else {
-            _alarmDialog    .visible = true
-            _alarmListDialog.visible = false
+            _notificationDialog.alarmMaximize()
             _alarmBar       .visible = false
         }
         _powerItem.cancel()
     }
     function alarmList() {
         vAlarmActiveList.doRequest()
-        _alarmDialog    .visible = false
-        _alarmListDialog.visible = true
+        _notificationDialog.alarmList()
         _alarmBar       .visible = false
     }
     function alarmHide() {
-        _alarmDialog    .visible = false
-        _alarmListDialog.visible = false
+        _notificationDialog.close()
         _alarmBar       .visible = false
     }
 
@@ -103,62 +98,15 @@
         function onDidAlarmEmpty                (        ) { 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
-    //        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
+    NotificationDialog { id : _notificationDialog }
 
-        titleText               :   vAlarmStatus.title
-        titlePixelSize          :   Fonts.fontPixelAlarmTitle
-        instructionModel        :   vAlarmStatus.instructions
-        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
-        temporaryBreakVisible   : ! vAlarmStatus.alarm_Flag_noTemporaryBreak
-        minVisible              : ! vAlarmStatus.alarm_Flag_noMinimize
-        countDown               :  vTreatmentStop.countDown
-        countDownVisible        :  vTDOpMode.inTreatment
-                                && (
-                                    vTDTreatmentStates.txStop
-                                    ||  vTDTreatmentStates.txRinseback
-                                    ||  vTDTreatmentStates.txEnd
-                                    )
-                                && vTreatmentStop.total
-
-        onMuteClicked           : vAlarmStatus.doSilence                    ()
-        onResumeClicked         : vAlarmStatus.doUserActionResume           ()
-        onRinsebackClicked      : vAlarmStatus.doUserActionRinseback        ()
-        onEndClicked            : vAlarmStatus.doUserActionEnd              ()
-        onTemporaryBreakClicked : vAlarmStatus.doUserActionTemporaryBreak   ()
-        onOkClicked             : vAlarmStatus.doUserActionOk               ()
-        onListClicked           : alarmList                                 ()
-        onMinimizeClicked       : alarmMinimize                             ()
-    }
-
-    AlarmListDialog { id : _alarmListDialog
-        isSilenced          :   vAlarmStatus.alarm_Flag_alarmsSilenced
-        timeout             :   vAlarmStatus.alarm_MuteTimeout
-        minVisible          : ! vAlarmStatus.alarm_Flag_noMinimize
-        onMuteClicked       : vAlarmStatus.doSilence()
-        onMinimizeClicked   : alarmMinimize()
-        onListClicked       : alarmMaximize()
-    }
-
     Connections { target: vAlarmStatus
         function onAlarm_PriorityChanged        ( vValue ) {
             [
-                _alarmDialog.titleBarBackground,
-                _alarmDialog.titleBarForeground,
-                _alarmDialog.backgroundColor   ,
-                _alarmDialog.textColor         ,
+                _notificationDialog.titleBarBackground,
+                _notificationDialog.titleBarForeground,
+                _notificationDialog.backgroundColor   ,
+                _notificationDialog.textColor         ,
             ] = Colors.alarmPriorityColors(vValue)
         }
     }