jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved settings usability.

Browse Source 
Don't ask user to save changes every item switch.
Apply button greyed out when there are no changes.
This commit is contained in:
Socapex 2014-05-09 18:04:39 -04:00
parent 6f832575e7
commit c76b7cbf3f
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
obs/window-basic-settings.cpp
View File

@ -158,6 +158,9 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
HookWidget(ui->fpsNumerator, SCROLL_CHANGED, VIDEO_CHANGED);
HookWidget(ui->fpsDenominator, SCROLL_CHANGED, VIDEO_CHANGED);
//Apply button disabled until change.
EnableApplyButton(false);
LoadServiceTypes();
LoadServiceInfo();
LoadSettings(false);
@ -664,11 +667,6 @@ void OBSBasicSettings::on_listWidget_itemSelectionChanged()
if (loading || row == pageIndex)
return;
if (Changed() && !QueryChanges()) {
ui->listWidget->setCurrentRow(pageIndex);
return;
}
pageIndex = row;
}
@ -744,20 +742,26 @@ void OBSBasicSettings::on_baseResolution_editTextChanged(const QString &text)
void OBSBasicSettings::GeneralChanged()
{
if (!loading)
if (!loading) {
generalChanged = true;
EnableApplyButton(true);
}
}
void OBSBasicSettings::OutputsChanged()
{
if (!loading)
if (!loading) {
outputsChanged = true;
EnableApplyButton(true);
}
}
void OBSBasicSettings::AudioChanged()
{
if (!loading)
if (!loading) {
audioChanged = true;
EnableApplyButton(true);
}
}
void OBSBasicSettings::AudioChangedRestart()
@ -765,6 +769,7 @@ void OBSBasicSettings::AudioChangedRestart()
if (!loading) {
audioChanged = true;
ui->audioMsg->setText(QTStr("Basic.Settings.ProgramRestart"));
EnableApplyButton(true);
}
}
@ -773,17 +778,22 @@ void OBSBasicSettings::VideoChangedRestart()
if (!loading) {
videoChanged = true;
ui->videoMsg->setText(QTStr("Basic.Settings.ProgramRestart"));
EnableApplyButton(true);
}
}
void OBSBasicSettings::VideoChangedResolution()
{
if (!loading && ValidResolutions(ui.get()))
if (!loading && ValidResolutions(ui.get())) {
videoChanged = true;
EnableApplyButton(true);
}
}
void OBSBasicSettings::VideoChanged()
{
if (!loading)
if (!loading) {
videoChanged = true;
EnableApplyButton(true);
}
}

6
obs/window-basic-settings.hpp
View File

@ -53,12 +53,18 @@ private:
audioChanged || videoChanged;
}
inline void EnableApplyButton(bool en)
{
ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(en);
}
inline void ClearChanged()
{
generalChanged = false;
outputsChanged = false;
audioChanged = false;
videoChanged = false;
EnableApplyButton(false);
}
void HookWidget(QWidget *widget, const char *signal, const char *slot);