From 1f7be79a923c2efff205063711899df0684ed0fa Mon Sep 17 00:00:00 2001
From: Kjell Kernen <kjell.kernen@gmail.com>
Date: Wed, 5 Feb 2014 17:48:01 +0100
Subject: [PATCH] Revert "Two new dialogs defined."

This reverts commit d9f97016e2c65306a8f5baad267e43edc38871eb.
---
 companion/src/CMakeLists.txt            |    6 -
 companion/src/apppreferencesdialog.cpp  |   85 --
 companion/src/apppreferencesdialog.h    |   30 -
 companion/src/apppreferencesdialog.ui   |  250 ------
 companion/src/fwpreferencesdialog.cpp   |  518 -----------
 companion/src/fwpreferencesdialog.h     |   50 --
 companion/src/fwpreferencesdialog.ui    | 1092 -----------------------
 companion/src/mainwindow.cpp            |   39 -
 companion/src/mainwindow.h              |    5 -
 companion/src/preferences_simulation.ui |  481 ----------
 10 files changed, 2556 deletions(-)
 delete mode 100644 companion/src/apppreferencesdialog.cpp
 delete mode 100644 companion/src/apppreferencesdialog.h
 delete mode 100644 companion/src/apppreferencesdialog.ui
 delete mode 100644 companion/src/fwpreferencesdialog.cpp
 delete mode 100644 companion/src/fwpreferencesdialog.h
 delete mode 100644 companion/src/fwpreferencesdialog.ui
 delete mode 100644 companion/src/preferences_simulation.ui

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 3a8dd26b7..0f7ca9cd5 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -156,8 +156,6 @@ SET( companion_SRCS
      mountlist.cpp 
      avroutputdialog.cpp
      preferencesdialog.cpp
-     apppreferencesdialog.cpp
-     fwpreferencesdialog.cpp
      burnconfigdialog.cpp
      comparedialog.cpp
      contributorsdialog.cpp
@@ -179,8 +177,6 @@ SET( companion_SRCS
 SET( companion_MOC_HDRS
      avroutputdialog.h
      preferencesdialog.h
-     apppreferencesdialog.h
-     fwpreferencesdialog.h
      burnconfigdialog.h
      comparedialog.h
      printdialog.h
@@ -215,8 +211,6 @@ SET( companion_UIS
      fusesdialog.ui
      logsdialog.ui
      preferencesdialog.ui
-     apppreferencesdialog.ui
-     fwpreferencesdialog.ui
      simulatordialog.ui
      xsimulatordialog.ui
      burnconfigdialog.ui
diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp
deleted file mode 100644
index fcb6157bb..000000000
--- a/companion/src/apppreferencesdialog.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "apppreferencesdialog.h"
-#include "ui_apppreferencesdialog.h"
-#include "mainwindow.h"
-#include "helpers.h"
-#include <QDesktopServices>
-#include <QtGui>
-
-appPreferencesDialog::appPreferencesDialog(QWidget *parent) :
-  QDialog(parent),
-  ui(new Ui::appPreferencesDialog)
-{
-  ui->setupUi(this);
-  setWindowIcon(CompanionIcon("preferences.png"));
-  initSettings();
-  connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
-//  resize(0,0);
-}
-
-appPreferencesDialog::~appPreferencesDialog()
-{
-  delete ui;
-}
-
-void appPreferencesDialog::writeValues()
-{
-  QSettings settings;
-  settings.setValue("startup_check_companion", ui->startupCheck_companion9x->isChecked());
-  settings.setValue("startup_check_fw", ui->startupCheck_fw->isChecked());
-  settings.setValue("wizardEnable", ui->wizardEnable_ChkB->isChecked());
-  settings.setValue("show_splash", ui->showSplash->isChecked());
-  settings.setValue("history_size", ui->historySize->value());
-  settings.setValue("gePath", ui->ge_lineedit->text());
-  settings.setValue("backupEnable", ui->backupEnable->isChecked());
-  MainWindow * mw = (MainWindow *)this->parent();
-  mw->unloadProfile();
-}
-
-void appPreferencesDialog::initSettings()
-{
-  QSettings settings;
-  ui->startupCheck_companion9x->setChecked(settings.value("startup_check_companion", true).toBool());
-  ui->startupCheck_fw->setChecked(settings.value("startup_check_fw", true).toBool());
-  ui->wizardEnable_ChkB->setChecked(settings.value("wizardEnable", true).toBool());
-  ui->showSplash->setChecked(settings.value("show_splash", true).toBool());
-  ui->historySize->setValue(settings.value("history_size", 10).toInt());
-
-  QString Path=settings.value("gePath", "").toString();
-  if (QFile(Path).exists()) {
-    ui->ge_lineedit->setText(Path);
-  }  
-  Path=settings.value("backupPath", "").toString();
-  if (!Path.isEmpty()) {
-    if (QDir(Path).exists()) {
-      ui->backupPath->setText(Path);
-      ui->backupEnable->setEnabled(true);
-      ui->backupEnable->setChecked(settings.value("backupEnable", true).toBool());
-    } else {
-      ui->backupEnable->setDisabled(true);
-    }
-  } else {
-      ui->backupEnable->setDisabled(true);
-  }
-}
-
-void appPreferencesDialog::on_backupPathButton_clicked()
-{
-  QSettings settings;
-  QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your Models and Settings backup folder"), settings.value("backupPath").toString());
-  if (!fileName.isEmpty()) {
-    settings.setValue("backupPath", fileName);
-    ui->backupPath->setText(fileName);
-  }
-  ui->backupEnable->setEnabled(true);
-}
-
-void appPreferencesDialog::on_ge_pathButton_clicked()
-{
-  QSettings settings;
-  QString fileName = QFileDialog::getOpenFileName(this, tr("Select Google Earth executable"),ui->ge_lineedit->text());
-  if (!fileName.isEmpty()) {
-    ui->ge_lineedit->setText(fileName);
-  }
-}
- 
-
diff --git a/companion/src/apppreferencesdialog.h b/companion/src/apppreferencesdialog.h
deleted file mode 100644
index 01b28f08a..000000000
--- a/companion/src/apppreferencesdialog.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef APPPREFERENCESDIALOG_H
-#define APPPREFERENCESDIALOG_H
-
-#include <QDialog>
-#include <QCheckBox>
-#include "eeprominterface.h"
-
-namespace Ui {
-    class appPreferencesDialog;
-}
-
-class appPreferencesDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit appPreferencesDialog(QWidget *parent = 0);
-    ~appPreferencesDialog();
-
-private:
-    Ui::appPreferencesDialog *ui;
-    void initSettings();
-
-private slots:
-    void writeValues();
-    void on_backupPathButton_clicked();
-    void on_ge_pathButton_clicked();
-};
-
-#endif // APPPREFERENCESDIALOG_H
diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui
deleted file mode 100644
index c896b3c2e..000000000
--- a/companion/src/apppreferencesdialog.ui
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>appPreferencesDialog</class>
- <widget class="QDialog" name="appPreferencesDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>685</width>
-    <height>313</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>685</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Application Preferences</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_5">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Recent Files</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QSpinBox" name="historySize">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-       <horstretch>40</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximum">
-      <number>15</number>
-     </property>
-     <property name="value">
-      <number>10</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1" colspan="3">
-    <widget class="QCheckBox" name="showSplash">
-     <property name="text">
-      <string>Show splash screen when Companion starts</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1" colspan="3">
-    <widget class="QCheckBox" name="startupCheck_companion9x">
-     <property name="text">
-      <string>Automatic check for Companion updates</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="1" colspan="3">
-    <widget class="QCheckBox" name="backupEnable">
-     <property name="text">
-      <string>Enable automatic backup before writing firmware</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="0">
-    <widget class="QLabel" name="label_17">
-     <property name="text">
-      <string>Automatic Backup Folder</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="1" colspan="4">
-    <widget class="Line" name="line_3">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="3">
-    <widget class="QLineEdit" name="ge_lineedit">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="4">
-    <widget class="QPushButton" name="ge_pathButton">
-     <property name="text">
-      <string>Find Executable</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1" colspan="4">
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="3" colspan="2">
-    <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="8" column="1" colspan="4">
-    <widget class="Line" name="line_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1" colspan="3">
-    <widget class="QCheckBox" name="startupCheck_fw">
-     <property name="text">
-      <string>Automatic check for OpenTX firmware updates</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1" colspan="3">
-    <widget class="QCheckBox" name="wizardEnable_ChkB">
-     <property name="text">
-      <string>Offer to use wizard for new models</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="ge_label">
-     <property name="text">
-      <string>Google Earth Executable</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" colspan="4">
-    <widget class="Line" name="line_4">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2" colspan="2">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>(Number of recent Models&amp;Settings files to remember)</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="4">
-    <widget class="QPushButton" name="backupPathButton">
-     <property name="text">
-      <string>Open Folder</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="1" colspan="3">
-    <widget class="QLineEdit" name="backupPath">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-  </layout>
-  <zorder>historySize</zorder>
-  <zorder>startupCheck_companion9x</zorder>
-  <zorder>backupEnable</zorder>
-  <zorder>label_17</zorder>
-  <zorder>ge_lineedit</zorder>
-  <zorder>line</zorder>
-  <zorder>buttonBox</zorder>
-  <zorder>backupPath</zorder>
-  <zorder>line_2</zorder>
-  <zorder>startupCheck_fw</zorder>
-  <zorder>wizardEnable_ChkB</zorder>
-  <zorder>ge_label</zorder>
-  <zorder>label</zorder>
-  <zorder>label_5</zorder>
-  <zorder>showSplash</zorder>
-  <zorder>line_3</zorder>
-  <zorder>ge_pathButton</zorder>
-  <zorder>line_4</zorder>
-  <zorder>backupPathButton</zorder>
- </widget>
- <resources>
-  <include location="companion.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>appPreferencesDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>376</x>
-     <y>596</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>appPreferencesDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>396</x>
-     <y>596</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/companion/src/fwpreferencesdialog.cpp b/companion/src/fwpreferencesdialog.cpp
deleted file mode 100644
index 011da2ff7..000000000
--- a/companion/src/fwpreferencesdialog.cpp
+++ /dev/null
@@ -1,518 +0,0 @@
-#include "fwpreferencesdialog.h"
-#include "ui_fwpreferencesdialog.h"
-#include "mainwindow.h"
-#include "eeprominterface.h"
-#include "helpers.h"
-#include <QDesktopServices>
-#include <QtGui>
-
-fwPreferencesDialog::fwPreferencesDialog(QWidget *parent) :
-  QDialog(parent),
-  ui(new Ui::fwPreferencesDialog),
-  updateLock(false)
-{
-  ui->setupUi(this);
-  setWindowIcon(CompanionIcon("preferences.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()));
-
-  resize(0,0);
-}
-
-
-fwPreferencesDialog::~fwPreferencesDialog()
-{
-  delete ui;
-}
-
-void fwPreferencesDialog::baseFirmwareChanged()
-{
-  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
-  voice=NULL;
-  foreach(FirmwareInfo * firmware, firmwares) {
-    if (firmware->id == selected_firmware) {
-      if (firmware->voice) {
-        ui->voiceLabel->show();
-        ui->voiceCombo->show();
-        ui->voice_dnld->show();
-        ui->sdPathButton->show();
-        ui->sdPath->show();
-        ui->sdPathLabel->show();
-        ui->voiceLabel->setEnabled(true);
-        ui->voiceCombo->setEnabled(true);
-        ui->voice_dnld->setEnabled(true);
-        ui->sdPathButton->setEnabled(true);
-        ui->sdPath->setEnabled(true);
-      } else {
-        ui->voiceLabel->hide();
-        ui->voiceCombo->hide();
-        ui->voice_dnld->hide();        
-        ui->sdPathButton->hide();
-        ui->sdPath->hide();
-        ui->sdPathLabel->hide();
-      }
-      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::firmwareLangChanged()
-{
-  firmwareChanged();
-}
-
-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) {
-                if (voice->isChecked()) {
-                  ui->voiceLabel->setEnabled(true);
-                  ui->voiceCombo->setEnabled(true);
-                  ui->voice_dnld->setEnabled(true);
-                  ui->sdPathButton->setEnabled(true);
-                  ui->sdPath->setEnabled(true);
-                } else {
-                  ui->voiceLabel->setDisabled(true);
-                  ui->voiceCombo->setDisabled(true);
-                  ui->voice_dnld->setDisabled(true);
-                  ui->sdPathButton->setDisabled(true);
-                  ui->sdPath->setDisabled(true);
-                }
-              }
-              
-              return firmwareChanged();
-            }
-          }
-        }
-      }
-    }
-  } else if (cb && !state) {
-    if (cb->text()=="voice") {
-      ui->voiceLabel->setDisabled(true);
-      ui->voiceCombo->setDisabled(true);
-      ui->voice_dnld->setDisabled(true);
-      ui->sdPathButton->setEnabled(true);
-      ui->sdPath->setEnabled(true);
-    }
-  }
-  if (voice ) {
-    if (voice->isChecked()) {
-      ui->voiceLabel->setEnabled(true);
-      ui->voiceCombo->setEnabled(true);
-      ui->voice_dnld->setEnabled(true);
-    } else {
-      ui->voiceLabel->setDisabled(true);
-      ui->voiceCombo->setDisabled(true);
-      ui->voice_dnld->setDisabled(true);
-      ui->sdPathButton->setDisabled(true);
-      ui->sdPath->setDisabled(true);
-    }
-  }  else if (firmware) {
-    if (firmware->voice) {
-      ui->voiceLabel->setEnabled(true);
-      ui->voiceCombo->setEnabled(true);
-      ui->voice_dnld->setEnabled(true);    
-      ui->sdPathButton->setEnabled(true);
-      ui->sdPath->setEnabled(true);
-    }
-  }
-  return 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();
-  }
-  QSettings settings;
-  settings.beginGroup("FwRevisions");
-  int fwrev = settings.value(variant.id, -1).toInt();
-  settings.endGroup();
-  if (fwrev != -1) {
-    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()
-{
-  QSettings settings;
-  settings.setValue("default_channel_order", ui->channelorderCB->currentIndex());
-  settings.setValue("default_mode", ui->stickmodeCB->currentIndex());
-  settings.setValue("cpu_id", ui->CPU_ID_LE->text());
-  settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked());
-  settings.setValue("burnFirmware", ui->burnFirmware->isChecked());
-  current_firmware_variant = getFirmwareVariant();
-  settings.setValue("firmware", current_firmware_variant.id);
-  settings.setValue("profileId", ui->ProfSlot_SB->value());
-  settings.setValue("sdPath", ui->sdPath->text());
-  MainWindow * mw = (MainWindow *)this->parent();
-  mw->unloadProfile();
-}
-
-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);
-  }
-
-  if (ui->langCombo->count()) {
-    ui->langCombo->show();
-    ui->langLabel->show();
-  }
-  else {
-    ui->langCombo->hide();
-    ui->langLabel->hide();
-  }
-
-  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;
-            ui->voiceLabel->show();
-            ui->voiceCombo->show();
-            ui->voice_dnld->show();
-            ui->sdPathButton->show();
-            ui->sdPath->show();
-            ui->sdPathLabel->show();
-            if (current_firmware_variant.id.contains(opt.name) ||firmware->voice) {
-              ui->voiceLabel->setEnabled(true);
-              ui->voiceCombo->setEnabled(true);
-              ui->voice_dnld->setEnabled(true);
-              ui->sdPathButton->setEnabled(true);
-              ui->sdPath->setEnabled(true);
-            } else {
-              ui->voiceLabel->setDisabled(true);
-              ui->voiceCombo->setDisabled(true);
-              ui->voice_dnld->setDisabled(true);
-              ui->sdPathButton->setDisabled(true);
-              ui->sdPath->setDisabled(true);
-            }
-          }
-        }
-      }
-    }
-  }
-  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()
-{
-  QSettings settings;
-  ui->channelorderCB->setCurrentIndex(settings.value("default_channel_order", 0).toInt());
-  ui->stickmodeCB->setCurrentIndex(settings.value("default_mode", 1).toInt());
-  ui->renameFirmware->setChecked(settings.value("rename_firmware_files", false).toBool());
-  ui->burnFirmware->setChecked(settings.value("burnFirmware", true).toBool());
-  ui->CPU_ID_LE->setText(settings.value("cpu_id", "").toString());
-  QString Path=settings.value("sdPath", "").toString();
-  if (QDir(Path).exists()) {
-    ui->sdPath->setText(Path);
-  }
-
-  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();
-  ui->ProfSlot_SB->setValue(settings.value("profileId", 1).toInt());
-  on_ProfSlot_SB_valueChanged();
-  QString ImageStr = settings.value("SplashImage", "").toString();
-
-  firmwareChanged();
-}
-
-void fwPreferencesDialog::on_fw_dnld_clicked()
-{
-  MainWindow * mw = (MainWindow *)this->parent();
-  FirmwareVariant variant = getFirmwareVariant();
-  writeValues();
-  if (!variant.firmware->getUrl(variant.id).isNull()) {
-    if (ui->burnFirmware->isChecked()) {
-      QSettings settings;
-      current_firmware_variant = getFirmwareVariant();
-      settings.setValue("firmware", current_firmware_variant.id);
-    }
-    mw->downloadLatestFW(current_firmware_variant.firmware, current_firmware_variant.id);
-  }
-  firmwareChanged();
-}
-
-void fwPreferencesDialog::on_voice_dnld_clicked()
-{
-  ui->ProfSave_PB->setEnabled(true);
-  QString url="http://fw.opentx.it/voices/";
-  FirmwareVariant variant = getFirmwareVariant();
-  url.append(QString("%1/%2/").arg(variant.firmware->id).arg(ui->voiceCombo->currentText()));
-  QDesktopServices::openUrl(url);
-}
-
-void fwPreferencesDialog::on_sdPathButton_clicked()
-{
-  QSettings settings;
-  QString fileName = QFileDialog::getExistingDirectory(this,tr("Select the folder replicating your SD structure"), settings.value("sdPath").toString());
-  if (!fileName.isEmpty()) {
-    ui->sdPath->setText(fileName);
-  }
-  ui->ProfSave_PB->setEnabled(true);
-}
-
-void fwPreferencesDialog::on_ProfSlot_SB_valueChanged()
-{
-  QSettings settings;
-  settings.beginGroup("Profiles");
-  QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value());
-  settings.beginGroup(profile);
-  QString name=settings.value("Name","").toString();
-  ui->ProfName_LE->setText(name);
-/*  if (!(name.isEmpty())) {
-    QString firmwarename=settings.value("firmware", default_firmware_id).toString();
-    FirmwareInfo * fw = getFirmware(firmwarename);
-    int i=0;
-    foreach(FirmwareInfo * firmware, firmwares) {
-      if (fw == firmware) {
-        qDebug() << fw->id;
-        qDebug() << firmware->id;
-        qDebug() << i;
-        ui->downloadVerCB->setCurrentIndex(i);
-        break;
-      }
-      i++;
-    }
-    baseFirmwareChanged();
-    populateFirmwareOptions(fw);
-  }*/
-  settings.endGroup();
-  settings.endGroup();
-}
-
-void fwPreferencesDialog::on_ProfSave_PB_clicked()
-{
-  QSettings settings;
-  settings.beginGroup("Profiles");
-  QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value());
-  QString name=ui->ProfName_LE->text();
-  if (name.isEmpty()) {
-    int ret = QMessageBox::question(this, "Companion", 
-                tr("Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ?").arg(ui->ProfSlot_SB->value()) ,
-                QMessageBox::Yes | QMessageBox::No);
-    if (ret==QMessageBox::Yes) {
-      settings.remove(profile);
-    } else {
-      settings.beginGroup(profile);
-      ui->ProfName_LE->setText(settings.value("Name","").toString());
-    }
-  } else {
-    settings.beginGroup(profile);
-    settings.setValue("Name",name);
-    settings.setValue("default_channel_order", ui->channelorderCB->currentIndex());
-    settings.setValue("default_mode", ui->stickmodeCB->currentIndex());
-    settings.setValue("burnFirmware", ui->burnFirmware->isChecked());
-    settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked());
-    settings.setValue("sdPath", ui->sdPath->text());
-    current_firmware_variant = getFirmwareVariant();
-    settings.setValue("firmware", current_firmware_variant.id);
-    settings.endGroup();
-    settings.endGroup();
-  }
-}
-
-void fwPreferencesDialog::on_export_PB_clicked()
-{
-    QSettings settings;
-    QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value());
-    QString name=ui->ProfName_LE->text();
-    if (!name.isEmpty()) {
-      QString fileName = QFileDialog::getSaveFileName(this, tr("Export profile As"), settings.value("lastDir").toString() + "/" +name+".ini" , "*.ini");
-      if (fileName.isEmpty())
-        return;
-      QSettings exportfile(fileName, QSettings::IniFormat);
-      settings.beginGroup("Profiles");
-      settings.beginGroup(profile);
-      QStringList keys = settings.childKeys();
-      foreach (QString key, keys) {
-        exportfile.setValue(key,settings.value(key));
-      }
-      settings.endGroup();      
-    }
-    settings.endGroup();
-}
-
-void fwPreferencesDialog::on_import_PB_clicked()
-{
-    QSettings settings;
-    QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value());
-    QString name=ui->ProfName_LE->text();
-    if (!name.isEmpty()) {
-      int ret = QMessageBox::question(this, "Companion", 
-                  tr("Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ?").arg(ui->ProfSlot_SB->value()) ,
-                  QMessageBox::Yes | QMessageBox::No);
-      if (ret==QMessageBox::No) {
-        return;
-      }
-    }
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Open Profile to import"), settings.value("lastDir").toString(), "*.ini");
-    if (fileName.isEmpty())
-      return;
-    QSettings importfile(fileName, QSettings::IniFormat);
-    settings.beginGroup("Profiles");
-    settings.beginGroup(profile);
-    QStringList keys = importfile.childKeys();
-    foreach (QString key, keys) {
-      settings.setValue(key,importfile.value(key));
-    }
-    settings.endGroup();
-    settings.endGroup();
-    on_ProfSlot_SB_valueChanged();
-}
-
-void fwPreferencesDialog::on_checkFWUpdates_clicked()
-{
-    FirmwareVariant variant = getFirmwareVariant();
-    if (ui->burnFirmware->isChecked()) {
-      QSettings settings;
-      current_firmware_variant = variant;
-      settings.setValue("firmware", variant.id);
-    }
-    MainWindow * mw = (MainWindow *)this->parent();
-    mw->checkForUpdates(true, variant.id);
-    firmwareChanged();
-}
-
-void fwPreferencesDialog::shrink()
-{
-    resize(0,0);
-}
-
diff --git a/companion/src/fwpreferencesdialog.h b/companion/src/fwpreferencesdialog.h
deleted file mode 100644
index 09a8b6113..000000000
--- a/companion/src/fwpreferencesdialog.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef FWPREFERENCESDIALOG_H
-#define FWPREFERENCESDIALOG_H
-
-#include <QDialog>
-#include <QCheckBox>
-#include "eeprominterface.h"
-
-namespace Ui {
-    class fwPreferencesDialog;
-}
-
-class Joystick;
-
-class fwPreferencesDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit fwPreferencesDialog(QWidget *parent = 0);
-    ~fwPreferencesDialog();
-
-private:
-    Ui::fwPreferencesDialog *ui;
-    QList<QCheckBox *> optionsCheckBoxes;
-    bool updateLock;
-
-    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_sdPathButton_clicked();
-    void on_checkFWUpdates_clicked();
-    void on_ProfSlot_SB_valueChanged();
-    void on_ProfSave_PB_clicked();
-    void on_export_PB_clicked();
-    void on_import_PB_clicked();
-};
-
-#endif // FWPREFERENCESDIALOG_H
diff --git a/companion/src/fwpreferencesdialog.ui b/companion/src/fwpreferencesdialog.ui
deleted file mode 100644
index dd21fe9ad..000000000
--- a/companion/src/fwpreferencesdialog.ui
+++ /dev/null
@@ -1,1092 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>fwPreferencesDialog</class>
- <widget class="QDialog" name="fwPreferencesDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>634</width>
-    <height>794</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Firmware Preferences</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="4" column="3" colspan="4">
-    <widget class="QLabel" name="FwInfo">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>FwInfo</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_19">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="4">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="5">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="5">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="37" column="0" colspan="3">
-    <widget class="QLabel" name="label_16">
-     <property name="text">
-      <string>Hardware Profile Name</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_3">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="35" column="3" colspan="2">
-    <widget class="QComboBox" name="voiceCombo">
-     <property name="toolTip">
-      <string>Set language of voice.
-May be different from firmware language</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0" colspan="3">
-    <widget class="QLabel" name="sdPathLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>SD Structure path</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="3">
-    <widget class="QLabel" name="CPU_ID_LABEL">
-     <property name="text">
-      <string>Processor ID</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0" colspan="3">
-    <widget class="QLabel" name="langLabel">
-     <property name="text">
-      <string>Language</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="29" column="0" colspan="3">
-    <widget class="QLabel" name="label_14">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Default Stick Mode</string>
-     </property>
-    </widget>
-   </item>
-   <item row="35" column="0" colspan="3">
-    <widget class="QLabel" name="voiceLabel">
-     <property name="text">
-      <string>Voice</string>
-     </property>
-    </widget>
-   </item>
-   <item row="30" column="0" colspan="3">
-    <widget class="QLabel" name="label_13">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Channel Order</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="3">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="29" column="3" colspan="2">
-    <widget class="QComboBox" name="stickmodeCB">
-     <property name="whatsThis">
-      <string>Mode selection:
-
-Mode 1:
-  Left stick:  Elevator, Rudder
-  Right stick:  Throttle, Aileron
-
-Mode 2:
-  Left stick:  Throttle, Rudder
-  Right stick:  Elevator, Aileron
-
-Mode 3:
-  Left stick:  Elevator, Aileron
-  Right stick:  Throttle, Rudder
-
-Mode 4:
-  Left stick:  Throttle, Aileron
-  Right stick:  Elevator, Rudder
-
-</string>
-     </property>
-     <property name="currentIndex">
-      <number>1</number>
-     </property>
-     <item>
-      <property name="text">
-       <string>Mode 1 (RUD ELE THR AIL)</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Mode 2 (RUD THR ELE AIL)</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Mode 3 (AIL ELE THR RUD)</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Mode 4 (AIL THR ELE RUD)</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="38" column="0" colspan="3">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Storage Position</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="3">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="0" colspan="3">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Options</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="3">
-    <widget class="QComboBox" name="langCombo">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="4">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="3">
-    <widget class="QLabel" name="label_6">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </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="30" column="3" colspan="2">
-    <widget class="QComboBox" name="channelorderCB">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="whatsThis">
-      <string>Channel order
-
-This is used by the templated to determine which channel goes to what number output.</string>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <item>
-      <property name="text">
-       <string notr="true">R E T A</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">R E A T</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">R T E A</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">R T A E</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">R A E T</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">R A T E</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">E R T A</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">E R A T</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">E T R A</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">E T A R</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">E A R T</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">E A T R</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">T R E A</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">T R A E</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">T E R A</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">T E A R</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">T A R E</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">T A E R</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">A R E T</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">A R T E</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">A E R T</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">A E T R</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">A T R E</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string notr="true">A T E R</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="3" column="3" colspan="3">
-    <widget class="QComboBox" name="downloadVerCB"/>
-   </item>
-   <item row="9" column="6">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="6">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="3" colspan="3">
-    <widget class="QLineEdit" name="CPU_ID_LE"/>
-   </item>
-   <item row="37" column="3" colspan="2">
-    <widget class="QLineEdit" name="ProfName_LE"/>
-   </item>
-   <item row="19" column="4">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="3">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="4">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="3">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="6">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="6">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="3">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="3">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="6">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="5">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="5">
-    <widget class="QCheckBox" name="optionCheckBox_40">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="6">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="3">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="4">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="19" column="3">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="6">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="3" colspan="3">
-    <widget class="QLineEdit" name="sdPath">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="4">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="5">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="3">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="6">
-    <widget class="QCheckBox" name="optionCheckBox_20">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="3">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="6">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="5">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="14" column="4">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="4">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="4">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="4">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="5">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="4">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="6">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="3">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="5">
-    <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>CheckBox</string>
-     </property>
-    </widget>
-   </item>
-   <item row="38" column="3">
-    <widget class="QSpinBox" name="ProfSlot_SB">
-     <property name="minimum">
-      <number>1</number>
-     </property>
-     <property name="maximum">
-      <number>10</number>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="6">
-    <widget class="QPushButton" name="sdPathButton">
-     <property name="text">
-      <string>Open Folder</string>
-     </property>
-    </widget>
-   </item>
-   <item row="32" column="3" colspan="3">
-    <widget class="QCheckBox" name="burnFirmware">
-     <property name="text">
-      <string>Offer to write FW to Tx after download</string>
-     </property>
-    </widget>
-   </item>
-   <item row="32" column="6">
-    <widget class="QPushButton" name="fw_dnld">
-     <property name="text">
-      <string>Download FW</string>
-     </property>
-    </widget>
-   </item>
-   <item row="37" column="6">
-    <widget class="QPushButton" name="import_PB">
-     <property name="text">
-      <string>Import</string>
-     </property>
-    </widget>
-   </item>
-   <item row="38" column="6">
-    <widget class="QPushButton" name="export_PB">
-     <property name="text">
-      <string>Export</string>
-     </property>
-    </widget>
-   </item>
-   <item row="39" column="6">
-    <widget class="QPushButton" name="ProfSave_PB">
-     <property name="text">
-      <string>Save Profile</string>
-     </property>
-    </widget>
-   </item>
-   <item row="42" column="6">
-    <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="31" column="3" colspan="3">
-    <widget class="QCheckBox" name="renameFirmware">
-     <property name="text">
-      <string>Append version number the FW file name</string>
-     </property>
-    </widget>
-   </item>
-   <item row="31" column="6">
-    <widget class="QPushButton" name="checkFWUpdates">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>Check for updates</string>
-     </property>
-    </widget>
-   </item>
-   <item row="35" column="6">
-    <widget class="QPushButton" name="voice_dnld">
-     <property name="text">
-      <string>Download Voice</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="3" colspan="4">
-    <widget class="Line" name="line_4">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="41" column="3" colspan="4">
-    <widget class="Line" name="line_6">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="34" column="3" colspan="4">
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="36" column="3" colspan="4">
-    <widget class="Line" name="line_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="20" column="3" colspan="4">
-    <widget class="Line" name="line_5">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="companion.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>fwPreferencesDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>370</x>
-     <y>49</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>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index 74f1b73c3..c9857bf05 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -49,8 +49,6 @@
 #include "comparedialog.h"
 #include "logsdialog.h"
 #include "preferencesdialog.h"
-#include "apppreferencesdialog.h"
-#include "fwpreferencesdialog.h"
 #include "flashinterface.h"
 #include "fusesdialog.h"
 #include "downloaddialog.h"
@@ -821,32 +819,6 @@ void MainWindow::preferences()
     updateMenus();
 }
 
-void MainWindow::appPreferences()
-{
-    appPreferencesDialog *pd = new appPreferencesDialog(this);
-    pd->exec();
-    updateMenus();
-}
-
-void MainWindow::fwPreferences()
-{
-    fwPreferencesDialog *pd = new fwPreferencesDialog(this);
-    pd->exec();
-    FirmwareInfo *firmware = GetCurrentFirmware();    
-    if (ActiveProfile) {
-      setWindowTitle(tr("Companion - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
-    }
-    else {
-      setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name));
-    }
-
-    foreach (QMdiSubWindow *window, mdiArea->subWindowList()) {
-      MdiChild *mdiChild = qobject_cast<MdiChild *>(window->widget());
-      mdiChild->eepromInterfaceChanged();
-    }
-    updateMenus();
-}
-
 void MainWindow::contributors()
 {
     contributorsDialog *cd = new contributorsDialog(this,0);
@@ -1699,14 +1671,6 @@ void MainWindow::createActions()
     preferencesAct->setStatusTip(tr("Edit general preferences"));
     connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences()));
 
-    appPreferencesAct = new QAction(tr("&Application Preferences..."), this);
-    appPreferencesAct->setStatusTip(tr("Edit application preferences"));
-    connect(appPreferencesAct, SIGNAL(triggered()), this, SLOT(appPreferences()));
-
-    fwPreferencesAct = new QAction(tr("&Firmware Preferences..."), this);
-    fwPreferencesAct->setStatusTip(tr("Edit firmware preferences"));
-    connect(fwPreferencesAct, SIGNAL(triggered()), this, SLOT(fwPreferences()));
-
     checkForUpdatesAct = new QAction(CompanionIcon("update.png"), tr("&Check for updates..."), this);
     checkForUpdatesAct->setStatusTip(tr("Check for new version of Companion"));
     connect(checkForUpdatesAct, SIGNAL(triggered()), this, SLOT(doUpdates()));
@@ -1963,8 +1927,6 @@ void MainWindow::createMenus()
       iconThemeSizeMenu->addAction(bigIconAct);
       iconThemeSizeMenu->addAction(hugeIconAct);
     settingsMenu->addSeparator();
-    settingsMenu->addAction(appPreferencesAct);
-    settingsMenu->addAction(fwPreferencesAct);
     settingsMenu->addAction(preferencesAct);
     settingsMenu->addAction(customizeSplashAct);
     settingsMenu->addAction(burnConfigAct);
@@ -2048,7 +2010,6 @@ void MainWindow::createToolBars()
     fileToolBar->addAction(saveAct);
     fileToolBar->addAction(logsAct);
     fileToolBar->addSeparator();
-    fileToolBar->addAction(fwPreferencesAct);
     fileToolBar->addAction(preferencesAct);
     profileButton = new QToolButton;
     profileButton->setPopupMode(QToolButton::InstantPopup);
diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h
index 60d6759fc..170ebd939 100644
--- a/companion/src/mainwindow.h
+++ b/companion/src/mainwindow.h
@@ -64,7 +64,6 @@ QT_END_NAMESPACE
 class MainWindow : public QMainWindow
 {
     friend class preferencesDialog;
-    friend class fwPreferencesDialog;
     friend class MdiChild; // TODO GetAvrdudeArgs could be external to this class
 
     Q_OBJECT
@@ -145,8 +144,6 @@ private slots:
     void print();
     void loadBackup();
     void preferences();
-    void appPreferences();
-    void fwPreferences();
     void updateMenus();
     MdiChild *createMdiChild();
     void setActiveSubWindow(QWidget *window);
@@ -223,8 +220,6 @@ private:
     QAction *saveAsAct;
     QAction *exitAct;
     QAction *preferencesAct;
-    QAction *appPreferencesAct;
-    QAction *fwPreferencesAct;
     QAction *checkForUpdatesAct;
     QAction *contributorsAct;
     QAction *changelogAct;
diff --git a/companion/src/preferences_simulation.ui b/companion/src/preferences_simulation.ui
deleted file mode 100644
index 31209088d..000000000
--- a/companion/src/preferences_simulation.ui
+++ /dev/null
@@ -1,481 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>preferencesDialog</class>
- <widget class="QDialog" name="preferencesDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>685</width>
-    <height>418</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>685</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Preferences</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_4" columnstretch="1">
-   <property name="sizeConstraint">
-    <enum>QLayout::SetMinimumSize</enum>
-   </property>
-   <property name="verticalSpacing">
-    <number>2</number>
-   </property>
-   <property name="margin">
-    <number>4</number>
-   </property>
-   <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <property name="spacing">
-      <number>8</number>
-     </property>
-     <item>
-      <layout class="QGridLayout" name="gridLayout_2">
-       <item row="3" column="1">
-        <widget class="QLineEdit" name="snapshotPath">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_3">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Simu BackLight</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_19">
-         <property name="text">
-          <string>Simulator capture folder</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_11">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Joystick</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>Remember simulator switches</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QCheckBox" name="simuSW">
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_5">
-         <item>
-          <widget class="QComboBox" name="joystickCB">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="joystickChkB">
-           <property name="text">
-            <string>Enable</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="4" column="1">
-        <widget class="QCheckBox" name="snapshotClipboardCKB">
-         <property name="text">
-          <string>Use clipboard only</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="2">
-        <widget class="QPushButton" name="joystickcalButton">
-         <property name="text">
-          <string>Calibrate</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QComboBox" name="backLightColor">
-           <item>
-            <property name="text">
-             <string>Blue</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Green</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Red</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Orange</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Yellow</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item>
-          <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>
-        </layout>
-       </item>
-       <item row="3" column="2">
-        <widget class="QPushButton" name="snapshotPathButton">
-         <property name="text">
-          <string>Open Folder</string>
-         </property>
-         <property name="flat">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="Line" name="line">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QGridLayout" name="gridLayout_7">
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_9">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Personal splash library</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="QLineEdit" name="libraryPath">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="readOnly">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="libraryPathButton">
-           <property name="text">
-            <string>Open Folder</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="2" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_7">
-         <item>
-          <widget class="QComboBox" name="splashincludeCB">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <item>
-            <property name="text">
-             <string>Include companion splashes</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Only user defined splashes</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_10">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Splash library behaviour</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="Line" name="line_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QGridLayout" name="gridLayout">
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_8">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Custom TX splash screen</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <widget class="QLineEdit" name="SplashFileName">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="readOnly">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="SplashSelect">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Open Image</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_6">
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_4">
-           <item>
-            <widget class="QToolButton" name="splashLibraryButton">
-             <property name="text">
-              <string>...</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QToolButton" name="clearImageButton">
-             <property name="text">
-              <string>...</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="InvertPixels">
-             <property name="enabled">
-              <bool>false</bool>
-             </property>
-             <property name="text">
-              <string>Invert Pixels</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <widget class="QLabel" name="imageLabel">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>128</width>
-             <height>64</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>128</width>
-             <height>64</height>
-            </size>
-           </property>
-           <property name="frameShape">
-            <enum>QFrame::Panel</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Raised</enum>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="scaledContents">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="Line" name="line_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="verticalSpacer">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <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>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="companion.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>preferencesDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>370</x>
-     <y>49</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>preferencesDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>390</x>
-     <y>55</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>