jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Setting_ prefix from all settings keys

Browse source
This commit is contained in:
Adam Honse 2020-12-03 12:02:15 -06:00
parent 61d4b8fa5d
commit f70c9cc63e
8 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Controllers/DebugController/DebugControllerDetect.cpp
View file

@ -162,7 +162,7 @@ static const char *led_names[] =
* *
* DetectDebugControllers *
* *
* Add dummy controllers based on the Setting_DebugDevices key in the settings json *
* Add dummy controllers based on the DebugDevices key in the settings json *
* *
\******************************************************************************************/
@ -173,7 +173,7 @@ void DetectDebugControllers(std::vector<RGBController*> &rgb_controllers)
/*-------------------------------------------------*\
| Get Debug Device settings from settings manager |
\*-------------------------------------------------*/
debug_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_DebugDevices");
debug_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("DebugDevices");
/*-------------------------------------------------*\
| If the Debug settings contains devices, process |

2
Controllers/E131Controller/E131ControllerDetect.cpp
View file

@ -30,7 +30,7 @@ void DetectE131Controllers(std::vector<RGBController*> &rgb_controllers)
/*-------------------------------------------------*\
| Get E1.31 settings from settings manager |
\*-------------------------------------------------*/
e131_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_E131Devices");
e131_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("E131Devices");
/*-------------------------------------------------*\
| If the E1.31 settings contains devices, process |

2
Controllers/EspurnaController/EspurnaControllerDetect.cpp
View file

@ -24,7 +24,7 @@ void DetectEspurnaControllers(std::vector<RGBController*> &rgb_controllers)
/*-------------------------------------------------*\
| Get Espurna settings from settings manager |
\*-------------------------------------------------*/
espurna_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_EspurnaDevices");
espurna_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("EspurnaDevices");
/*-------------------------------------------------*\
| If the Espurna settings contains devices, process |

2
Controllers/LEDStripController/LEDStripControllerDetect.cpp
View file

@ -25,7 +25,7 @@ void DetectLEDStripControllers(std::vector<RGBController*> &rgb_controllers)
/*-------------------------------------------------*\
| Get LED Strip settings from settings manager |
\*-------------------------------------------------*/
ledstrip_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_LEDStripDevices");
ledstrip_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("LEDStripDevices");
/*-------------------------------------------------*\
| If the LEDStrip settings contains devices, process|

2
Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp
View file

@ -27,7 +27,7 @@ void DetectLinuxLEDControllers(std::vector<RGBController*> &rgb_controllers)
/*-------------------------------------------------*\
| Get Linux LED settings from settings manager |
\*-------------------------------------------------*/
linux_led_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_LinuxLEDDevices");
linux_led_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("LinuxLEDDevices");
/*-------------------------------------------------*\
| If the LinuxLED settings contains devices, process|

2
Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp
View file

@ -25,7 +25,7 @@ void DetectPhilipsWizControllers(std::vector<RGBController*> &rgb_controllers)
/*-------------------------------------------------*\
| Get Philips Wiz settings from settings manager |
\*-------------------------------------------------*/
wiz_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_PhilipsWizDevices");
wiz_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("PhilipsWizDevices");
/*-------------------------------------------------*\
| If the Wiz settings contains devices, process |

4
ResourceManager.cpp
View file

@ -416,7 +416,7 @@ void ResourceManager::DetectDevicesThreadFunction()
| Open device disable list and read in disabled |
| device strings |
\*-------------------------------------------------*/
detector_settings = settings_manager->GetSettings("Setting_Detectors");
detector_settings = settings_manager->GetSettings("Detectors");
/*-------------------------------------------------*\
| Check HID safe mode setting |
@ -756,7 +756,7 @@ void ResourceManager::DetectDevicesThreadFunction()
if(save_settings)
{
settings_manager->SetSettings("Setting_Detectors", detector_settings);
settings_manager->SetSettings("Detectors", detector_settings);
settings_manager->SaveSettings();
}

2
qt/OpenRGBDialog2.cpp
View file

@ -97,7 +97,7 @@ bool OpenRGBDialog2::IsDarkTheme()
/*-------------------------------------------------*\
| Get prefered theme from settings manager |
\*-------------------------------------------------*/
theme_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_Theme");
theme_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Theme");
/*-------------------------------------------------*\
| Read the theme key and adjust accordingly |