Index: simulator/plugins/salinebolus/loader.py
===================================================================
diff -u -rc13dc6ba2410716a3f1c446e564085aeb9114a60 -r316fd2f51b0fa89c0f69949d79ef246e1e4bc4ed
--- simulator/plugins/salinebolus/loader.py	(.../loader.py)	(revision c13dc6ba2410716a3f1c446e564085aeb9114a60)
+++ simulator/plugins/salinebolus/loader.py	(.../loader.py)	(revision 316fd2f51b0fa89c0f69949d79ef246e1e4bc4ed)
@@ -1,14 +1,35 @@
 """
+###########################################################################
+#
+# Copyright (c) 2020-2025 Diality Inc. - All Rights Reserved.
+#
+# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+#
+# @file    loader.py
+#
+# @author  (last)      Behrouz NematiPour
+# @date    (last)      11-Feb-2021
+# @author  (original)  Behrouz NematiPour
+# @date    (original)  23-Nov-2020
+#
+############################################################################
 The Saline Bolus ui loader class
 """
-from runtimewidget import RunTimeWidget
+# Python
+import os
+# Qt
 from PySide2 import QtWidgets
 from PySide2.QtCore import Slot
-from dialin.squish import denaliMessages
-from dialin.squish.denaliMessages import txStates, EResponse
+# parent
+from simulator.dynamicloader import DynamicLoader
+# hd Simulator
+from dialin.ui.hd_simulator import HDSimulator, TXStates
+# plugin specific
+# -- none --
 
 
-class SalineBolus(RunTimeWidget):
+class Loader(DynamicLoader):
     """
     The Saline Bolus ui loader class
     """
@@ -22,16 +43,14 @@
     sldSalineCumulative: QtWidgets.QSlider
     sldSalineVolume: QtWidgets.QSlider
 
-    saline_requested_state: txStates
+    saline_requested_state: TXStates
 
-    def __init__(self):
-        super().__init__("plugins/salinebolus/interface.ui")
-        self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE
-        self.initialize()
-        self.init_widgets()
-        self.init_connections()
+    def __init__(self, hd_simulator: HDSimulator):
+        super().__init__(os.path.dirname(__file__), hd_simulator)
+        print(" ---------- ", self.hd_simulator)
+        self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE
 
-    def initialize(self):
+    def _init_loader(self):
         """
         finds and creates widgets
         :return: none
@@ -47,14 +66,14 @@
         self.sldSalineCumulative = self.find_slider('sldSalineCumulative')
         self.sldSalineVolume = self.find_slider('sldSalineVolume')
 
-    def init_widgets(self):
+    def _init_widgets(self):
         """
         initializes the widgets' properties
         :return: none
         """
         pass
 
-    def init_connections(self):
+    def _init_connections(self):
         """
         initializes the widgets connections
         :return:
@@ -74,13 +93,15 @@
         :return: none
         """
         # toggle the saline requested state
-        if self.saline_requested_state == txStates.SALINE_BOLUS_STATE_IN_PROGRESS:
-            self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE
+        if self.saline_requested_state == TXStates.SALINE_BOLUS_STATE_IN_PROGRESS:
+            self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE
         else:
-            self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IN_PROGRESS
+            self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IN_PROGRESS
 
         target = self.cmbSalineAcceptTarget.currentText()
-        denaliMessages.setSalineBolusResponse(True, 0, target, self.saline_requested_state)
+        self.hd_simulator.cmd_set_saline_bolus_response(
+            True, 0, int(target), self.saline_requested_state
+        )
         self.lblSalineAction.setText('Accepted ' + target)
 
     @Slot()
@@ -90,17 +111,20 @@
         :return: none
         """
         reason = self.spnSalineRejectReason.value()
-        denaliMessages.setSalineBolusResponse(False, reason, 0, self.saline_requested_state)
+        self.hd_simulator.cmd_set_saline_bolus_response(
+            False, reason, 0, self.saline_requested_state
+        )
         self.lblSalineAction.setText('Rejected ' + "{}".format(reason))
 
-
     @Slot()
     def do_saline_data(self):
         """
         the slot which is called to send the saline bolus data
         by calling the denaliMessage API setTreatmentSalineBolusData
         :return: none
         """
-        denaliMessages.setTreatmentSalineBolusData(self.sldSalineTarget.value(),
-                                                   self.sldSalineCumulative.value(),
-                                                   self.sldSalineVolume.value())
+        self.hd_simulator.cmd_set_treatment_saline_bolus_data(
+            self.sldSalineTarget.value(),
+            self.sldSalineCumulative.value(),
+            self.sldSalineVolume.value()
+        )