Fixes #1184

companion/src/modeledit/setup.cpp

@@ -22,10 +22,11 @@ TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, Ge
     ui->persistentValue->hide();
   }
 
-  ui->countdownBeep->addItem(tr("Silent"));
-  ui->countdownBeep->addItem(tr("Beeps"));
+  ui->countdownBeep->setField(&timer.countdownBeep, this);
+  ui->countdownBeep->addItem(tr("Silent"), 0);
+  ui->countdownBeep->addItem(tr("Beeps"), 1);
   if (IS_ARM(GetEepromInterface()->getBoard()) || IS_2560(GetEepromInterface()->getBoard()))
-    ui->countdownBeep->addItem(tr("Voice"));
+    ui->countdownBeep->addItem(tr("Voice"), 2);
 
   lock = false;
 }
@@ -56,7 +57,6 @@ void TimerPanel::update()
     ui->persistentValue->setText(QString(" %1(%2:%3:%4)").arg(sign<0 ? "-" :" ").arg(hours, 2, 10, QLatin1Char('0')).arg(minutes, 2, 10, QLatin1Char('0')).arg(seconds, 2, 10, QLatin1Char('0')));
   }
 
-  ui->countdownBeep->setCurrentIndex(timer.countdownBeep);
   ui->minuteBeep->setChecked(timer.minuteBeep);
 }
 
@@ -80,12 +80,6 @@ void TimerPanel::on_persistent_toggled(bool checked)
   emit modified();
 }
 
-void TimerPanel::on_countdownBeep_currentIndexChanged(int index)
-{
-  timer.countdownBeep = index;
-  emit modified();
-}
-
 void TimerPanel::on_minuteBeep_toggled(bool checked)
 {
   timer.minuteBeep = checked;

companion/src/modeledit/setup.h

@@ -30,7 +30,6 @@ class TimerPanel : public ModelPanel
     void on_value_editingFinished();
     void on_persistent_toggled(bool checked);
     void on_minuteBeep_toggled(bool checked);
-    void on_countdownBeep_currentIndexChanged(int index);
 
   private:
     TimerData & timer;

companion/src/modeledit/setup_timer.ui

@@ -41,7 +41,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QComboBox" name="countdownBeep"/>
+    <widget class="QUnsignedAutoComboBox" name="countdownBeep"/>
    </item>
    <item>
     <widget class="QCheckBox" name="minuteBeep">
@@ -79,6 +79,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QUnsignedAutoComboBox</class>
+   <extends>QComboBox</extends>
+   <header>qautocombobox.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>