grayhook
/
OpenRGB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add configuration for detector settings (HID safe mode and detection delay) to settings page

Browse Source
master
Adam Honse 5 months ago
parent 30dc059ddb
commit 6da0dbf511
3 changed files with 209 additions and 143 deletions
Show Stats Download Patch File Download Diff File

44
qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp
Unescape Escape View File

@ -144,7 +144,7 @@ OpenRGBSettingsPage::OpenRGBSettingsPage(QWidget *parent) :
ui->CheckboxRunZoneChecks->setChecked(ui_settings["RunZoneChecks"]);
}
else
{ // default value
{
ui->CheckboxRunZoneChecks->setChecked(true);
}
@ -183,9 +183,6 @@ OpenRGBSettingsPage::OpenRGBSettingsPage(QWidget *parent) :
\*---------------------------------------------------------*/
json log_manager_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("LogManager");
/*---------------------------------------------------------*\
| Checkboxes |
\*---------------------------------------------------------*/
if(log_manager_settings.contains("log_file"))
{
ui->CheckboxLogFile->setChecked(log_manager_settings["log_file"]);
@ -205,6 +202,29 @@ OpenRGBSettingsPage::OpenRGBSettingsPage(QWidget *parent) :
}
/*---------------------------------------------------------*\
| Load detector settings |
\*---------------------------------------------------------*/
json detector_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Detectors");
if(detector_settings.contains("hid_safe_mode"))
{
ui->CheckboxHIDSafeMode->setChecked(detector_settings["hid_safe_mode"]);
}
else
{
ui->CheckboxHIDSafeMode->setChecked(true);
}
if(detector_settings.contains("initial_detection_delay_ms"))
{
ui->TextDetectionDelay->setValue(log_manager_settings["initial_detection_delay_ms"]);
}
else
{
ui->TextDetectionDelay->setValue(0);
}
/*---------------------------------------------------------*\
| Load drivers settings (Windows only or Mac) |
\*---------------------------------------------------------*/
#if defined(WIN32) || defined(_MACOSX_X86_X64)
@ -1005,6 +1025,22 @@ void OpenRGBSettingsPage::on_CheckboxLogFile_clicked()
SaveSettings();
}
void OpenRGBSettingsPage::on_CheckboxHIDSafeMode_clicked()
{
json detector_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Detectors");
detector_settings["hid_safe_mode"] = ui->CheckboxHIDSafeMode->isChecked();
ResourceManager::get()->GetSettingsManager()->SetSettings("Detectors", detector_settings);
SaveSettings();
}
void OpenRGBSettingsPage::on_TextDetectionDelay_valueChanged(int delay)
{
json detector_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Detectors");
detector_settings["initial_detection_delay_ms"] = delay;
ResourceManager::get()->GetSettingsManager()->SetSettings("Detectors", detector_settings);
SaveSettings();
}
void OpenRGBSettingsPage::on_CheckboxAMDSMBusReduceCPU_clicked()
{
json drivers_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Drivers");

2
qt/OpenRGBSettingsPage/OpenRGBSettingsPage.h
Unescape Escape View File

@ -78,6 +78,8 @@ private slots:
void on_OpenSettingsFolderButton_clicked();
void on_CheckboxLogConsole_clicked();
void on_CheckboxLogFile_clicked();
void on_CheckboxHIDSafeMode_clicked();
void on_TextDetectionDelay_valueChanged(int);
void on_CheckboxAMDSMBusReduceCPU_clicked();
void on_CheckboxSharedSMBusAccess_clicked();

306
qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui
Unescape Escape View File

@ -30,19 +30,12 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-321</y>
<width>554</width>
<height>1052</height>
<y>-328</y>
<width>508</width>
<height>1105</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="27" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartMinimized">
<property name="text">
<string>Start Minimized</string>
</property>
</widget>
</item>
<item row="15" column="0">
<widget class="QCheckBox" name="CheckboxLogConsole">
<property name="text">
@ -50,32 +43,43 @@
</property>
</widget>
</item>
<item row="17" column="0">
<widget class="QCheckBox" name="CheckboxAMDSMBusReduceCPU">
<item row="36" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartProfile">
<property name="text">
<string>AMD SMBus: Reduce CPU Usage (restart required)</string>
<string>Load Profile</string>
</property>
</widget>
</item>
<item row="33" column="1">
<widget class="QComboBox" name="ComboBoxAutoStartProfile"/>
<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="31" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartClient">
<item row="21" column="0">
<widget class="QCheckBox" name="CheckboxSharedSMBusAccess">
<property name="text">
<string>Start Client</string>
<string>Shared SMBus Access (restart required)</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QCheckBox" name="CheckboxDisableKeyExpansion">
<item row="3" column="1">
<widget class="QComboBox" name="ComboBoxLanguage"/>
</item>
<item row="40" column="0">
<widget class="QLabel" name="AutoStartStatusLabel">
<property name="text">
<string>Disable Key Expansion in Device View</string>
<string>Start at Login Status</string>
</property>
</widget>
</item>
<item row="32" column="1">
<widget class="QLineEdit" name="TextCustomArgs"/>
<item row="7" column="0">
<widget class="QCheckBox" name="CheckboxLoadGeometry">
<property name="text">
<string>Load Window Geometry</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="HexFormatLabel">
@ -84,24 +88,21 @@
</property>
</widget>
</item>
<item row="36" column="1">
<widget class="QComboBox" name="ComboBoxExitProfile"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="UserInterfaceSettingsLabel">
<item row="11" column="0">
<widget class="QCheckBox" name="CheckboxShowLEDView">
<property name="text">
<string>User Interface Settings:</string>
<string>Show LED View by Default</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QCheckBox" name="CheckboxRunZoneChecks">
<item row="24" column="0">
<widget class="QCheckBox" name="CheckboxLegacyWorkaround">
<property name="text">
<string>Run Zone Checks on Rescan</string>
<string>Legacy Workaround</string>
</property>
</widget>
</item>
<item row="35" column="1">
<item row="38" column="1">
<widget class="QComboBox" name="ComboBoxResumeProfile"/>
</item>
<item row="4" column="0">
@ -111,101 +112,120 @@
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QComboBox" name="ComboBoxHexFormat"/>
</item>
<item row="16" column="0">
<widget class="QLabel" name="DriversSettingsLabel">
<widget class="QLabel" name="DetectionSettingsLabel">
<property name="text">
<string>Drivers Settings:</string>
<string>Detection Settings:</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QComboBox" name="ComboBoxHexFormat"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="LabelLanguage">
<item row="23" column="0">
<widget class="QCheckBox" name="CheckboxAllDevices">
<property name="text">
<string>Language</string>
<string>Serve All Devices (Including those from client connections)</string>
</property>
</widget>
</item>
<item row="38" 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 row="32" column="1">
<widget class="QLineEdit" name="TextServerHost"/>
</item>
<item row="28" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartServer">
<item row="20" column="0">
<widget class="QCheckBox" name="CheckboxAMDSMBusReduceCPU">
<property name="text">
<string>Start Server</string>
<string>AMD SMBus: Reduce CPU Usage (restart required)</string>
</property>
</widget>
</item>
<item row="33" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartProfile">
<item row="37" column="1">
<widget class="QComboBox" name="ComboBoxSuspendProfile"/>
</item>
<item row="25" column="0">
<widget class="QLabel" name="AutoStartLabel">
<property name="text">
<string>Load Profile</string>
<string>Start at Login Settings:</string>
</property>
</widget>
</item>
<item row="23" column="0">
<widget class="QCheckBox" name="CheckboxAutoStart">
<item row="32" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartSetServerHost">
<property name="text">
<string>Start at Login</string>
<string>Set Server Host</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="CheckboxSaveGeometry">
<item row="6" column="0">
<widget class="QCheckBox" name="CheckboxTrayIconGreyscale">
<property name="text">
<string>Save Geometry on Close</string>
<string>Greyscale Tray Icon</string>
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QCheckBox" name="CheckboxLogFile">
<item row="4" column="1">
<widget class="QComboBox" name="ComboBoxTheme"/>
</item>
<item row="30" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartMinimized">
<property name="text">
<string>Enable Log File (restart required)</string>
<string>Start Minimized</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QCheckBox" name="CheckboxTrayIconGreyscale">
<item row="36" column="1">
<widget class="QComboBox" name="ComboBoxAutoStartProfile"/>
</item>
<item row="26" column="0">
<widget class="QCheckBox" name="CheckboxAutoStart">
<property name="text">
<string>Greyscale Tray Icon</string>
<string>Start at Login</string>
</property>
</widget>
</item>
<item row="29" column="1">
<widget class="QLineEdit" name="TextServerHost"/>
<item row="39" column="1">
<widget class="QComboBox" name="ComboBoxExitProfile"/>
</item>
<item row="34" column="1">
<widget class="QComboBox" name="ComboBoxSuspendProfile"/>
<item row="17" column="0">
<widget class="QCheckBox" name="CheckboxHIDSafeMode">
<property name="text">
<string>HID Safe Mode</string>
</property>
</widget>
</item>
<item row="30" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartSetServerPort">
<item row="34" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartClient">
<property name="text">
<string>Set Server Port</string>
<string>Start Client</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QCheckBox" name="CheckboxShowLEDView">
<item row="2" column="0">
<widget class="QLabel" name="UserInterfaceSettingsLabel">
<property name="text">
<string>Show LED View by Default</string>
<string>User Interface Settings:</string>
</property>
</widget>
</item>
<item row="41" 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="35" column="1">
<widget class="QLineEdit" name="TextCustomArgs"/>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="CheckboxMinimizeOnClose">
<property name="text">
@ -213,116 +233,124 @@
</property>
</widget>
</item>
<item row="36" column="0">
<widget class="QCheckBox" name="CheckboxSetOnExit">
<item row="22" column="0">
<widget class="QLabel" name="ServerSettingsLabel">
<property name="text">
<string>Set Profile on Exit</string>
<string>Server Settings:</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QCheckBox" name="CheckboxLoadGeometry">
<item row="8" column="0">
<widget class="QCheckBox" name="CheckboxSaveGeometry">
<property name="text">
<string>Load Window Geometry</string>
<string>Save Geometry on Close</string>
</property>
</widget>
</item>
<item row="30" 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="31" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartServer">
<property name="text">
<string>Start Server</string>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="LogManagerSettingsLabel">
<item row="33" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartSetServerPort">
<property name="text">
<string>Log Manager Settings:</string>
<string>Set Server Port</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="ComboBoxLanguage"/>
</item>
<item row="34" column="0">
<item row="37" column="0">
<widget class="QCheckBox" name="CheckboxSetOnSuspend">
<property name="text">
<string>Set Profile on Suspend</string>
</property>
</widget>
</item>
<item row="32" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartCustom">
<item row="9" column="0">
<widget class="QCheckBox" name="CheckboxRunZoneChecks">
<property name="text">
<string>Custom Arguments</string>
<string>Run Zone Checks on Rescan</string>
</property>
</widget>
</item>
<item row="20" column="0">
<widget class="QCheckBox" name="CheckboxAllDevices">
<item row="13" column="0">
<widget class="QLabel" name="LogManagerSettingsLabel">
<property name="text">
<string>Serve All Devices (Including those from client connections)</string>
<string>Log Manager Settings:</string>
</property>
</widget>
</item>
<item row="31" column="1">
<widget class="QLineEdit" name="TextClientHost"/>
</item>
<item row="29" column="0">
<widget class="QCheckBox" name="CheckboxAutoStartSetServerHost">
<item row="14" column="0">
<widget class="QCheckBox" name="CheckboxLogFile">
<property name="text">
<string>Set Server Host</string>
<string>Enable Log File (restart required)</string>
</property>
</widget>
</item>
<item row="37" column="0">
<widget class="QLabel" name="AutoStartStatusLabel">
<property name="text">
<string>Start at Login Status</string>
<item row="33" 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="18" column="0">
<widget class="QCheckBox" name="CheckboxSharedSMBusAccess">
<item row="38" column="0">
<widget class="QCheckBox" name="CheckboxSetOnResume">
<property name="text">
<string>Shared SMBus Access (restart required)</string>
<string>Set Profile on Resume</string>
</property>
</widget>
</item>
<item row="22" column="0">
<widget class="QLabel" name="AutoStartLabel">
<item row="3" column="0">
<widget class="QLabel" name="LabelLanguage">
<property name="text">
<string>Start at Login Settings:</string>
<string>Language</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="ComboBoxTheme"/>
<item row="19" column="0">
<widget class="QLabel" name="DriversSettingsLabel">
<property name="text">
<string>Drivers Settings:</string>
</property>
</widget>
</item>
<item row="35" column="0">
<widget class="QCheckBox" name="CheckboxSetOnResume">
<widget class="QCheckBox" name="CheckboxAutoStartCustom">
<property name="text">
<string>Set Profile on Resume</string>
<string>Custom Arguments</string>
</property>
</widget>
</item>
<item row="19" column="0">
<widget class="QLabel" name="ServerSettingsLabel">
<item row="34" column="1">
<widget class="QLineEdit" name="TextClientHost"/>
</item>
<item row="39" column="0">
<widget class="QCheckBox" name="CheckboxSetOnExit">
<property name="text">
<string>Server Settings:</string>
<string>Set Profile on Exit</string>
</property>
</widget>
</item>
<item row="21" column="0">
<widget class="QCheckBox" name="CheckboxLegacyWorkaround">
<item row="18" column="0">
<widget class="QLabel" name="DetectionDelayLabel">
<property name="text">
<string>Legacy Workaround</string>
<string>Initial Detection Delay (milliseconds, 0 to disable)</string>
</property>
</widget>
</item>
<item row="18" column="1">
<widget class="QSpinBox" name="TextDetectionDelay">
<property name="maximum">
<number>2147483647</number>
</property>
</widget>
</item>

Write Preview
Loading…
Cancel
Save