Merge branch 'master' of github.com:Arisotura/melonDS

This commit is contained in:
Arisotura 2022-04-01 12:54:58 +02:00
commit 1dfcf2010a
2 changed files with 10 additions and 0 deletions

View File

@ -65,6 +65,8 @@ FirmwareSettingsDialog::FirmwareSettingsDialog(QWidget* parent) : QDialog(parent
ui->txtMAC->setText(QString::fromStdString(Config::FirmwareMAC)); ui->txtMAC->setText(QString::fromStdString(Config::FirmwareMAC));
ui->cbRandomizeMAC->setChecked(Config::RandomizeMAC); ui->cbRandomizeMAC->setChecked(Config::RandomizeMAC);
on_overrideFirmwareBox_toggled();
on_cbRandomizeMAC_toggled(); on_cbRandomizeMAC_toggled();
} }
@ -202,6 +204,13 @@ void FirmwareSettingsDialog::on_cbxBirthdayMonth_currentIndexChanged(int idx)
} }
} }
void FirmwareSettingsDialog::on_overrideFirmwareBox_toggled()
{
bool disable = !ui->overrideFirmwareBox->isChecked();
ui->grpUserSettings->setDisabled(disable);
ui->grpWifiSettings->setDisabled(disable);
}
void FirmwareSettingsDialog::on_cbRandomizeMAC_toggled() void FirmwareSettingsDialog::on_cbRandomizeMAC_toggled()
{ {
bool disable = ui->cbRandomizeMAC->isChecked(); bool disable = ui->cbRandomizeMAC->isChecked();

View File

@ -123,6 +123,7 @@ private slots:
void done(int r); void done(int r);
void on_cbxBirthdayMonth_currentIndexChanged(int idx); void on_cbxBirthdayMonth_currentIndexChanged(int idx);
void on_overrideFirmwareBox_toggled();
void on_cbRandomizeMAC_toggled(); void on_cbRandomizeMAC_toggled();
private: private: