diff --git a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp index 09d6377b..f8526d49 100644 --- a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp +++ b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp @@ -441,6 +441,23 @@ void OpenRGBSettingsPage::UpdateProfiles() } } } + + /*---------------------------------------------------------*\ + | Load server settings | + \*---------------------------------------------------------*/ + json server_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Server"); + + if(server_settings.contains("all_devices")) + { + bool all_devices = server_settings["all_devices"]; + ui->CheckboxAllDevices->setChecked(all_devices); + } + + if(server_settings.contains("legacy_workaround")) + { + bool legacy_workaround = server_settings["legacy_workaround"]; + ui->CheckboxLegacyWorkaround->setChecked(legacy_workaround); + } } void OpenRGBSettingsPage::on_ComboBoxLanguage_currentTextChanged(const QString language) @@ -604,6 +621,22 @@ void OpenRGBSettingsPage::on_ComboBoxSuspendProfile_currentTextChanged(const QSt SaveSettings(); } +void OpenRGBSettingsPage::on_CheckboxAllDevices_clicked(bool checked) +{ + json server_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Server"); + server_settings["all_devices"] = checked; + ResourceManager::get()->GetSettingsManager()->SetSettings("Server", server_settings); + SaveSettings(); +} + +void OpenRGBSettingsPage::on_CheckboxLegacyWorkaround_clicked(bool checked) +{ + json server_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Server"); + server_settings["legacy_workaround"] = checked; + ResourceManager::get()->GetSettingsManager()->SetSettings("Server", server_settings); + SaveSettings(); +} + void OpenRGBSettingsPage::on_CheckboxAutoStart_clicked() { if(autostart_initialized) diff --git a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.h b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.h index 4a2af70f..c392f5c9 100644 --- a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.h +++ b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.h @@ -89,4 +89,6 @@ private slots: void on_ComboBoxSuspendProfile_currentTextChanged(const QString suspend_profile_name); void on_CheckboxDisableKeyExpansion_clicked(); void on_CheckboxShowLEDView_clicked(); + void on_CheckboxAllDevices_clicked(bool checked); + void on_CheckboxLegacyWorkaround_clicked(bool checked); }; diff --git a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui index d256052d..c90cbd75 100644 --- a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui +++ b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui @@ -30,51 +30,16 @@ 0 - 0 - 460 - 950 + -321 + 554 + 1052 - - + + - Minimize on Close - - - - - - - Start at Login Settings: - - - - - - - AMD SMBus: Reduce CPU Usage (restart required) - - - - - - - Start Server - - - - - - - Greyscale Tray Icon - - - - - - - Disable Key Expansion in Device View + Start Minimized @@ -85,25 +50,50 @@ - - + + - Save Geometry on Close + AMD SMBus: Reduce CPU Usage (restart required) - - + + - - + + + + Start Client + + - + + + + Disable Key Expansion in Device View + + + + - + + + + Hex Format + + + + + + + + User Interface Settings: + + + @@ -111,16 +101,40 @@ - - + + - + + + + Theme (restart required) + + + + + + + Drivers Settings: + + + + + + + + + + Language + + + + - Qt::Vertical + Qt::Orientation::Vertical - QSizePolicy::MinimumExpanding + QSizePolicy::Policy::MinimumExpanding @@ -130,14 +144,144 @@ - + + + + Start Server + + + + + + + Load Profile + + + + + + + Start at Login + + + + + + + Save Geometry on Close + + + + + + + Enable Log File (restart required) + + + + + + + Greyscale Tray Icon + + + + + + + + + + Set Server Port + + + + Show LED View by Default + + + + + + + Minimize on Close + + + + + + + Set Profile on Exit + + + + + + + Load Window Geometry + + + + + + + 1 + + + 65535 + + + 6742 + + + + + + + Log Manager Settings: + + + + + + + + + Set Profile on Suspend + + + + + + + Custom Arguments + + + + + + + Serve All Devices (Including those from client connections) + + + + + + + + + + Set Server Host + + + + Start at Login Status @@ -151,157 +295,34 @@ - - + + - Start Client - - - - - - - - - - Load Profile - - - - - - - Set Profile on Exit - - - - - - - Hex Format - - - - - - - - - - Theme (restart required) - - - - - - - Show LED View by Default - - - - - - - Set Profile on Suspend - - - - - - - Set Server Host + Start at Login Settings: - - - - Start Minimized - - - - - - - Log Manager Settings: - - - - - - - User Interface Settings: - - - - - - - + Set Profile on Resume - - + + - Drivers Settings + Server Settings: - - + + - Language - - - - - - - Custom Arguments - - - - - - - - - - Load Window Geometry - - - - - - - Start at Login - - - - - - - Enable Log File (restart required) - - - - - - - 1 - - - 65535 - - - 6742 + Legacy Workaround