Skip to content

Commit 3efc267

Browse files
CalcProgrammer1CalcProgrammer1
committed
Add button to enable/disable log console to settings page
1 parent b94663a commit 3efc267

File tree

3 files changed

+114
-72
lines changed

3 files changed

+114
-72
lines changed

‎qt/OpenRGBSettingsPage.cpp‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,19 @@ OpenRGBSettingsPage::OpenRGBSettingsPage(QWidget *parent) :
6969
ui->CheckboxRunZoneChecks->setChecked(true);
7070
}
7171

72+
/*---------------------------------------------------------*\
73+
| Load LogManager settings |
74+
\*---------------------------------------------------------*/
75+
json log_manager_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("LogManager");
76+
77+
/*---------------------------------------------------------*\
78+
| Checkboxes |
79+
\*---------------------------------------------------------*/
80+
if(log_manager_settings.contains("log_console"))
81+
{
82+
ui->CheckboxLogConsole->setChecked(log_manager_settings["log_console"]);
83+
}
84+
7285
/*---------------------------------------------------------*\
7386
| Load AutoStart settings |
7487
\*---------------------------------------------------------*/
@@ -290,7 +303,6 @@ void OpenRGBSettingsPage::SetAutoStartVisibility(bool visible)
290303
ui->TextCustomArgs->hide();
291304
ui->TextClientHost->hide();
292305
ui->TextServerPort->hide();
293-
ui->AutoStartLabel->hide();
294306
ui->AutoStartStatusLabel->hide();
295307
}
296308
else
@@ -305,7 +317,6 @@ void OpenRGBSettingsPage::SetAutoStartVisibility(bool visible)
305317
ui->TextCustomArgs->show();
306318
ui->TextClientHost->show();
307319
ui->TextServerPort->show();
308-
ui->AutoStartLabel->show();
309320
ui->AutoStartStatusLabel->show();
310321
}
311322
}
@@ -510,3 +521,12 @@ void Ui::OpenRGBSettingsPage::on_OpenSettingsFolderButton_clicked()
510521
QDesktopServices::openUrl(url);
511522
}
512523

524+
525+
void Ui::OpenRGBSettingsPage::on_CheckboxLogConsole_clicked()
526+
{
527+
json log_manager_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("LogManager");
528+
log_manager_settings["log_console"] = ui->CheckboxLogConsole->isChecked();
529+
ResourceManager::get()->GetSettingsManager()->SetSettings("LogManager", log_manager_settings);
530+
SaveSettings();
531+
}
532+

‎qt/OpenRGBSettingsPage.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ private slots:
4949
void on_CheckboxAutoStartCustom_clicked();
5050
void on_CheckboxRunZoneChecks_clicked();
5151
void on_OpenSettingsFolderButton_clicked();
52+
void on_CheckboxLogConsole_clicked();
5253
};
5354

5455
#endif // OPENRGBSETTINGSPAGE_H

‎qt/OpenRGBSettingsPage.ui‎

Lines changed: 91 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -24,147 +24,168 @@
2424
<rect>
2525
<x>0</x>
2626
<y>0</y>
27-
<width>416</width>
28-
<height>459</height>
27+
<width>405</width>
28+
<height>465</height>
2929
</rect>
3030
</property>
3131
<layout class="QGridLayout" name="gridLayout_3">
32-
<item row="11" column="0">
33-
<widget class="QCheckBox" name="CheckboxAutoStartSetServerPort">
32+
<item row="22" column="0">
33+
<spacer name="verticalSpacer">
34+
<property name="orientation">
35+
<enum>Qt::Vertical</enum>
36+
</property>
37+
<property name="sizeType">
38+
<enum>QSizePolicy::MinimumExpanding</enum>
39+
</property>
40+
<property name="sizeHint" stdset="0">
41+
<size>
42+
<width>20</width>
43+
<height>40</height>
44+
</size>
45+
</property>
46+
</spacer>
47+
</item>
48+
<item row="20" column="1">
49+
<widget class="QComboBox" name="ComboBoxAutoStartProfile"/>
50+
</item>
51+
<item row="5" column="0">
52+
<widget class="QCheckBox" name="CheckboxLoadGeometry">
3453
<property name="text">
35-
<string>Set Server Port</string>
54+
<string>Load Window Geometry</string>
3655
</property>
3756
</widget>
3857
</item>
39-
<item row="7" column="0">
40-
<widget class="QCheckBox" name="CheckboxAutoStart">
58+
<item row="3" column="1">
59+
<widget class="QComboBox" name="ComboBoxTheme"/>
60+
</item>
61+
<item row="17" column="1">
62+
<widget class="QLineEdit" name="TextServerPort">
63+
<property name="inputMask">
64+
<string>90000</string>
65+
</property>
4166
<property name="text">
42-
<string>Start At Login</string>
67+
<string/>
68+
</property>
69+
<property name="placeholderText">
70+
<string/>
4371
</property>
4472
</widget>
4573
</item>
46-
<item row="8" column="0">
47-
<widget class="QLabel" name="AutoStartLabel">
74+
<item row="7" column="0">
75+
<widget class="QCheckBox" name="CheckboxRunZoneChecks">
4876
<property name="text">
49-
<string>Start At Login Settings:</string>
77+
<string>Run zone checks on rescan</string>
5078
</property>
5179
</widget>
5280
</item>
53-
<item row="14" column="0">
54-
<widget class="QCheckBox" name="CheckboxAutoStartProfile">
81+
<item row="16" column="0">
82+
<widget class="QCheckBox" name="CheckboxAutoStartServer">
5583
<property name="text">
56-
<string>Load Profile</string>
84+
<string>Start Server</string>
5785
</property>
5886
</widget>
5987
</item>
60-
<item row="13" column="1">
61-
<widget class="QLineEdit" name="TextCustomArgs"/>
62-
</item>
63-
<item row="12" column="1">
88+
<item row="18" column="1">
6489
<widget class="QLineEdit" name="TextClientHost"/>
6590
</item>
66-
<item row="14" column="1">
67-
<widget class="QComboBox" name="ComboBoxAutoStartProfile"/>
91+
<item row="19" column="1">
92+
<widget class="QLineEdit" name="TextCustomArgs"/>
6893
</item>
69-
<item row="4" column="0">
70-
<widget class="QCheckBox" name="CheckboxLoadGeometry">
94+
<item row="15" column="0">
95+
<widget class="QCheckBox" name="CheckboxAutoStartMinimized">
7196
<property name="text">
72-
<string>Load Window Geometry</string>
97+
<string>Start Minimized</string>
7398
</property>
7499
</widget>
75100
</item>
76-
<item row="15" column="0">
77-
<widget class="QLabel" name="AutoStartStatusLabel">
101+
<item row="2" column="0">
102+
<widget class="QLabel" name="UserInterfaceSettingsLabel">
78103
<property name="text">
79-
<string>Start at Login Status</string>
104+
<string>User Interface Settings:</string>
80105
</property>
81106
</widget>
82107
</item>
83-
<item row="10" column="0">
84-
<widget class="QCheckBox" name="CheckboxAutoStartServer">
108+
<item row="11" column="0">
109+
<widget class="QCheckBox" name="CheckboxAutoStart">
85110
<property name="text">
86-
<string>Start Server</string>
111+
<string>Start At Login</string>
87112
</property>
88113
</widget>
89114
</item>
90-
<item row="16" column="0">
91-
<spacer name="verticalSpacer">
92-
<property name="orientation">
93-
<enum>Qt::Vertical</enum>
94-
</property>
95-
<property name="sizeType">
96-
<enum>QSizePolicy::MinimumExpanding</enum>
97-
</property>
98-
<property name="sizeHint" stdset="0">
99-
<size>
100-
<width>20</width>
101-
<height>40</height>
102-
</size>
115+
<item row="4" column="0">
116+
<widget class="QCheckBox" name="CheckboxMinimizeOnClose">
117+
<property name="text">
118+
<string>Minimize On Close</string>
103119
</property>
104-
</spacer>
105-
</item>
106-
<item row="2" column="1">
107-
<widget class="QComboBox" name="ComboBoxTheme"/>
120+
</widget>
108121
</item>
109-
<item row="13" column="0">
110-
<widget class="QCheckBox" name="CheckboxAutoStartCustom">
122+
<item row="6" column="0">
123+
<widget class="QCheckBox" name="CheckboxSaveGeometry">
111124
<property name="text">
112-
<string>Custom Arguments</string>
125+
<string>Save Geometry On Close</string>
113126
</property>
114127
</widget>
115128
</item>
116-
<item row="12" column="0">
129+
<item row="18" column="0">
117130
<widget class="QCheckBox" name="CheckboxAutoStartClient">
118131
<property name="text">
119132
<string>Start Client</string>
120133
</property>
121134
</widget>
122135
</item>
123-
<item row="9" column="0">
124-
<widget class="QCheckBox" name="CheckboxAutoStartMinimized">
136+
<item row="20" column="0">
137+
<widget class="QCheckBox" name="CheckboxAutoStartProfile">
125138
<property name="text">
126-
<string>Start Minimized</string>
139+
<string>Load Profile</string>
127140
</property>
128141
</widget>
129142
</item>
130-
<item row="5" column="0">
131-
<widget class="QCheckBox" name="CheckboxSaveGeometry">
143+
<item row="17" column="0">
144+
<widget class="QCheckBox" name="CheckboxAutoStartSetServerPort">
132145
<property name="text">
133-
<string>Save Geometry On Close</string>
146+
<string>Set Server Port</string>
134147
</property>
135148
</widget>
136149
</item>
137-
<item row="2" column="0">
150+
<item row="3" column="0">
138151
<widget class="QLabel" name="ThemeLabel">
139152
<property name="text">
140153
<string>Theme</string>
141154
</property>
142155
</widget>
143156
</item>
144-
<item row="3" column="0">
145-
<widget class="QCheckBox" name="CheckboxMinimizeOnClose">
157+
<item row="9" column="0">
158+
<widget class="QCheckBox" name="CheckboxLogConsole">
146159
<property name="text">
147-
<string>Minimize On Close</string>
160+
<string>Enable Log Console</string>
148161
</property>
149162
</widget>
150163
</item>
151-
<item row="11" column="1">
152-
<widget class="QLineEdit" name="TextServerPort">
153-
<property name="inputMask">
154-
<string>90000</string>
164+
<item row="19" column="0">
165+
<widget class="QCheckBox" name="CheckboxAutoStartCustom">
166+
<property name="text">
167+
<string>Custom Arguments</string>
155168
</property>
169+
</widget>
170+
</item>
171+
<item row="8" column="0">
172+
<widget class="QLabel" name="LogManagerSettingsLabel">
156173
<property name="text">
157-
<string/>
174+
<string>Log Manager Settings:</string>
158175
</property>
159-
<property name="placeholderText">
160-
<string/>
176+
</widget>
177+
</item>
178+
<item row="21" column="0">
179+
<widget class="QLabel" name="AutoStartStatusLabel">
180+
<property name="text">
181+
<string>Start at Login Status</string>
161182
</property>
162183
</widget>
163184
</item>
164-
<item row="6" column="0">
165-
<widget class="QCheckBox" name="CheckboxRunZoneChecks">
185+
<item row="10" column="0">
186+
<widget class="QLabel" name="AutoStartLabel">
166187
<property name="text">
167-
<string>Run zone checks on rescan</string>
188+
<string>Start At Login Settings:</string>
168189
</property>
169190
</widget>
170191
</item>

0 commit comments

Comments
 (0)