All firmware selections have been removed from the download dialog.

A consequence is that it is always possible to try to download voice files. Even for those boards that have no voice capability. I do not think that is a big problem. Anyone trying to download voice files for a unmodified 9x should not be surprised to get a "file not found" browser message.

companion/src/fwpreferencesdialog.cpp

@@ -9,314 +9,48 @@
 
 fwPreferencesDialog::fwPreferencesDialog(QWidget *parent) :
   QDialog(parent),
-  ui(new Ui::fwPreferencesDialog),
-  updateLock(false)
+  ui(new Ui::fwPreferencesDialog)
 {
   ui->setupUi(this);
   setWindowIcon(CompanionIcon("fwpreferences.png"));
-
-  QCheckBox * OptionCheckBox[]= {
-      ui->optionCheckBox_1, ui->optionCheckBox_2, ui->optionCheckBox_3, ui->optionCheckBox_4,  ui->optionCheckBox_5, ui->optionCheckBox_6,  ui->optionCheckBox_7,
-      ui->optionCheckBox_8, ui->optionCheckBox_9, ui->optionCheckBox_10,  ui->optionCheckBox_11, ui->optionCheckBox_12, ui->optionCheckBox_13, ui->optionCheckBox_14,
-      ui->optionCheckBox_15,ui->optionCheckBox_16, ui->optionCheckBox_17, ui->optionCheckBox_18, ui->optionCheckBox_19, ui->optionCheckBox_20, ui->optionCheckBox_21,
-      ui->optionCheckBox_22, ui->optionCheckBox_23, ui->optionCheckBox_24, ui->optionCheckBox_25, ui->optionCheckBox_26, ui->optionCheckBox_27, ui->optionCheckBox_28,
-      ui->optionCheckBox_29, ui->optionCheckBox_30, ui->optionCheckBox_31, ui->optionCheckBox_32, ui->optionCheckBox_33, ui->optionCheckBox_34, ui->optionCheckBox_35,
-      ui->optionCheckBox_36, ui->optionCheckBox_37, ui->optionCheckBox_38, ui->optionCheckBox_39, ui->optionCheckBox_40, ui->optionCheckBox_41, ui->optionCheckBox_42,
-      NULL };
-
-  voice=NULL;
-  
-  connect(ui->langCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(firmwareLangChanged()));
-  connect(ui->voiceCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(firmwareLangChanged()));
-
-  for (int i=0; OptionCheckBox[i]; i++) {
-    optionsCheckBoxes.push_back(OptionCheckBox[i]);
-    connect(OptionCheckBox[i], SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool)));
-  }
-
   initSettings();
-
-  connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
-  connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
-
-  shrink();
 }
 
-
 fwPreferencesDialog::~fwPreferencesDialog()
 {
   delete ui;
 }
 
-void fwPreferencesDialog::showVoice(bool show)
-{
-  if (show)
-    showVoice();
-  else
-    hideVoice();
-}
-
-void fwPreferencesDialog::showVoice()
-{
-  ui->voiceLine->show(); 
-  ui->voiceLabel->show();
-  ui->voiceCombo->show();
-  ui->voice_dnld->show();
-}
-
-void fwPreferencesDialog::hideVoice()
-{
-  ui->voiceLine->hide(); 
-  ui->voiceLabel->hide();
-  ui->voiceCombo->hide();
-  ui->voice_dnld->hide();  
-  QTimer::singleShot(0, this, SLOT(shrink()));
-}
-
-void fwPreferencesDialog::shrink()
-{
-    resize(0,0);
-}
-
-void fwPreferencesDialog::baseFirmwareChanged()
-{
-  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
-  voice=NULL;
-  foreach(FirmwareInfo * firmware, firmwares) {
-    if (firmware->id == selected_firmware) {
-      showVoice(firmware->voice);
-      populateFirmwareOptions(firmware);
-      break;
-    }
-  }
-  firmwareChanged();
-}
-
-FirmwareVariant fwPreferencesDialog::getFirmwareVariant()
-{
-  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
-  bool voice=false;
-  foreach(FirmwareInfo * firmware, firmwares) {
-    if (firmware->id == selected_firmware) {
-      QString id = firmware->id;
-      foreach(QCheckBox *cb, optionsCheckBoxes) {
-        if (cb->isChecked()) {
-          if (cb->text()=="voice" && cb->isChecked())
-            voice=true;
-          id += QString("-") + cb->text();
-        }
-      }
-      if (! firmware->eepromInterface->getCapability(MultiLangVoice)) {
-        if (ui->voiceCombo->count() && (voice || firmware->voice))
-          id += QString("-tts") + ui->voiceCombo->currentText();
-      }
-      if (ui->langCombo->count())
-        id += QString("-") + ui->langCombo->currentText();
-
-      return GetFirmwareVariant(id);
-    }
-  }
-
-  // Should never occur...
-  return default_firmware_variant;
-}
-
-void fwPreferencesDialog::firmwareOptionChanged(bool state)
-{
-  QCheckBox *cb = qobject_cast<QCheckBox*>(sender());
-  FirmwareInfo * firmware=NULL;
-  if (cb && state) {
-    QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
-    foreach(firmware, firmwares) {
-      if (firmware->id == selected_firmware) {
-        foreach(QList<Option> opts, firmware->opts) {
-          foreach(Option opt, opts) {
-            if (cb->text() == opt.name) {
-              foreach(Option other, opts) {
-                if (other.name != opt.name) {
-                  foreach(QCheckBox *ocb, optionsCheckBoxes) {
-                    if (ocb->text() == other.name)
-                      ocb->setChecked(false);
-                  }
-                }
-              }
-              if (voice) {
-                showVoice(voice->isChecked());
-              }
-              
-              return firmwareChanged();
-            }
-          }
-        }
-      }
-    }
-  } else if (cb && !state) {
-    if (cb->text()=="voice") {
-      hideVoice();
-    }
-  }
-  if (voice) {
-    showVoice(voice->isChecked());
-  }  else if (firmware) {
-    if (firmware->voice) {
-      showVoice();    
-    }
-  }
-  return firmwareChanged();
-}
-
-void fwPreferencesDialog::firmwareLangChanged()
-{
-  firmwareChanged();
-}
-
-void fwPreferencesDialog::firmwareChanged()
-{
-  if (updateLock)
-    return;
-  
-  FirmwareVariant variant = getFirmwareVariant();
-  QString stamp;
-  stamp.append(variant.firmware->stamp);
-  ui->fw_dnld->setEnabled(!variant.firmware->getUrl(variant.id).isNull());
-  QString url=variant.firmware->getUrl(variant.id);
-  // B-Plan 
-  if (false) {
-    ui->CPU_ID_LE->show();
-    ui->CPU_ID_LABEL->show();
-  } else {
-    ui->CPU_ID_LE->hide();
-    ui->CPU_ID_LABEL->hide();
-  }
-  int fwrev = g.fwRev.get(variant.id);
-  if (fwrev != 0) {
-    ui->FwInfo->setText(tr("Last downloaded release: %1").arg(fwrev));
-    if (!stamp.isEmpty()) {
-      ui->checkFWUpdates->show();
-    } else {
-      ui->checkFWUpdates->hide();
-    }
-  }
-  else {
-    if (ui->fw_dnld->isEnabled()) {
-      ui->FwInfo->setText(tr("The selected firmware has never been downloaded by Companion."));
-        ui->checkFWUpdates->hide();   
-    }
-    else {
-      ui->FwInfo->setText(tr("The selected firmware cannot be downloaded by Companion."));
-      ui->checkFWUpdates->hide();
-    }
-  }
-}
-
-void fwPreferencesDialog::writeValues()
-{
-  g.cpuId( ui->CPU_ID_LE->text() );
-  current_firmware_variant = getFirmwareVariant();
-  g.profile[g.id()].fwType( current_firmware_variant.id );
-}
-
-void fwPreferencesDialog::populateFirmwareOptions(const FirmwareInfo * firmware)
-{
-  const FirmwareInfo * parent = firmware->parent ? firmware->parent : firmware;
-
-  updateLock = true;
-
-  ui->langCombo->clear();
-  foreach(const char *lang, parent->languages) {
-    ui->langCombo->addItem(lang);
-    if (current_firmware_variant.id.endsWith(lang))
-      ui->langCombo->setCurrentIndex(ui->langCombo->count() - 1);
-  }
-  ui->voiceCombo->clear();
-  foreach(const char *lang, parent->ttslanguages) {
-    ui->voiceCombo->addItem(lang);
-    if (current_firmware_variant.id.contains(QString("-tts%1").arg(lang)))
-      ui->voiceCombo->setCurrentIndex(ui->voiceCombo->count() - 1);
-  }
-
-  showVoice(ui->langCombo->count()!=0);
-
-  int index = 0;
-  foreach(QList<Option> opts, parent->opts) {
-    foreach(Option opt, opts) {
-      if (index >= optionsCheckBoxes.size()) {
-        qDebug() << "This firmware needs more options checkboxes!";
-      }
-      else {
-        QCheckBox *cb = optionsCheckBoxes.at(index++);
-        if (cb) {
-          cb->show();
-          cb->setText(opt.name);
-          cb->setToolTip(opt.tooltip);
-          cb->setCheckState(current_firmware_variant.id.contains(opt.name) ? Qt::Checked : Qt::Unchecked);
-            
-          if (opt.name==QString("voice")) {
-            voice=cb;
-            showVoice(current_firmware_variant.id.contains(opt.name) ||firmware->voice);
-          }
-        }
-      }
-    }
-  }
-  for (; index<optionsCheckBoxes.size(); index++) {
-    QCheckBox *cb = optionsCheckBoxes.at(index);
-    cb->hide();
-    cb->setCheckState(Qt::Unchecked);
-  }
-
-  updateLock = false;
-  QTimer::singleShot(0, this, SLOT(shrink()));
-}
-
 void fwPreferencesDialog::initSettings()
 {
-  ui->CPU_ID_LE->setText(g.cpuId());
-  FirmwareInfo * current_firmware = GetCurrentFirmware();
-
-  foreach(FirmwareInfo * firmware, firmwares) {
-    ui->downloadVerCB->addItem(firmware->name, firmware->id);
-    if (current_firmware == firmware) {
-      ui->downloadVerCB->setCurrentIndex(ui->downloadVerCB->count() - 1);
-    }
-  }
-  
-  baseFirmwareChanged();
-  firmwareChanged();
+  ui->fwTypeLbl->setText(g.profile[g.id()].fwType());
+  int revision = g.fwRev.get(g.profile[g.id()].fwType());
+  if (revision > 0)
+    ui->lastRevisionLbl->setText(QString("%1").arg(revision));
 }
 
 void fwPreferencesDialog::on_checkFWUpdates_clicked()
 {
-    FirmwareVariant variant = getFirmwareVariant();
-    if (g.profile[g.id()].burnFirmware()) {
-      current_firmware_variant = variant;
-      g.profile[g.id()].fwType( variant.id );
-    }
-    MainWindow * mw = (MainWindow *)this->parent();
-    mw->checkForUpdates(true, variant.id);
-    firmwareChanged();
+  MainWindow * mw = (MainWindow *)this->parent();
+  QString fwType = g.profile[g.id()].fwType();
+  mw->checkForUpdates(true, fwType);
+  initSettings();
 }
 
 void fwPreferencesDialog::on_fw_dnld_clicked()
 {
   MainWindow * mw = (MainWindow *)this->parent();
-  FirmwareVariant variant = getFirmwareVariant();
-  writeValues();
-  if (!variant.firmware->getUrl(variant.id).isNull()) {
-    if (g.profile[g.id()].burnFirmware()) {
-      current_firmware_variant = getFirmwareVariant();
-      g.profile[g.id()].fwType( current_firmware_variant.id );
-    }
-    mw->downloadLatestFW(current_firmware_variant.firmware, current_firmware_variant.id);
-  }
-  firmwareChanged();
+  mw->downloadLatestFW(current_firmware_variant.firmware, g.profile[g.id()].fwType());
+  initSettings();
 }
 
 void fwPreferencesDialog::on_voice_dnld_clicked()
 {
   QString url="http://fw.opentx.it/voices/";
-  FirmwareVariant variant = getFirmwareVariant();
-  url.append(QString("%1/%2/").arg(variant.firmware->id).arg(ui->voiceCombo->currentText()));
+  QString fwType = g.profile[g.id()].fwType();
+  QStringList list = fwType.split("-");
+  QString firmware = QString("%1-%2").arg(list[0]).arg(list[1]);
+  url.append(QString("%1/%2/").arg(firmware).arg(ui->voiceCombo->currentText()));
   QDesktopServices::openUrl(url);
 }
 

companion/src/fwpreferencesdialog.h

@@ -21,25 +21,9 @@ public:
 
 private:
     Ui::fwPreferencesDialog *ui;
-    QList<QCheckBox *> optionsCheckBoxes;
-    bool updateLock;
-
-    void showVoice(bool);
-    void showVoice();
-    void hideVoice();
-    void populateLocale();
-    void populateFirmwareOptions(const FirmwareInfo *);
-    FirmwareVariant getFirmwareVariant();
     void initSettings();
-    QCheckBox * voice;
 
 private slots:
-    void shrink();
-    void writeValues();
-    void firmwareLangChanged();
-    void baseFirmwareChanged();
-    void firmwareOptionChanged(bool state);
-    void firmwareChanged();
     void on_fw_dnld_clicked();
     void on_voice_dnld_clicked();
     void on_checkFWUpdates_clicked();

companion/src/fwpreferencesdialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>620</width>
-    <height>437</height>
+    <width>416</width>
+    <height>153</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -32,488 +32,13 @@
    <property name="margin">
     <number>6</number>
    </property>
-   <item row="38" column="5">
+   <item row="24" column="5">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_14">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_32">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_16">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0" colspan="2">
-    <widget class="QLabel" name="langLabel">
-     <property name="text">
-      <string>Menu Language</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_37">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_29">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_1">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_12">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2" colspan="3">
-    <widget class="QComboBox" name="downloadVerCB">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="2">
-    <widget class="QComboBox" name="langCombo">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>50</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="2" colspan="3">
-    <widget class="QLineEdit" name="CPU_ID_LE"/>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QLabel" name="label_6">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="font">
-      <font>
-       <family>Sans Serif</family>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Firmware Type</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_4">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_28">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_42">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_5">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_17">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_35">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_36">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_13">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_26">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_41">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_18">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_11">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_21">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_20">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_33">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_24">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_23">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_22">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_6">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_38">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_34">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_31">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_30">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_27">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
+      <set>QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -530,7 +55,7 @@
      </property>
     </widget>
    </item>
-   <item row="21" column="0">
+   <item row="7" column="0">
     <widget class="QLabel" name="voiceLabel">
      <property name="font">
       <font>
@@ -540,11 +65,11 @@
       </font>
      </property>
      <property name="text">
-      <string>Voice Language</string>
+      <string>Voice</string>
      </property>
     </widget>
    </item>
-   <item row="21" column="2">
+   <item row="7" column="2">
     <widget class="QComboBox" name="voiceCombo">
      <property name="maximumSize">
       <size>
@@ -556,155 +81,119 @@
       <string>Set language of voice.
 May be different from firmware language</string>
      </property>
+     <item>
+      <property name="text">
+       <string>en</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>cz</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>de</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>es</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>fr</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>it</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>pl</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>pt</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>se</string>
+      </property>
+     </item>
     </widget>
    </item>
-   <item row="21" column="5">
+   <item row="7" column="5">
     <widget class="QPushButton" name="voice_dnld">
      <property name="text">
       <string>Download Voice</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_9">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="3">
-    <widget class="QCheckBox" name="optionCheckBox_10">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="5">
+   <item row="5" column="5">
     <widget class="QPushButton" name="fw_dnld">
      <property name="text">
       <string>Download FW</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="0" colspan="2">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Options</string>
+   <item row="7" column="3">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="0" colspan="6">
+    <widget class="Line" name="voiceLine">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="12" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_19">
+   <item row="23" column="0" colspan="6">
+    <widget class="Line" name="line_6">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_6">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="font">
+      <font>
+       <family>Sans Serif</family>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
      <property name="text">
-      <string notr="true">CheckBox</string>
+      <string>Firmware</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
-   <item row="9" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_8">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="2">
-    <widget class="QCheckBox" name="optionCheckBox_25">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_7">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_15">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_3">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="2">
-    <widget class="QLabel" name="CPU_ID_LABEL">
-     <property name="text">
-      <string>Processor ID</string>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="4">
-    <widget class="QCheckBox" name="optionCheckBox_39">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string notr="true">CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="2" colspan="4">
-    <widget class="QLabel" name="FwInfo">
+   <item row="0" column="2" colspan="4">
+    <widget class="QLabel" name="fwTypeLbl">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -712,34 +201,21 @@ May be different from firmware language</string>
       </sizepolicy>
      </property>
      <property name="text">
-      <string notr="true">FwInfo</string>
+      <string notr="true">FwType</string>
      </property>
     </widget>
    </item>
-   <item row="17" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_40">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="3" column="2" colspan="2">
+    <widget class="QLabel" name="lastRevisionLbl">
      <property name="text">
-      <string notr="true">CheckBox</string>
+      <string>-</string>
      </property>
     </widget>
    </item>
-   <item row="20" column="1" colspan="5">
-    <widget class="Line" name="voiceLine">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="37" column="1" colspan="5">
-    <widget class="Line" name="line_6">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Latest Download</string>
      </property>
     </widget>
    </item>
@@ -747,51 +223,6 @@ May be different from firmware language</string>
  </widget>
  <tabstops>
   <tabstop>buttonBox</tabstop>
-  <tabstop>downloadVerCB</tabstop>
-  <tabstop>CPU_ID_LE</tabstop>
-  <tabstop>langCombo</tabstop>
-  <tabstop>optionCheckBox_2</tabstop>
-  <tabstop>optionCheckBox_1</tabstop>
-  <tabstop>optionCheckBox_3</tabstop>
-  <tabstop>optionCheckBox_4</tabstop>
-  <tabstop>optionCheckBox_5</tabstop>
-  <tabstop>optionCheckBox_6</tabstop>
-  <tabstop>optionCheckBox_7</tabstop>
-  <tabstop>optionCheckBox_8</tabstop>
-  <tabstop>optionCheckBox_9</tabstop>
-  <tabstop>optionCheckBox_10</tabstop>
-  <tabstop>optionCheckBox_11</tabstop>
-  <tabstop>optionCheckBox_12</tabstop>
-  <tabstop>optionCheckBox_13</tabstop>
-  <tabstop>optionCheckBox_14</tabstop>
-  <tabstop>optionCheckBox_15</tabstop>
-  <tabstop>optionCheckBox_16</tabstop>
-  <tabstop>optionCheckBox_17</tabstop>
-  <tabstop>optionCheckBox_18</tabstop>
-  <tabstop>optionCheckBox_19</tabstop>
-  <tabstop>optionCheckBox_20</tabstop>
-  <tabstop>optionCheckBox_21</tabstop>
-  <tabstop>optionCheckBox_22</tabstop>
-  <tabstop>optionCheckBox_23</tabstop>
-  <tabstop>optionCheckBox_24</tabstop>
-  <tabstop>optionCheckBox_25</tabstop>
-  <tabstop>optionCheckBox_26</tabstop>
-  <tabstop>optionCheckBox_27</tabstop>
-  <tabstop>optionCheckBox_28</tabstop>
-  <tabstop>optionCheckBox_29</tabstop>
-  <tabstop>optionCheckBox_30</tabstop>
-  <tabstop>optionCheckBox_31</tabstop>
-  <tabstop>optionCheckBox_32</tabstop>
-  <tabstop>optionCheckBox_33</tabstop>
-  <tabstop>optionCheckBox_34</tabstop>
-  <tabstop>optionCheckBox_35</tabstop>
-  <tabstop>optionCheckBox_36</tabstop>
-  <tabstop>optionCheckBox_37</tabstop>
-  <tabstop>optionCheckBox_38</tabstop>
-  <tabstop>optionCheckBox_39</tabstop>
-  <tabstop>optionCheckBox_40</tabstop>
-  <tabstop>optionCheckBox_41</tabstop>
-  <tabstop>optionCheckBox_42</tabstop>
  </tabstops>
  <resources>
   <include location="companion.qrc"/>
@@ -801,31 +232,15 @@ May be different from firmware language</string>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>fwPreferencesDialog</receiver>
-   <slot>accept()</slot>
+   <slot>close()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>370</x>
-     <y>49</y>
+     <x>345</x>
+     <y>133</y>
     </hint>
     <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>fwPreferencesDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>390</x>
-     <y>55</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
+     <x>207</x>
+     <y>76</y>
     </hint>
    </hints>
   </connection>