Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -ra04fd119778f0483cba5139a11e3c6bad7f2324a -r627b97843f87f5ca8fbd731c6c4a6d9fae4352ce --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision a04fd119778f0483cba5139a11e3c6bad7f2324a) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision 627b97843f87f5ca8fbd731c6c4a6d9fae4352ce) @@ -25,8 +25,9 @@ void VSettings::initConnections() { ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, SettingsData); - PROPERTY_POST_CONNECTION(VSettings, servicePass); - PROPERTY_POST_CONNECTION(VSettings, alarmVolume); + PROPERTY_POST_CONNECTION(VSettings, servicePass ); + PROPERTY_POST_CONNECTION(VSettings, alarmVolume ); + PROPERTY_POST_CONNECTION(VSettings, noCANBus ); } void VSettings::servicePass_post(const QString &vservicePass) { @@ -39,6 +40,11 @@ settings.save(alarmVolumeCategory(), alarmVolumeGroup(), alarmVolumeKey(), QString::number(valarmVolume)); } +void VSettings::noCANBus_post(const bool &vnoCANBus) { + Storage::Settings settings; + settings.save(noCANBusCategory(), noCANBusGroup(), noCANBusKey(), QString::number(vnoCANBus)); +} + void VSettings::onActionReceive(const SettingsData &) { // TODO: this function needs to be moved to the controller, to execute in settings thread not the main thread. @@ -66,18 +72,24 @@ mSettings[group] = details; for (const auto &key : keys) { QVariantMap keyValue; - if ( isservicePass(category, group, key) ) { + if ( isservicePass (category, group, key) ) { QString mServicePass; - mServicePass = _Settings.value(group, key).toString(); + mServicePass = _Settings.value(group, key).toString (); keyValue[key] = mServicePass ; - servicePass (mServicePass); + servicePass ( mServicePass); } - else if ( isalarmVolume(category, group, key) ) { + else if ( isalarmVolume (category, group, key) ) { quint8 mAlarmVolume; - mAlarmVolume = _Settings.value(group, key).toInt(); // returns 0 if fails, so no error checking needed. - keyValue[key] = mAlarmVolume ; - alarmVolume (mAlarmVolume); + mAlarmVolume = _Settings.value(group, key).toInt (); // returns 0 if fails, so no error checking needed. + keyValue[key] = mAlarmVolume ; + alarmVolume ( mAlarmVolume); } + else if ( isnoCANBus (category, group, key) ) { + bool mNoCANBus; + mNoCANBus = _Settings.value(group, key).toBool (); // returns 0/false if fails, so no error checking needed. + keyValue[key] = mNoCANBus ; + noCANBus ( mNoCANBus); + } else { keyValue[key] = _Settings.value(group, key); } @@ -96,6 +108,7 @@ // otherwise will use the default value and will notify the update. servicePass( _servicePass ); alarmVolume( _alarmVolume ); + // noCANBus ( _noCANBus ); // This line has been put here to remind developers that it is intentionally removed, to not to add a default value. adjustment(true); }