diff --git a/companion/src/generaledit/generalsetup.cpp b/companion/src/generaledit/generalsetup.cpp index 16ef5b271..680c9c423 100644 --- a/companion/src/generaledit/generalsetup.cpp +++ b/companion/src/generaledit/generalsetup.cpp @@ -158,7 +158,7 @@ ui(new Ui::GeneralSetup) ui->usbModeLabel->hide(); ui->usbModeCB->hide(); } - + if (firmware->getCapability(HasSwitchableJack)) { ui->jackModeCB->setCurrentIndex(generalSettings.jackMode); } @@ -266,7 +266,7 @@ ui(new Ui::GeneralSetup) ui->pwrOnDelayLabel->hide(); ui->pwrOnDelay->hide(); } - + setValues(); lock = false; @@ -505,13 +505,13 @@ void GeneralSetupPanel::on_splashScreenDuration_currentIndexChanged(int index) emit modified(); } -void GeneralSetupPanel::on_pwrOnDelay_valueChanged() +void GeneralSetupPanel::on_pwrOnDelay_valueChanged(int i) { generalSettings.pwrOnSpeed = 2 - ui->pwrOnDelay->value(); emit modified(); } -void GeneralSetupPanel::on_pwrOffDelay_valueChanged() +void GeneralSetupPanel::on_pwrOffDelay_valueChanged(int i) { generalSettings.pwrOffSpeed = 2 - ui->pwrOffDelay->value(); emit modified(); @@ -650,7 +650,7 @@ void GeneralSetupPanel::on_backlightautoSB_editingFinished() } } -void GeneralSetupPanel::on_switchesDelay_valueChanged() +void GeneralSetupPanel::on_switchesDelay_valueChanged(int i) { generalSettings.switchesDelay = (ui->switchesDelay->value() / 10) - 15; emit modified(); diff --git a/companion/src/generaledit/generalsetup.h b/companion/src/generaledit/generalsetup.h index 34aeaaa71..9fc2e0bf8 100644 --- a/companion/src/generaledit/generalsetup.h +++ b/companion/src/generaledit/generalsetup.h @@ -65,7 +65,7 @@ class GeneralSetupPanel : public GeneralPanel void on_mavbaud_CB_currentIndexChanged(int index); void on_voiceLang_CB_currentIndexChanged(int index); void stickReverseEdited(); - void on_switchesDelay_valueChanged(); + void on_switchesDelay_valueChanged(int i); void on_blAlarm_ChkB_stateChanged(); void unlockSwitchEdited(); void on_beepVolume_SL_valueChanged(); @@ -89,8 +89,8 @@ class GeneralSetupPanel : public GeneralPanel void on_contrastSB_editingFinished(); void on_registrationId_editingFinished(); - void on_pwrOnDelay_valueChanged(); - void on_pwrOffDelay_valueChanged(); + void on_pwrOnDelay_valueChanged(int i); + void on_pwrOffDelay_valueChanged(int i); private: Ui::GeneralSetup *ui;