From 959f8822f8f80ec33a1dd8a754c6cfbe27121a1d Mon Sep 17 00:00:00 2001
From: Adam Honse <calcprogrammer1@gmail.com>
Date: Sun, 5 Apr 2026 03:55:33 -0500
Subject: [PATCH] Organize OpenRGBSettingsPage with Group Boxes

---
 .../OpenRGBSettingsPage.cpp                   |   2 +-
 qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui | 670 +++++++++---------
 2 files changed, 335 insertions(+), 337 deletions(-)

diff --git a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp
index cddf2bef2..7b0878b7e 100644
--- a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp
+++ b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp
@@ -293,7 +293,7 @@ OpenRGBSettingsPage::OpenRGBSettingsPage(QWidget *parent) :
     /*---------------------------------------------------------*\
     | Hide all drivers settings otherwise                       |
     \*---------------------------------------------------------*/
-    ui->DriversSettingsLabel->hide();
+    ui->GroupBoxDriverSettings->hide();
     ui->CheckboxAMDSMBusReduceCPU->hide();
     ui->CheckboxSharedSMBusAccess->hide();
     ui->LabelSMBusSleepMode->hide();
diff --git a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui
index b1d357ae3..6548b0753 100644
--- a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui
+++ b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>500</width>
+    <width>550</width>
     <height>475</height>
    </rect>
   </property>
@@ -14,14 +14,7 @@
    <string notr="true">Settings Page</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="1" colspan="6">
-    <widget class="QPushButton" name="OpenSettingsFolderButton">
-     <property name="text">
-      <string>Open Settings Folder</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="6">
+   <item row="2" column="1" colspan="2">
     <widget class="QScrollArea" name="scrollArea">
      <property name="widgetResizable">
       <bool>true</bool>
@@ -30,361 +23,366 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>-338</y>
-        <width>508</width>
-        <height>1193</height>
+        <y>-450</y>
+        <width>516</width>
+        <height>1294</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout_3">
-       <item row="7" column="0">
-        <widget class="QCheckBox" name="CheckboxLoadGeometry">
-         <property name="text">
-          <string>Load Window Geometry</string>
+       <item row="22" column="0" colspan="2">
+        <widget class="QGroupBox" name="GroupBoxAutostartSettings">
+         <property name="title">
+          <string>Autostart</string>
          </property>
+         <layout class="QGridLayout" name="gridLayout_9">
+          <item row="5" column="0">
+           <widget class="QCheckBox" name="CheckboxAutoStartClient">
+            <property name="text">
+             <string>Start Client</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QLineEdit" name="TextClientHost"/>
+          </item>
+          <item row="2" column="0" colspan="2">
+           <widget class="QCheckBox" name="CheckboxAutoStartServer">
+            <property name="text">
+             <string>Start Server</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0">
+           <widget class="QCheckBox" name="CheckboxAutoStartProfile">
+            <property name="text">
+             <string>Load Profile</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" colspan="2">
+           <widget class="QCheckBox" name="CheckboxAutoStart">
+            <property name="text">
+             <string>Start at Login</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="1">
+           <widget class="QComboBox" name="ComboBoxAutoStartProfile"/>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLineEdit" name="TextCustomArgs"/>
+          </item>
+          <item row="6" column="0">
+           <widget class="QCheckBox" name="CheckboxAutoStartCustom">
+            <property name="text">
+             <string>Custom Arguments</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="CheckboxAutoStartSetServerHost">
+            <property name="text">
+             <string>Set Server Host</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="TextServerHost"/>
+          </item>
+          <item row="4" column="1">
+           <widget class="QSpinBox" name="TextServerPort">
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>65535</number>
+            </property>
+            <property name="value">
+             <number>6742</number>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QCheckBox" name="CheckboxAutoStartSetServerPort">
+            <property name="text">
+             <string>Set Server Port</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" colspan="2">
+           <widget class="QCheckBox" name="CheckboxAutoStartMinimized">
+            <property name="text">
+             <string>Start Minimized</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="0">
+           <widget class="QLabel" name="AutoStartStatusLabel">
+            <property name="text">
+             <string>Start at Login Status</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
-       <item row="9" column="0">
-        <widget class="QCheckBox" name="CheckboxRunZoneChecks">
-         <property name="text">
-          <string>Run Zone Checks on Rescan</string>
+       <item row="0" column="0" colspan="2">
+        <widget class="QGroupBox" name="GroupBoxUserInterfaceSettings">
+         <property name="title">
+          <string>User Interface</string>
          </property>
+         <layout class="QGridLayout" name="gridLayout_2">
+          <item row="1" column="1">
+           <widget class="QComboBox" name="ComboBoxTheme"/>
+          </item>
+          <item row="7" column="0">
+           <widget class="QCheckBox" name="CheckboxDisableKeyExpansion">
+            <property name="text">
+             <string>Disable Key Expansion in Device View</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="CheckboxMinimizeOnClose">
+            <property name="text">
+             <string>Minimize on Close</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="CheckboxTrayIconGreyscale">
+            <property name="text">
+             <string>Greyscale Tray Icon</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="ComboBoxLanguage"/>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="LabelLanguage">
+            <property name="text">
+             <string>Language</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QCheckBox" name="CheckboxRunZoneChecks">
+            <property name="text">
+             <string>Run Zone Checks on Rescan</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="0">
+           <widget class="QCheckBox" name="CheckboxShowLEDView">
+            <property name="text">
+             <string>Show LED View by Default</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QCheckBox" name="CheckboxLoadGeometry">
+            <property name="text">
+             <string>Load Window Geometry</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QCheckBox" name="CheckboxSaveGeometry">
+            <property name="text">
+             <string>Save Geometry on Close</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="ThemeLabel">
+            <property name="text">
+             <string>Theme (restart required)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="0">
+           <widget class="QLabel" name="HexFormatLabel">
+            <property name="text">
+             <string>Hex Format</string>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="1">
+           <widget class="QComboBox" name="ComboBoxHexFormat"/>
+          </item>
+         </layout>
         </widget>
        </item>
-       <item row="15" column="0">
-        <widget class="QCheckBox" name="CheckboxLogConsole">
-         <property name="text">
-          <string>Enable Log Console (restart required)</string>
+       <item row="21" column="0" colspan="2">
+        <widget class="QGroupBox" name="GroupBoxServerSettings">
+         <property name="title">
+          <string>Server</string>
          </property>
+         <layout class="QGridLayout" name="gridLayout_8">
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="CheckboxAllDevices">
+            <property name="text">
+             <string>Serve All Devices (Including those from client connections)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="CheckboxLegacyWorkaround">
+            <property name="text">
+             <string>Legacy Workaround</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
-       <item row="41" column="1">
-        <widget class="QSpinBox" name="TextServerPort">
-         <property name="minimum">
-          <number>1</number>
-         </property>
-         <property name="maximum">
-          <number>65535</number>
-         </property>
-         <property name="value">
-          <number>6742</number>
+       <item row="3" column="0" colspan="2">
+        <widget class="QGroupBox" name="GroupBoxDriverSettings">
+         <property name="title">
+          <string>Driver</string>
          </property>
+         <layout class="QGridLayout" name="gridLayout_6">
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="CheckboxSharedSMBusAccess">
+            <property name="text">
+             <string>Shared SMBus Access (restart required)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="CheckboxAMDSMBusReduceCPU">
+            <property name="text">
+             <string>AMD SMBus: Reduce CPU Usage (restart required)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="LabelSMBusSleepMode">
+            <property name="text">
+             <string>SMBus Sleep Mode (restart required)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="ComboBoxSMBusSleepMode"/>
+          </item>
+         </layout>
         </widget>
        </item>
-       <item row="21" column="0">
-        <widget class="QCheckBox" name="CheckboxSharedSMBusAccess">
-         <property name="text">
-          <string>Shared SMBus Access (restart required)</string>
+       <item row="2" column="0" colspan="2">
+        <widget class="QGroupBox" name="GroupBoxDetectionSettings">
+         <property name="title">
+          <string>Detection</string>
          </property>
+         <layout class="QGridLayout" name="gridLayout_5">
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="TextDetectionDelay">
+            <property name="maximum">
+             <number>2147483647</number>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="DetectionDelayLabel">
+            <property name="text">
+             <string>Initial Detection Delay (milliseconds, 0 to disable)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" colspan="2">
+           <widget class="QCheckBox" name="CheckboxHIDSafeMode">
+            <property name="text">
+             <string>HID Safe Mode</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
-       <item row="32" column="0">
-        <widget class="QCheckBox" name="CheckboxLegacyWorkaround">
-         <property name="text">
-          <string>Legacy Workaround</string>
+       <item row="4" column="0" colspan="2">
+        <widget class="QGroupBox" name="GroupBoxProfileSettings">
+         <property name="title">
+          <string>Profile</string>
          </property>
+         <layout class="QGridLayout" name="gridLayout_7">
+          <item row="2" column="1">
+           <widget class="QComboBox" name="ComboBoxSuspendProfile"/>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="ComboBoxExitProfile"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="CheckboxSetOnOpen">
+            <property name="text">
+             <string>Set Profile on Open</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="CheckboxSetOnExit">
+            <property name="text">
+             <string>Set Profile on Exit</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="ComboBoxOpenProfile"/>
+          </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="CheckboxSetOnSuspend">
+            <property name="text">
+             <string>Set Profile on Suspend</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="CheckboxSetOnResume">
+            <property name="text">
+             <string>Set Profile on Resume</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QComboBox" name="ComboBoxResumeProfile"/>
+          </item>
+         </layout>
         </widget>
        </item>
-       <item row="11" column="0">
-        <widget class="QCheckBox" name="CheckboxShowLEDView">
-         <property name="text">
-          <string>Show LED View by Default</string>
+       <item row="1" column="0" colspan="2">
+        <widget class="QGroupBox" name="GroupBoxLogManagerSettings">
+         <property name="title">
+          <string>Log Manager</string>
          </property>
+         <layout class="QGridLayout" name="gridLayout_4">
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="CheckboxLogFile">
+            <property name="text">
+             <string>Enable Log File (restart required)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="CheckboxLogConsole">
+            <property name="text">
+             <string>Enable Log Console (restart required)</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
-       <item row="16" column="0">
-        <widget class="QLabel" name="DetectionSettingsLabel">
-         <property name="text">
-          <string>Detection Settings:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="34" column="0">
-        <widget class="QCheckBox" name="CheckboxAutoStart">
-         <property name="text">
-          <string>Start at Login</string>
-         </property>
-        </widget>
-       </item>
-       <item row="44" column="1">
-        <widget class="QComboBox" name="ComboBoxAutoStartProfile"/>
-       </item>
-       <item row="49" column="0">
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Policy::MinimumExpanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="27" column="0">
-        <widget class="QCheckBox" name="CheckboxSetOnSuspend">
-         <property name="text">
-          <string>Set Profile on Suspend</string>
-         </property>
-        </widget>
-       </item>
-       <item row="42" column="0">
-        <widget class="QCheckBox" name="CheckboxAutoStartClient">
-         <property name="text">
-          <string>Start Client</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="1">
-        <widget class="QComboBox" name="ComboBoxTheme"/>
-       </item>
-       <item row="18" column="1">
-        <widget class="QSpinBox" name="TextDetectionDelay">
-         <property name="maximum">
-          <number>2147483647</number>
-         </property>
-        </widget>
-       </item>
-       <item row="25" column="1">
-        <widget class="QComboBox" name="ComboBoxOpenProfile"/>
-       </item>
-       <item row="12" column="0">
-        <widget class="QLabel" name="HexFormatLabel">
-         <property name="text">
-          <string>Hex Format</string>
-         </property>
-        </widget>
-       </item>
-       <item row="17" column="0">
-        <widget class="QCheckBox" name="CheckboxHIDSafeMode">
-         <property name="text">
-          <string>HID Safe Mode</string>
-         </property>
-        </widget>
-       </item>
-       <item row="48" column="0">
-        <widget class="QLabel" name="AutoStartStatusLabel">
-         <property name="text">
-          <string>Start at Login Status</string>
-         </property>
-        </widget>
-       </item>
-       <item row="40" column="0">
-        <widget class="QCheckBox" name="CheckboxAutoStartSetServerHost">
-         <property name="text">
-          <string>Set Server Host</string>
-         </property>
-        </widget>
-       </item>
-       <item row="42" column="1">
-        <widget class="QLineEdit" name="TextClientHost"/>
-       </item>
-       <item row="12" column="1">
-        <widget class="QComboBox" name="ComboBoxHexFormat"/>
-       </item>
-       <item row="8" column="0">
-        <widget class="QCheckBox" name="CheckboxSaveGeometry">
-         <property name="text">
-          <string>Save Geometry on Close</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="ThemeLabel">
-         <property name="text">
-          <string>Theme (restart required)</string>
-         </property>
-        </widget>
-       </item>
-       <item row="28" column="0">
-        <widget class="QCheckBox" name="CheckboxSetOnResume">
-         <property name="text">
-          <string>Set Profile on Resume</string>
-         </property>
-        </widget>
-       </item>
-       <item row="40" column="1">
-        <widget class="QLineEdit" name="TextServerHost"/>
-       </item>
-       <item row="10" column="0">
-        <widget class="QCheckBox" name="CheckboxDisableKeyExpansion">
-         <property name="text">
-          <string>Disable Key Expansion in Device View</string>
-         </property>
-        </widget>
-       </item>
-       <item row="33" column="0">
-        <widget class="QLabel" name="AutoStartLabel">
-         <property name="text">
-          <string>Start at Login Settings:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="43" column="0">
-        <widget class="QCheckBox" name="CheckboxAutoStartCustom">
-         <property name="text">
-          <string>Custom Arguments</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="LabelLanguage">
-         <property name="text">
-          <string>Language</string>
-         </property>
-        </widget>
-       </item>
-       <item row="14" column="0">
-        <widget class="QCheckBox" name="CheckboxLogFile">
-         <property name="text">
-          <string>Enable Log File (restart required)</string>
-         </property>
-        </widget>
-       </item>
-       <item row="24" column="0">
-        <widget class="QCheckBox" name="CheckboxSetOnExit">
-         <property name="text">
-          <string>Set Profile on Exit</string>
-         </property>
-        </widget>
-       </item>
-       <item row="43" column="1">
-        <widget class="QLineEdit" name="TextCustomArgs"/>
-       </item>
-       <item row="30" column="0">
-        <widget class="QLabel" name="ServerSettingsLabel">
-         <property name="text">
-          <string>Server Settings:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="27" column="1">
-        <widget class="QComboBox" name="ComboBoxSuspendProfile"/>
-       </item>
-       <item row="3" column="1">
-        <widget class="QComboBox" name="ComboBoxLanguage"/>
-       </item>
-       <item row="31" column="0">
-        <widget class="QCheckBox" name="CheckboxAllDevices">
-         <property name="text">
-          <string>Serve All Devices (Including those from client connections)</string>
-         </property>
-        </widget>
-       </item>
-       <item row="38" column="0">
-        <widget class="QCheckBox" name="CheckboxAutoStartMinimized">
-         <property name="text">
-          <string>Start Minimized</string>
-         </property>
-        </widget>
-       </item>
-       <item row="20" column="0">
-        <widget class="QCheckBox" name="CheckboxAMDSMBusReduceCPU">
-         <property name="text">
-          <string>AMD SMBus: Reduce CPU Usage (restart required)</string>
-         </property>
-        </widget>
-       </item>
-       <item row="39" column="0">
-        <widget class="QCheckBox" name="CheckboxAutoStartServer">
-         <property name="text">
-          <string>Start Server</string>
-         </property>
-        </widget>
-       </item>
-       <item row="28" column="1">
-        <widget class="QComboBox" name="ComboBoxResumeProfile"/>
-       </item>
-       <item row="13" column="0">
-        <widget class="QLabel" name="LogManagerSettingsLabel">
-         <property name="text">
-          <string>Log Manager Settings:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="23" column="0">
-        <widget class="QLabel" name="ProfileSettingsLabel">
-         <property name="text">
-          <string>Profile Settings:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="41" column="0">
-        <widget class="QCheckBox" name="CheckboxAutoStartSetServerPort">
-         <property name="text">
-          <string>Set Server Port</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="UserInterfaceSettingsLabel">
-         <property name="text">
-          <string>User Interface Settings:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="44" column="0">
-        <widget class="QCheckBox" name="CheckboxAutoStartProfile">
-         <property name="text">
-          <string>Load Profile</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
-        <widget class="QCheckBox" name="CheckboxTrayIconGreyscale">
-         <property name="text">
-          <string>Greyscale Tray Icon</string>
-         </property>
-        </widget>
-       </item>
-       <item row="19" column="0">
-        <widget class="QLabel" name="DriversSettingsLabel">
-         <property name="text">
-          <string>Drivers Settings:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="18" column="0">
-        <widget class="QLabel" name="DetectionDelayLabel">
-         <property name="text">
-          <string>Initial Detection Delay (milliseconds, 0 to disable)</string>
-         </property>
-        </widget>
-       </item>
-       <item row="24" column="1">
-        <widget class="QComboBox" name="ComboBoxExitProfile"/>
-       </item>
-       <item row="25" column="0">
-        <widget class="QCheckBox" name="CheckboxSetOnOpen">
-         <property name="text">
-          <string>Set Profile on Open</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0">
-        <widget class="QCheckBox" name="CheckboxMinimizeOnClose">
-         <property name="text">
-          <string>Minimize on Close</string>
-         </property>
-        </widget>
-       </item>
-       <item row="22" column="0">
-        <widget class="QLabel" name="LabelSMBusSleepMode">
-         <property name="text">
-          <string>SMBus Sleep Mode (restart required)</string>
-         </property>
-        </widget>
-       </item>
-       <item row="22" column="1">
-        <widget class="QComboBox" name="ComboBoxSMBusSleepMode"/>
-       </item>
       </layout>
      </widget>
     </widget>
    </item>
+   <item row="1" column="1" colspan="2">
+    <widget class="QPushButton" name="OpenSettingsFolderButton">
+     <property name="text">
+      <string>Open Settings Folder</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>