From 2c9aab7fd7c65c8281cb8cc73d67fccb6f95eac4 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Sun, 5 Apr 2026 03:55:33 -0500 Subject: [PATCH] Organize OpenRGBSettingsPage with Group Boxes --- .../OpenRGBSettingsPage.cpp | 19 +- qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui | 650 +++++++++--------- 2 files changed, 334 insertions(+), 335 deletions(-) diff --git a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp index d56492aef..c53e306bf 100644 --- a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp +++ b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp @@ -240,23 +240,22 @@ OpenRGBSettingsPage::OpenRGBSettingsPage(QWidget *parent) : } /*---------------------------------------------------------*\ - | Load drivers settings (Windows only or Mac) | + | Load drivers settings (Windows/Mac) | \*---------------------------------------------------------*/ -#if defined(WIN32) || defined(_MACOSX_X86_X64) +#if defined(_WIN32) || defined(_MACOSX_X86_64) json drivers_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Drivers"); +#endif + +#if defined(_MACOSX_X86_X64) + ui->CheckboxSharedSMBusAccess->hide(); if(drivers_settings.contains("amd_smbus_reduce_cpu")) { ui->CheckboxAMDSMBusReduceCPU->setChecked(drivers_settings["amd_smbus_reduce_cpu"]); } -#else - ui->DriversSettingsLabel->hide(); +#elif defined(_WIN32) ui->CheckboxAMDSMBusReduceCPU->hide(); -#endif - /*---------------------------------------------------------*\ - | Load drivers settings (Windows only) | - \*---------------------------------------------------------*/ -#ifdef _WIN32 + if(drivers_settings.contains("shared_smbus_access")) { ui->CheckboxSharedSMBusAccess->setChecked(drivers_settings["shared_smbus_access"]); @@ -267,6 +266,8 @@ OpenRGBSettingsPage::OpenRGBSettingsPage(QWidget *parent) : } #else ui->CheckboxSharedSMBusAccess->hide(); + ui->CheckboxAMDSMBusReduceCPU->hide(); + ui->GroupBoxDriverSettings->hide(); #endif /*-----------------------------------------------------*\ diff --git a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui index 785217fee..497744812 100644 --- a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui +++ b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui @@ -6,7 +6,7 @@ 0 0 - 500 + 550 475 @@ -14,14 +14,7 @@ Settings Page - - - - Open Settings Folder - - - - + true @@ -30,351 +23,356 @@ 0 - -211 - 508 - 1161 + 0 + 516 + 1262 - - - - Set Profile on Resume + + + + Autostart + + + + + Start Client + + + + + + + + + + Start Server + + + + + + + Load Profile + + + + + + + Start at Login + + + + + + + + + + + + + Custom Arguments + + + + + + + Set Server Host + + + + + + + + + + 1 + + + 65535 + + + 6742 + + + + + + + Set Server Port + + + + + + + Start Minimized + + + + + + + Start at Login Status + + + + - - - - 1 - - - 65535 - - - 6742 + + + + User Interface + + + + + + + + Disable Key Expansion in Device View + + + + + + + Minimize on Close + + + + + + + Greyscale Tray Icon + + + + + + + + + + Language + + + + + + + Run Zone Checks on Rescan + + + + + + + Show LED View by Default + + + + + + + Load Window Geometry + + + + + + + Save Geometry on Close + + + + + + + Theme (restart required) + + + + + + + Hex Format + + + + + + + - - - - Greyscale Tray Icon + + + + Server + + + + + Serve All Devices (Including those from client connections) + + + + + + + Legacy Workaround + + + + - - - - Set Server Port + + + + Driver + + + + + AMD SMBus: Reduce CPU Usage (restart required) + + + + + + + Shared SMBus Access (restart required) + + + + - - - - HID Safe Mode + + + + Detection + + + + + 2147483647 + + + + + + + Initial Detection Delay (milliseconds, 0 to disable) + + + + + + + HID Safe Mode + + + + - - - - - - - Set Server Host + + + + Profile + + + + + + + + + + + Set Profile on Open + + + + + + + Set Profile on Exit + + + + + + + + + + Set Profile on Suspend + + + + + + + Set Profile on Resume + + + + + + + - - - - Detection Settings: - - - - - - - Profile Settings: - - - - - - - Start at Login Status - - - - - - - Run Zone Checks on Rescan - - - - - - - Serve All Devices (Including those from client connections) - - - - - - - Set Profile on Exit - - - - - - - - - - Save Geometry on Close - - - - - - - - - - Shared SMBus Access (restart required) - - - - - - - Drivers Settings: - - - - - - - - - - AMD SMBus: Reduce CPU Usage (restart required) - - - - - - - Show LED View by Default - - - - - - - - - - Legacy Workaround - - - - - - - Start at Login Settings: - - - - - - - User Interface Settings: - - - - - - - Server Settings: - - - - - - - - - - Start Server - - - - - - - Set Profile on Suspend - - - - - - - - - - Enable Log File (restart required) - - - - - - - Hex Format - - - - - - - Language - - - - - - - - - - Custom Arguments - - - - - - - Load Window Geometry - - - - - - - Start Minimized - - - - - - - Disable Key Expansion in Device View - - - - - - - Start at Login - - - - - - - - - - Load Profile - - - - - - - Qt::Orientation::Vertical - - - QSizePolicy::Policy::MinimumExpanding - - - - 20 - 40 - - - - - - - - Minimize on Close - - - - - - - Log Manager Settings: - - - - - - - - - - Enable Log Console (restart required) - - - - - - - Theme (restart required) - - - - - - - - - - Set Profile on Open - - - - - - - Start Client - - - - - - - Initial Detection Delay (milliseconds, 0 to disable) - - - - - - - 2147483647 + + + + Log Manager + + + + + Enable Log File (restart required) + + + + + + + Enable Log Console (restart required) + + + + + + + + Open Settings Folder + + +