Index: sources/view/settings/VSettings.cpp
===================================================================
diff -u -redb8ee3edc41b1d324cd8a53e8e27a2a58289563 -rd2c4e611703fcb97794975dbc28f9a030b84bbf0
--- sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision edb8ee3edc41b1d324cd8a53e8e27a2a58289563)
+++ sources/view/settings/VSettings.cpp	(.../VSettings.cpp)	(revision d2c4e611703fcb97794975dbc28f9a030b84bbf0)
@@ -37,11 +37,14 @@
 {
     static bool init = false; if ( init ) return;
 
-    PROPERTY_POST_CONNECTION(VSettings, servicePass );
-    PROPERTY_POST_CONNECTION(VSettings, alarmVolume );
-    PROPERTY_POST_CONNECTION(VSettings, roWaterMode );
-    PROPERTY_POST_CONNECTION(VSettings, userMode    );
-
+    PROPERTY_POST_CONNECTION(VSettings, servicePass         );
+    PROPERTY_POST_CONNECTION(VSettings, alarmVolume         );
+    PROPERTY_POST_CONNECTION(VSettings, roWaterMode         );
+    PROPERTY_POST_CONNECTION(VSettings, userMode            );
+    PROPERTY_POST_CONNECTION(VSettings, integratedBPCuff    );
+    PROPERTY_POST_CONNECTION(VSettings, heparinSyringePump  );
+    PROPERTY_POST_CONNECTION(VSettings, chemicalDisinfection);
+>>>>>>> Stashed changes
     init = true;
 }
 
@@ -65,10 +68,32 @@
     //TODO  The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
     if ( Storage::Settings::save(userModeGroup(), userModeKey(), QString::number(vuserMode_post)) != 0 ) {
         userMode(false);
+    }
+}
+void VSettings::integratedBPCuff_post(const bool &vintegratedBPCuff_post) {
+    //TODO  The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
+    if ( Storage::Settings::save(integratedBPCuffGroup(), integratedBPCuffKey(), QString::number(vintegratedBPCuff_post)) != 0 ) {
+        integratedBPCuff(false);
         // FIXME: Notify UI with a message
     }
 }
 
+void VSettings::heparinSyringePump_post(const bool &vheparinSyringePump_post) {
+    //TODO  The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
+    if ( Storage::Settings::save(heparinSyringePumpGroup(), heparinSyringePumpKey(), QString::number(vheparinSyringePump_post)) != 0 ) {
+        heparinSyringePump(false);
+        // FIXME: Notify UI with a message
+    }
+}
+
+void VSettings::chemicalDisinfection_post(const bool &vchemicalDisinfection_post) {
+    //TODO  The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
+    if ( Storage::Settings::save(chemicalDisinfectionGroup(), chemicalDisinfectionKey(), QString::number(vchemicalDisinfection_post)) != 0 ) {
+        chemicalDisinfection(false);
+        // FIXME: Notify UI with a message
+    }
+}
+
 void VSettings::alarmVolume_post(const quint8 &valarmVolume) {
     //TODO  The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
     Storage::Settings::save(alarmVolumeGroup(), alarmVolumeKey(), QString::number(valarmVolume));
@@ -110,7 +135,24 @@
                         mUserMode       = _Settings.value(category, group, key).toBool    ();
                         keyValue[key]   = mUserMode ;
                         userMode        ( mUserMode);
+                    else if ( isintegratedBPCuff   (category, group, key) ) {
+                        bool mIntegratedBPCuff;
+                        mIntegratedBPCuff   = _Settings.value(category, group, key).toBool    ();
+                        keyValue[key]       = mIntegratedBPCuff ;
+                        integratedBPCuff    ( mIntegratedBPCuff );
                     }
+                    else if ( isheparinSyringePump    (category, group, key) ) {
+                        bool mHeparinSyringePump;
+                        mHeparinSyringePump = _Settings.value(category, group, key).toBool    ();
+                        keyValue[key]       = mHeparinSyringePump ;
+                        heparinSyringePump  ( mHeparinSyringePump );
+                    }
+                    else if ( ischemicalDisinfection    (category, group, key) ) {
+                        bool mChemicalDisinfection;
+                        mChemicalDisinfection   = _Settings.value(category, group, key).toBool    ();
+                        keyValue[key]           = mChemicalDisinfection ;
+                        chemicalDisinfection    ( mChemicalDisinfection );
+                    }
                     else if ( isalarmVolume (category, group, key) ) {
                         quint8 mAlarmVolume;
                         mAlarmVolume    = _Settings.value(category, group, key).toInt     (); // returns 0 if fails, so no error checking needed.