Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -rdb12df03b8067e1ccc81f190cabfb03359c3d8cb -r40c09957821fb3779fa06214a856c20cca110e56 --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision db12df03b8067e1ccc81f190cabfb03359c3d8cb) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision 40c09957821fb3779fa06214a856c20cca110e56) @@ -54,8 +54,8 @@ for (const auto &category : mCategorys) { QStringList groups = _Settings.groups(category); for (const auto &group : groups) { - QStringList keys = _Settings.keys (group); - QVariantList values = _Settings.values (group); + QStringList keys = _Settings.keys (category, group); + QVariantList values = _Settings.values (category, group); if ( Storage::Settings::isCategoryInstructions( category ) ) { // DEBUG : // qDebug() << " ##### " @@ -64,7 +64,7 @@ // << values // << location ; QVariantMap details; - QString location = _Settings.location (group); + QString location = QString(Storage::Settings_Category_InstructionsImagesLoc).arg(Storage::Settings_Path_Name); details["location"] = location; details["keys" ] = keys ; details["values" ] = values ; @@ -77,26 +77,26 @@ QVariantMap keyValue; if ( isservicePass (category, group, key) ) { QString mServicePass; - mServicePass = _Settings.value(group, key).toString (); + mServicePass = _Settings.value(category, group, key).toString (); keyValue[key] = mServicePass ; servicePass ( mServicePass); } else if ( isalarmVolume (category, group, key) ) { quint8 mAlarmVolume; - mAlarmVolume = _Settings.value(group, key).toInt (); // returns 0 if fails, so no error checking needed. + mAlarmVolume = _Settings.value(category, 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. + mNoCANBus = _Settings.value(category, group, key).toBool (); // returns 0/false if fails, so no error checking needed. keyValue[key] = mNoCANBus ; noCANBus ( mNoCANBus); if (_noCANBus ) LOG_EVENT_UI(QString("System is working on NoCANBus set")); } else { - keyValue[key] = _Settings.value(group, key); + keyValue[key] = _Settings.value(category, group, key); } QVariantMap groups; groups [group] = keyValue;