Settings menu created which will hold all configurations and settings.

Language, theme and icon size broken out of the preferences and put into the menu, where they belong.

companion/src/mainwindow.cpp

@@ -641,6 +641,42 @@ void MainWindow::closeEvent(QCloseEvent *event)
     }
 }
 
+void  MainWindow::setLanguage(QString langString)
+{    
+    QSettings settings;
+    settings.setValue("locale", langString );
+    
+    QMessageBox msgBox;
+    msgBox.setText(tr("The selected language will be used the next time you start Companion."));
+    msgBox.setIcon(QMessageBox::Information);
+    msgBox.addButton(tr("OK"), QMessageBox::AcceptRole);
+    msgBox.exec();
+}
+
+void  MainWindow::setTheme(int index)
+{    
+    QSettings settings;
+    settings.setValue("theme", index );
+    
+    QMessageBox msgBox;
+    msgBox.setText(tr("The new theme will be loaded the next time you start Companion."));
+    msgBox.setIcon(QMessageBox::Information);
+    msgBox.addButton(tr("OK"), QMessageBox::AcceptRole);
+    msgBox.exec();
+}
+
+void  MainWindow::setIconThemeSize(int index)
+{    
+    QSettings settings;
+    settings.setValue("icon_size", index );
+
+    QMessageBox msgBox;
+    msgBox.setText(tr("The icon size will be used the next time you start Companion."));
+    msgBox.setIcon(QMessageBox::Information);
+    msgBox.addButton(tr("OK"), QMessageBox::AcceptRole);
+    msgBox.exec();
+}
+
 void MainWindow::newFile()
 {
     MdiChild *child = createMdiChild();
@@ -648,6 +684,7 @@ void MainWindow::newFile()
     child->show();
 }
 
+
 void MainWindow::openFile()
 {
     QSettings settings;
@@ -1630,7 +1667,7 @@ void MainWindow::createActions()
     logsAct->setStatusTip(tr("Open log file"));
     connect(logsAct, SIGNAL(triggered()), this, SLOT(logFile()));
     
-    preferencesAct = new QAction(CompanionIcon("preferences.png"), tr("&Preferences..."), this);
+    preferencesAct = new QAction(CompanionIcon("preferences.png"), tr("&General Preferences..."), this);
     preferencesAct->setStatusTip(tr("Edit general preferences"));
     connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences()));
 
@@ -1655,7 +1692,7 @@ void MainWindow::createActions()
     compareAct->setEnabled(false);
     connect(compareAct, SIGNAL(triggered()), this, SLOT(compare()));
     
-    customizeSplashAct = new QAction(CompanionIcon("paintbrush.png"), tr("Customize your &TX..."), this);
+    customizeSplashAct = new QAction(CompanionIcon("paintbrush.png"), tr("Configure transmitter start screen..."), this);
     customizeSplashAct->setStatusTip(tr("Customize the splash screen of your TX"));
     connect(customizeSplashAct, SIGNAL(triggered()), this, SLOT(customizeSplash()));
     
@@ -1708,7 +1745,7 @@ void MainWindow::createActions()
     burnFromFlashAct->setStatusTip(tr("Read firmware from transmitter"));
     connect(burnFromFlashAct,SIGNAL(triggered()),this,SLOT(burnFromFlash()));
 
-    burnConfigAct = new QAction(CompanionIcon("configure.png"), tr("&Configure..."), this);
+    burnConfigAct = new QAction(CompanionIcon("configure.png"), tr("&Configure connection software..."), this);
     burnConfigAct->setStatusTip(tr("Configure software for reading from and writing to the transmitter"));
     connect(burnConfigAct,SIGNAL(triggered()),this,SLOT(burnConfig()));
     EEPROMInterface *eepromInterface = GetEepromInterface();
@@ -1754,6 +1791,79 @@ void MainWindow::createActions()
       connect(profileActs[i], SIGNAL(triggered()), this, SLOT(loadProfile()));
     }
     updateProfilesActions();
+
+    classicThemeAct = new QAction(tr("Classic"), this);
+    classicThemeAct->setStatusTip(tr("The multicolor classical Companion icon theme"));
+    connect(classicThemeAct, SIGNAL(triggered()), this, SLOT(setClassicTheme()));
+    monoThemeAct = new QAction("Monochrome",this);
+    monoThemeAct->setStatusTip(tr("A monochrome black icon theme"));
+    connect(monoThemeAct, SIGNAL(triggered()), this, SLOT(setMonochromeTheme()));
+    monoWhiteThemeAct = new QAction("MonoWhite",this);
+    monoWhiteThemeAct->setStatusTip(tr("A monochrome white icon theme"));
+    connect(monoWhiteThemeAct, SIGNAL(triggered()), this, SLOT(setMonoWhiteTheme()));
+    monoBlueThemeAct = new QAction("MonoBlue",this);
+    monoBlueThemeAct->setStatusTip(tr("A monochrome blue icon theme"));
+    connect(monoBlueThemeAct, SIGNAL(triggered()), this, SLOT(setMonoBlueTheme()));
+
+    smallIconAct = new QAction(tr("Small"),this);
+    smallIconAct->setStatusTip(tr("Use small toolbar icons"));
+    connect(smallIconAct, SIGNAL(triggered()), this, SLOT(setSmallIconThemeSize()));
+    normalIconAct = new QAction(this);
+    normalIconAct->setStatusTip(tr("Use normal size toolbar icons"));
+    normalIconAct->setText(tr("Normal"));
+    connect(normalIconAct, SIGNAL(triggered()), this, SLOT(setNormalIconThemeSize()));
+    bigIconAct = new QAction(this);
+    bigIconAct->setStatusTip(tr("Use big toolbar icons"));
+    bigIconAct->setText(tr("Big"));
+    connect(bigIconAct, SIGNAL(triggered()), this, SLOT(setBigIconThemeSize()));
+    hugeIconAct = new QAction(this);    
+    hugeIconAct->setStatusTip(tr("Use huge toolbar icons"));
+    hugeIconAct->setText(tr("Huge"));   
+    connect(hugeIconAct, SIGNAL(triggered()), this, SLOT(setHugeIconThemeSize()));
+
+    defaultLanguageAct = new QAction(tr("System default language"),this);
+    defaultLanguageAct->setStatusTip(tr("Use system default language in menus"));
+    connect(defaultLanguageAct, SIGNAL(triggered()), this, SLOT(setDefaultLanguage()));
+
+    czechLanguageAct = new QAction(tr("Czech"),this);
+    czechLanguageAct->setStatusTip(tr("Use Czech in menus"));
+    connect(czechLanguageAct, SIGNAL(triggered()), this, SLOT(setCZLanguage()));
+
+    germanLanguageAct = new QAction(tr("German"),this);
+    germanLanguageAct->setStatusTip(tr("Use German in menus"));
+    connect(germanLanguageAct, SIGNAL(triggered()), this, SLOT(setDELanguage()));
+
+    englishLanguageAct = new QAction(tr("English"),this);
+    englishLanguageAct->setStatusTip(tr("Use English in menus"));
+    connect(englishLanguageAct, SIGNAL(triggered()), this, SLOT(setENLanguage()));
+
+    frenchLanguageAct = new QAction(tr("French"),this);
+    frenchLanguageAct->setStatusTip(tr("Use French in menus"));
+    connect(frenchLanguageAct, SIGNAL(triggered()), this, SLOT(setFRLanguage()));
+
+    italianLanguageAct = new QAction(tr("Italian"),this);
+    italianLanguageAct->setStatusTip(tr("Use Italian in menus"));
+    connect(italianLanguageAct, SIGNAL(triggered()), this, SLOT(setITLanguage()));
+
+    hebrewLanguageAct = new QAction(tr("Hebrew"),this);
+    hebrewLanguageAct->setStatusTip(tr("Use Hebrew in menus"));
+    connect(hebrewLanguageAct, SIGNAL(triggered()), this, SLOT(setHELanguage()));
+
+    polishLanguageAct = new QAction(tr("Polish"),this);
+    polishLanguageAct->setStatusTip(tr("Use Polish in menus"));
+    connect(polishLanguageAct, SIGNAL(triggered()), this, SLOT(setPLLanguage()));
+
+    portugueseLanguageAct = new QAction(tr("Portuguese"),this);
+    portugueseLanguageAct->setStatusTip(tr("Use Portuguese in menus"));
+    connect(portugueseLanguageAct, SIGNAL(triggered()), this, SLOT(setPTLanguage()));
+
+    swedishLanguageAct = new QAction(tr("Swedish"),this);
+    swedishLanguageAct->setStatusTip(tr("Use Swedish in menus"));
+    connect(swedishLanguageAct, SIGNAL(triggered()), this, SLOT(setSELanguage()));
+
+    russianLanguageAct = new QAction(tr("Russian"),this);
+    russianLanguageAct->setStatusTip(tr("Use Russian in menus"));
+    connect(russianLanguageAct, SIGNAL(triggered()), this, SLOT(setRULanguage()));
 }
 
 void MainWindow::createMenus()
@@ -1761,6 +1871,9 @@ void MainWindow::createMenus()
 {
     QMenu *recentFileMenu=new QMenu(tr("Recent Files"));
     QMenu *profilesMenu=new QMenu(tr("Firmware Profiles"));
+    QMenu *languageMenu=new QMenu(tr("Set Menu Language"));
+    QMenu *themeMenu=new QMenu(tr("Set Icon Theme"));
+    QMenu *iconThemeSizeMenu=new QMenu(tr("Set Icon Size"));
     
     fileMenu = menuBar()->addMenu(tr("&File"));
     fileMenu->addAction(newAct);
@@ -1778,7 +1891,6 @@ void MainWindow::createMenus()
     fileMenu->addAction(printAct);
     fileMenu->addAction(compareAct);
     fileMenu->addSeparator();
-    fileMenu->addAction(preferencesAct);
     fileMenu->addMenu(profilesMenu);
     
     profilesMenu->setIcon(CompanionIcon("profiles.png"));
@@ -1791,6 +1903,34 @@ void MainWindow::createMenus()
     editMenu->addAction(copyAct);
     editMenu->addAction(pasteAct);
 
+    settingsMenu = menuBar()->addMenu(tr("&Settings"));
+    settingsMenu->addMenu(languageMenu);
+      languageMenu->addAction(defaultLanguageAct);
+      languageMenu->addAction(englishLanguageAct);
+      languageMenu->addAction(czechLanguageAct);
+      languageMenu->addAction(germanLanguageAct);
+      languageMenu->addAction(frenchLanguageAct);
+      languageMenu->addAction(hebrewLanguageAct);
+      languageMenu->addAction(italianLanguageAct);
+      languageMenu->addAction(polishLanguageAct);
+      languageMenu->addAction(portugueseLanguageAct);
+      languageMenu->addAction(swedishLanguageAct);
+      languageMenu->addAction(russianLanguageAct);
+    settingsMenu->addMenu(themeMenu);
+      themeMenu->addAction(classicThemeAct);
+      themeMenu->addAction(monoThemeAct);
+      themeMenu->addAction(monoBlueThemeAct);
+      themeMenu->addAction(monoWhiteThemeAct);
+    settingsMenu->addMenu(iconThemeSizeMenu);
+      iconThemeSizeMenu->addAction(smallIconAct);
+      iconThemeSizeMenu->addAction(normalIconAct);
+      iconThemeSizeMenu->addAction(bigIconAct);
+      iconThemeSizeMenu->addAction(hugeIconAct);
+    settingsMenu->addSeparator();
+    settingsMenu->addAction(preferencesAct);
+    settingsMenu->addAction(customizeSplashAct);
+    settingsMenu->addAction(burnConfigAct);
+
     burnMenu = menuBar()->addMenu(tr("&Read/Write"));
     burnMenu->addAction(burnToAct);
     burnMenu->addAction(burnFromAct);
@@ -1801,9 +1941,7 @@ void MainWindow::createMenus()
     burnMenu->addAction(burnToFlashAct);
     burnMenu->addAction(burnFromFlashAct);
     burnMenu->addSeparator();
-    burnMenu->addAction(customizeSplashAct);
     burnMenu->addSeparator();
-    burnMenu->addAction(burnConfigAct);
     EEPROMInterface *eepromInterface = GetEepromInterface();
     if (!IS_ARM(eepromInterface->getBoard())) {    
       burnMenu->addAction(burnFusesAct);
@@ -1968,14 +2106,6 @@ QMdiSubWindow *MainWindow::findMdiChild(const QString &fileName)
     return 0;
 }
 
-void MainWindow::switchLayoutDirection()
-{
-    if (layoutDirection() == Qt::LeftToRight)
-      qApp->setLayoutDirection(Qt::RightToLeft);
-    else
-      qApp->setLayoutDirection(Qt::LeftToRight);
-}
-
 void MainWindow::setActiveSubWindow(QWidget *window)
 {
     if (!window)
@@ -2143,3 +2273,5 @@ void MainWindow::autoClose()
 {
     this->close();
 }
+
+

companion/src/mainwindow.h

@@ -82,6 +82,31 @@ public slots:
     void unloadProfile();
     
 private slots:
+    void setLanguage(QString langString);
+    void setDefaultLanguage() {setLanguage("");};
+    void setCZLanguage() {setLanguage("cs_CZ");};
+    void setDELanguage() {setLanguage("de_DE");};
+    void setENLanguage() {setLanguage("en");};
+    void setFRLanguage() {setLanguage("fr_FR");};
+    void setITLanguage() {setLanguage("it_IT");};
+    void setHELanguage() {setLanguage("he_IL");};
+    void setPLLanguage() {setLanguage("pl_PL");};
+    void setPTLanguage() {setLanguage("pt_PT");};
+    void setRULanguage() {setLanguage("ru_RU");};
+    void setSELanguage() {setLanguage("sv_SE");};
+
+    void setTheme(int index);
+    void setClassicTheme()   {setTheme(0);};
+    void setMonochromeTheme(){setTheme(1);};
+    void setMonoWhiteTheme() {setTheme(2);};
+    void setMonoBlueTheme()  {setTheme(3);};
+
+    void setIconThemeSize(int index);
+    void setSmallIconThemeSize()  {setIconThemeSize(0);};
+    void setNormalIconThemeSize() {setIconThemeSize(1);};
+    void setBigIconThemeSize()    {setIconThemeSize(2);};
+    void setHugeIconThemeSize()   {setIconThemeSize(3);};
+
     void checkForUpdates(bool ignoreSettings, QString & fwId);
     void checkForUpdateFinished(QNetworkReply * reply);
     void displayWarnings();
@@ -121,12 +146,11 @@ private slots:
     void preferences();
     void updateMenus();
     MdiChild *createMdiChild();
-    void switchLayoutDirection();
     void setActiveSubWindow(QWidget *window);
     QMenu * createRecentFileMenu();
     QMenu * createProfilesMenu();
     void autoClose();
-
+  
 private:
     void createActions();
     void createMenus();
@@ -153,7 +177,6 @@ private:
     QStringList GetSendFlashCommand(const QString &filename);
     int getEpromVersion(QString fileName);
 
-
     bool convertEEPROM(QString backupFile, QString restoreFile, QString flashFile);
     bool isValidEEPROM(QString eepromfile);
 
@@ -183,6 +206,7 @@ private:
 
     QMenu *fileMenu;
     QMenu *editMenu;
+    QMenu *settingsMenu;
     QMenu *burnMenu;
     QMenu *helpMenu;
     QToolBar *fileToolBar;
@@ -222,6 +246,25 @@ private:
     QAction *logsAct;
     QAction *recentFileActs[MAX_RECENT];
     QAction *profileActs[MAX_PROFILES];
+    QAction *classicThemeAct;
+    QAction *monoThemeAct;
+    QAction *monoBlueThemeAct;
+    QAction *monoWhiteThemeAct;
+    QAction *smallIconAct;
+    QAction *normalIconAct;
+    QAction *bigIconAct;
+    QAction *hugeIconAct;
+    QAction *defaultLanguageAct;
+    QAction *englishLanguageAct;
+    QAction *czechLanguageAct;
+    QAction *germanLanguageAct;
+    QAction *frenchLanguageAct;
+    QAction *italianLanguageAct;
+    QAction *hebrewLanguageAct;
+    QAction *polishLanguageAct;
+    QAction *portugueseLanguageAct;
+    QAction *swedishLanguageAct;
+    QAction *russianLanguageAct;
     QString fwToUpdate;
     QToolButton * profileButton;
 };

companion/src/preferencesdialog.cpp

@@ -40,7 +40,6 @@ preferencesDialog::preferencesDialog(QWidget *parent) :
     connect(OptionCheckBox[i], SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool)));
   }
 
-  populateLocale();
   initSettings();
   connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
   connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
@@ -254,11 +253,6 @@ void preferencesDialog::firmwareChanged()
 void preferencesDialog::writeValues()
 {
   QSettings settings;
-  if (ui->locale_QB->currentIndex() > 0)
-    settings.setValue("locale", ui->locale_QB->itemData(ui->locale_QB->currentIndex()));
-  else
-    settings.remove("locale");
-  
   settings.setValue("default_channel_order", ui->channelorderCB->currentIndex());
   settings.setValue("default_mode", ui->stickmodeCB->currentIndex());
   settings.setValue("cpu_id", ui->CPU_ID_LE->text());
@@ -267,8 +261,6 @@ void preferencesDialog::writeValues()
   settings.setValue("rename_firmware_files", ui->renameFirmware->isChecked());
   settings.setValue("wizardEnable", ui->wizardEnable_ChkB->isChecked());
   settings.setValue("show_splash", ui->showSplash->isChecked());
-  settings.setValue("theme", ui->theme_CB->currentIndex());
-  settings.setValue("icon_size", ui->iconSize_CB->currentIndex());
   settings.setValue("simuSW", ui->simuSW->isChecked());
   settings.setValue("history_size", ui->historySize->value());
   settings.setValue("burnFirmware", ui->burnFirmware->isChecked());
@@ -387,9 +379,6 @@ void preferencesDialog::populateFirmwareOptions(const FirmwareInfo * firmware)
 void preferencesDialog::initSettings()
 {
   QSettings settings;
-  int i = ui->locale_QB->findData(settings.value("locale"));
-  if (i < 0) i = 0;
-  ui->locale_QB->setCurrentIndex(i);
   ui->snapshotClipboardCKB->setChecked(settings.value("snapshot_to_clipboard", false).toBool());
   if (ui->snapshotClipboardCKB->isChecked()) {
     ui->snapshotPath->setDisabled(true);
@@ -408,8 +397,6 @@ void preferencesDialog::initSettings()
   ui->renameFirmware->setChecked(settings.value("rename_firmware_files", false).toBool());
   ui->wizardEnable_ChkB->setChecked(settings.value("wizardEnable", true).toBool());
   ui->showSplash->setChecked(settings.value("show_splash", true).toBool());
-  ui->theme_CB->setCurrentIndex(settings.value("theme", 1).toInt());
-  ui->iconSize_CB->setCurrentIndex(settings.value("icon_size", 2).toInt());
   ui->historySize->setValue(settings.value("history_size", 10).toInt());
   ui->backLightColor->setCurrentIndex(settings.value("backLight", 0).toInt());
   ui->startupCheck_fw->setChecked(settings.value("startup_check_fw", true).toBool());
@@ -501,25 +488,6 @@ void preferencesDialog::initSettings()
   firmwareChanged();
 }
 
-void preferencesDialog::populateLocale()
-{
-  ui->ProfSave_PB->setEnabled(true);
-  ui->locale_QB->clear();
-  ui->locale_QB->addItem("System default language", "");
-  ui->locale_QB->addItem("English", "en");
-
-  QStringList strl = QApplication::arguments();
-  if (!strl.count()) return;
-
-  QDir directory = QDir(":/");
-  QStringList files = directory.entryList(QStringList("companion_*.qm"), QDir::Files | QDir::NoSymLinks);
-
-  foreach(QString file, files) {
-    QLocale loc(file.mid(10, 2));
-    ui->locale_QB->addItem(QLocale::languageToString(loc.language()), loc.name());
-  }
-}
-
 void preferencesDialog::on_fw_dnld_clicked()
 {
   MainWindow * mw = (MainWindow *)this->parent();

companion/src/preferencesdialog.ui

@@ -25,7 +25,7 @@
   <property name="windowTitle">
    <string>Preferences</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,0,0,1,0">
+  <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,0,0,0,0">
    <property name="sizeConstraint">
     <enum>QLayout::SetMinimumSize</enum>
    </property>
@@ -35,7 +35,84 @@
    <property name="margin">
     <number>4</number>
    </property>
-   <item row="3" column="1" colspan="4">
+   <item row="31" column="1" 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="14" column="1">
+    <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 row="2" column="1" colspan="4">
     <layout class="QHBoxLayout" name="horizontalLayout_10">
      <item>
       <widget class="QLineEdit" name="backupPath">
@@ -60,7 +137,14 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_17">
+     <property name="text">
+      <string>Automatic Backup Folder</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
     <widget class="QLabel" name="label_4">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -73,7 +157,7 @@
      </property>
     </widget>
    </item>
-   <item row="16" column="1" colspan="4">
+   <item row="15" column="1" colspan="4">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QCheckBox" name="joystickChkB">
@@ -101,14 +185,7 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_17">
-     <property name="text">
-      <string>Automatic Backup Folder</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1" colspan="4">
+   <item row="1" column="1" colspan="4">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
       <widget class="QSpinBox" name="historySize">
@@ -151,14 +228,14 @@
      </item>
     </layout>
    </item>
-   <item row="6" column="0" colspan="5">
+   <item row="5" column="0" colspan="5">
     <widget class="Line" name="line">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="15" column="0">
+   <item row="14" column="0">
     <widget class="QLabel" name="label_3">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -174,7 +251,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="4" rowspan="7">
+   <item row="6" column="4" rowspan="7">
     <layout class="QGridLayout" name="gridLayout_3" columnstretch="0,0">
      <item row="0" column="0" colspan="2">
       <widget class="QLabel" name="imageLabel">
@@ -229,43 +306,14 @@
      </item>
     </layout>
    </item>
-   <item row="15" column="2" colspan="2">
+   <item row="14" column="2" colspan="2">
     <widget class="QCheckBox" name="simuSW">
      <property name="text">
       <string>Remember switches in simulator</string>
      </property>
     </widget>
    </item>
-   <item row="15" column="1">
-    <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 row="7" column="1" colspan="3">
+   <item row="6" column="1" colspan="3">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <property name="spacing">
       <number>6</number>
@@ -302,27 +350,21 @@
      </item>
     </layout>
    </item>
-   <item row="17" column="0">
+   <item row="16" column="0">
     <widget class="QLabel" name="label_19">
      <property name="text">
       <string>Simulator capture folder</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Language (requires restart)</string>
+   <item row="17" column="0" colspan="5">
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="32" column="4">
+   <item row="31" column="4">
     <widget class="QComboBox" name="channelorderCB">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -466,7 +508,7 @@ This is used by the templated to determine which channel goes to what number out
      </item>
     </widget>
    </item>
-   <item row="7" column="0">
+   <item row="6" column="0">
     <widget class="QLabel" name="label_8">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -479,7 +521,7 @@ This is used by the templated to determine which channel goes to what number out
      </property>
     </widget>
    </item>
-   <item row="13" column="1" colspan="3">
+   <item row="12" column="1" colspan="3">
     <layout class="QGridLayout" name="gridLayout_2">
      <property name="verticalSpacing">
       <number>1</number>
@@ -503,7 +545,7 @@ This is used by the templated to determine which channel goes to what number out
      </item>
     </layout>
    </item>
-   <item row="25" column="1" colspan="4">
+   <item row="24" column="1" colspan="4">
     <layout class="QHBoxLayout" name="horizontalLayout_5">
      <item>
       <widget class="QLabel" name="FwInfo">
@@ -527,7 +569,7 @@ This is used by the templated to determine which channel goes to what number out
      </item>
     </layout>
    </item>
-   <item row="13" column="0">
+   <item row="12" column="0">
     <widget class="QLabel" name="label_9">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -540,7 +582,7 @@ This is used by the templated to determine which channel goes to what number out
      </property>
     </widget>
    </item>
-   <item row="38" column="0" colspan="5">
+   <item row="37" column="0" colspan="5">
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <spacer name="horizontalSpacer_3">
@@ -583,7 +625,7 @@ This is used by the templated to determine which channel goes to what number out
      </item>
     </layout>
    </item>
-   <item row="27" column="1" colspan="4">
+   <item row="26" column="1" colspan="4">
     <layout class="QHBoxLayout" name="horizontalLayout_6" stretch="1,0">
      <item>
       <widget class="QLabel" name="label_12">
@@ -610,7 +652,7 @@ This is used by the templated to determine which channel goes to what number out
      </item>
     </layout>
    </item>
-   <item row="33" column="1" colspan="4">
+   <item row="32" column="1" colspan="4">
     <layout class="QGridLayout" name="gridLayout_6" columnstretch="0,0,1,0,0">
      <item row="1" column="4">
       <widget class="QPushButton" name="export_PB">
@@ -658,7 +700,7 @@ This is used by the templated to determine which channel goes to what number out
      </item>
     </layout>
    </item>
-   <item row="17" column="1" colspan="4">
+   <item row="16" column="1" colspan="4">
     <layout class="QGridLayout" name="gridLayout_8">
      <property name="verticalSpacing">
       <number>1</number>
@@ -689,7 +731,7 @@ This is used by the templated to determine which channel goes to what number out
      </item>
     </layout>
    </item>
-   <item row="32" column="0">
+   <item row="31" column="0">
     <widget class="QLabel" name="label_14">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -702,7 +744,7 @@ This is used by the templated to determine which channel goes to what number out
      </property>
     </widget>
    </item>
-   <item row="32" column="3">
+   <item row="31" column="3">
     <widget class="QLabel" name="label_13">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
@@ -718,62 +760,14 @@ This is used by the templated to determine which channel goes to what number out
      </property>
     </widget>
    </item>
-   <item row="32" column="1" 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="33" column="0">
+   <item row="32" column="0">
     <widget class="QLabel" name="label_15">
      <property name="text">
       <string>Profile slot</string>
      </property>
     </widget>
    </item>
-   <item row="28" column="1" colspan="4">
+   <item row="27" column="1" colspan="4">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -789,7 +783,7 @@ Mode 4:
      </property>
     </spacer>
    </item>
-   <item row="26" column="1" colspan="4">
+   <item row="25" column="1" colspan="4">
     <layout class="QHBoxLayout" name="horizontalLayout_11" stretch="1,0">
      <item>
       <widget class="QLabel" name="label_18">
@@ -816,7 +810,7 @@ Mode 4:
      </item>
     </layout>
    </item>
-   <item row="22" column="1" colspan="4">
+   <item row="21" column="1" colspan="4">
     <layout class="QGridLayout" name="gridLayout_5" columnstretch="1,0,0,0,0">
      <property name="sizeConstraint">
       <enum>QLayout::SetMaximumSize</enum>
@@ -907,7 +901,7 @@ May be different from firmware language</string>
      </item>
     </layout>
    </item>
-   <item row="22" column="0">
+   <item row="21" column="0">
     <layout class="QGridLayout" name="gridLayout_7">
      <item row="0" column="0">
       <widget class="QLabel" name="label_6">
@@ -947,7 +941,7 @@ May be different from firmware language</string>
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
+   <item row="1" column="0">
     <widget class="QLabel" name="label_5">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -960,14 +954,7 @@ May be different from firmware language</string>
      </property>
     </widget>
    </item>
-   <item row="18" column="0" colspan="5">
-    <widget class="Line" name="line_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="24" column="1" colspan="4">
+   <item row="23" column="1" colspan="4">
     <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0,0,0,0">
      <property name="sizeConstraint">
       <enum>QLayout::SetMaximumSize</enum>
@@ -1520,7 +1507,7 @@ May be different from firmware language</string>
      </item>
     </layout>
    </item>
-   <item row="10" column="0">
+   <item row="9" column="0">
     <widget class="QLabel" name="label_10">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -1533,7 +1520,7 @@ May be different from firmware language</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="1" colspan="3">
+   <item row="9" column="1" colspan="3">
     <widget class="QComboBox" name="splashincludeCB">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -1554,116 +1541,6 @@ May be different from firmware language</string>
     </widget>
    </item>
    <item row="0" column="1" colspan="4">
-    <layout class="QHBoxLayout" name="horizontalLayout_8">
-     <item>
-      <widget class="QComboBox" name="locale_QB"/>
-     </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>
-     <item>
-      <widget class="QLabel" name="label_7">
-       <property name="toolTip">
-        <string/>
-       </property>
-       <property name="text">
-        <string>Theme</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="theme_CB">
-       <property name="toolTip">
-        <string>Requires restart</string>
-       </property>
-       <item>
-        <property name="text">
-         <string>Classic</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Monochrome</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>MonoWhite</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>MonoBlue</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_5">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_2">
-       <property name="toolTip">
-        <string/>
-       </property>
-       <property name="text">
-        <string>Icon  size</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="iconSize_CB">
-       <property name="toolTip">
-        <string>Requires restart</string>
-       </property>
-       <item>
-        <property name="text">
-         <string>Small</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Normal</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Big</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Huge</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="1" colspan="4">
     <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0,0,0">
      <item>
       <widget class="QCheckBox" name="showSplash">
@@ -1710,7 +1587,7 @@ May be different from firmware language</string>
      </item>
     </layout>
    </item>
-   <item row="16" column="0">
+   <item row="15" column="0">
     <widget class="QLabel" name="label_11">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
@@ -1723,14 +1600,14 @@ May be different from firmware language</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="3" column="0">
     <widget class="QLabel" name="ge_label">
      <property name="text">
       <string>Google Earth Executable</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="1" colspan="4">
+   <item row="3" column="1" colspan="4">
     <layout class="QHBoxLayout" name="ge_layout">
      <item>
       <widget class="QLineEdit" name="ge_lineedit">

companion/src/translations/companion_sv.ts

@@ -684,7 +684,7 @@ Dessa inställningar gäller för alla modeller.</translation>
     <message>
         <location line="+8"/>
         <source>Setup</source>
-        <translation>Sändarinställningar</translation>
+        <translation>Välj Sändarens Startbild</translation>
     </message>
     <message>
         <location line="+1186"/>
@@ -1940,14 +1940,14 @@ FAI-funktionen kan inte slås av i sändaren.
     <name>MainWindow</name>
     <message>
         <location filename="../mainwindow.cpp" line="+174"/>
-        <location line="+492"/>
+        <location line="+529"/>
         <location line="+34"/>
-        <location line="+1437"/>
+        <location line="+1530"/>
         <source>File loaded</source>
         <translation>Filen har laddats</translation>
     </message>
     <message>
-        <location line="-1842"/>
+        <location line="-1972"/>
         <location line="+2"/>
         <location line="+40"/>
         <location line="+261"/>
@@ -1993,7 +1993,7 @@ Do you want to download it now ?</source>
 Vill du ladda ned den nya versionen nu ?</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+147"/>
         <source>Open</source>
         <translation>Öppna</translation>
     </message>
@@ -2009,13 +2009,13 @@ Vill du ladda ned den nya versionen nu ?</translation>
         <translation>Copyright</translation>
     </message>
     <message>
-        <location line="+449"/>
+        <location line="+542"/>
         <location line="+21"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location line="-412"/>
+        <location line="-505"/>
         <source>&amp;New</source>
         <translation>&amp;Ny</translation>
     </message>
@@ -2055,14 +2055,13 @@ Vill du ladda ned den nya versionen nu ?</translation>
         <translation>Spara dokumentet under nytt namn</translation>
     </message>
     <message>
-        <location line="+8"/>
         <source>&amp;Preferences...</source>
-        <translation>&amp;Inställningar...</translation>
+        <translation type="obsolete">&amp;Konfiguration...</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+9"/>
         <source>Edit general preferences</source>
-        <translation>Redigera sändarens generella inställningarna</translation>
+        <translation>Konfigurera Sökvägar och Firmware</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2070,7 +2069,7 @@ Vill du ladda ned den nya versionen nu ?</translation>
         <translation>&amp;Sök efter uppdateringar...</translation>
     </message>
     <message>
-        <location line="-1437"/>
+        <location line="-1474"/>
         <source>Display previous message again at startup ?</source>
         <translation>Skall föregående varning visas igen vid uppstart ?</translation>
     </message>
@@ -2099,7 +2098,7 @@ Version %2 finns tillgänglig.
 Vill du ladda ned den nu ?</translation>
     </message>
     <message>
-        <location line="+596"/>
+        <location line="+633"/>
         <source>Write Models and settings from %1 to the Tx?</source>
         <translation>Skriv Modeller och Inställningar från %1 till sändaren?</translation>
     </message>
@@ -2119,14 +2118,13 @@ Vill du ladda ned den nu ?</translation>
         <translation>Säkerhetskopieringen misslyckades</translation>
     </message>
     <message>
-        <location line="+235"/>
         <source>Customize your &amp;TX...</source>
-        <translation>Sändari&amp;nställningar...</translation>
+        <translation type="obsolete">&amp;Välj Sändarens Startbild...</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+236"/>
         <source>Customize the splash screen of your TX</source>
-        <translation>Ställ in din sändares startlbild</translation>
+        <translation>Ställ din sändares startbild</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2179,12 +2177,11 @@ Vill du ladda ned den nu ?</translation>
         <translation>Ctrl+Alt+R</translation>
     </message>
     <message>
-        <location line="+20"/>
         <source>&amp;Configure...</source>
-        <translation>&amp;Kommunikationsinställningar...</translation>
+        <translation type="obsolete">&amp;Kommunikationsinställningar...</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+21"/>
         <source>Configure software for reading from and writing to the transmitter</source>
         <translation>Inställningar för mjukvaran som kommunicerar med sändaren</translation>
     </message>
@@ -2249,33 +2246,33 @@ Vill du ladda ned den nu ?</translation>
         <translation>Visa information om programmet</translation>
     </message>
     <message>
-        <location line="+21"/>
-        <location line="+108"/>
+        <location line="+94"/>
+        <location line="+136"/>
         <source>Recent Files</source>
         <translation>Senaste Filer</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="-130"/>
         <source>&amp;File</source>
         <translation>&amp;Arkiv</translation>
     </message>
     <message>
-        <location line="-1639"/>
-        <location line="+626"/>
+        <location line="-1752"/>
+        <location line="+663"/>
         <location line="+20"/>
         <source>Companion - Models and Settings Editor - %1 - profile %2</source>
         <translation>Companion - Editor för Modeller och Inställningar - %1 - profile %2</translation>
     </message>
     <message>
-        <location line="-644"/>
-        <location line="+618"/>
+        <location line="-681"/>
+        <location line="+655"/>
         <location line="+17"/>
         <location line="+12"/>
         <source>Companion - Models and Settings Editor - %1</source>
         <translation>Companion - Editor för Modeller och Inställningar - %1</translation>
     </message>
     <message>
-        <location line="-524"/>
+        <location line="-561"/>
         <source>Checking for updates</source>
         <translation>Letar efter uppdateringar</translation>
     </message>
@@ -2290,7 +2287,7 @@ Vill du ladda ned den nu ?</translation>
         <translation>Ladda inte ned versionen (r%1)?</translation>
     </message>
     <message>
-        <location line="+964"/>
+        <location line="+1001"/>
         <source>OpenTX Home Page: &lt;a href=&apos;%1&apos;&gt;%1&lt;/a&gt;</source>
         <translation>OpenTX Hemsida: &lt;a href=&apos;%1&apos;&gt;%1&lt;/a&gt;</translation>
     </message>
@@ -2375,12 +2372,12 @@ Vill du ladda ned den nu ?</translation>
         <translation>Läs firmware från sändaren</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+156"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redigera</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+51"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
@@ -2405,12 +2402,12 @@ Vill du ladda ned den nu ?</translation>
         <translation>Redo</translation>
     </message>
     <message>
-        <location line="-290"/>
+        <location line="-391"/>
         <source>Contributors &amp;List...</source>
         <translation>&amp;Bidragsgivare...</translation>
     </message>
     <message>
-        <location line="-1444"/>
+        <location line="-1481"/>
         <source>Display previous warning again at startup ?</source>
         <translation>SKall föregående varning visas igen vid uppstart ?</translation>
     </message>
@@ -2419,8 +2416,8 @@ Vill du ladda ned den nu ?</translation>
         <location line="+29"/>
         <location line="+11"/>
         <location line="+29"/>
-        <location line="+500"/>
-        <location line="+1109"/>
+        <location line="+537"/>
+        <location line="+1202"/>
         <location line="+6"/>
         <location line="+8"/>
         <location line="+23"/>
@@ -2432,21 +2429,21 @@ Vill du ladda ned den nu ?</translation>
         <translation>Fel</translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1263"/>
         <source>Cannot write file %1:
 %2.</source>
         <translation>Filen %1 kunde inte skrivas:
 %2.</translation>
     </message>
     <message>
-        <location line="-626"/>
+        <location line="-663"/>
         <source>New release available</source>
         <translation>En ny version finns tillgänglig</translation>
     </message>
     <message>
         <location line="+57"/>
         <location line="+40"/>
-        <location line="+1643"/>
+        <location line="+1773"/>
         <location line="+8"/>
         <location line="+36"/>
         <source>Error opening file %1:
@@ -2455,7 +2452,7 @@ Vill du ladda ned den nu ?</translation>
 %2.</translation>
     </message>
     <message>
-        <location line="-1672"/>
+        <location line="-1802"/>
         <source>Compilation server termporary failure, try later</source>
         <translation>Tillfälligt fel i byggservern. Försök igen senare</translation>
     </message>
@@ -2472,7 +2469,7 @@ Vill du ladda ned den nu ?</translation>
         <translation>Okänt server-fel. Försök igen senare</translation>
     </message>
     <message>
-        <location line="+1224"/>
+        <location line="+1261"/>
         <source>Compare...</source>
         <translation>Jämför...</translation>
     </message>
@@ -2502,23 +2499,23 @@ Vill du ladda ned den nu ?</translation>
         <translation>Varning</translation>
     </message>
     <message>
-        <location line="+590"/>
-        <location line="+117"/>
+        <location line="+663"/>
+        <location line="+145"/>
         <source>Firmware Profiles</source>
         <translation>Profiler för Firmware</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-84"/>
         <source>&amp;Read/Write</source>
         <translation>&amp;Läs/Skriv</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+111"/>
         <source>Write</source>
         <translation>Skriv</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+127"/>
         <source>Unable to find file %1!</source>
         <translation>Kan inte hitta filen %1 !</translation>
     </message>
@@ -2530,7 +2527,7 @@ Vill du ladda ned den nu ?</translation>
 %2.</translation>
     </message>
     <message>
-        <location line="-486"/>
+        <location line="-579"/>
         <source>&amp;loadBackup...</source>
         <translation>ladda&amp;Backup...</translation>
     </message>
@@ -2572,7 +2569,7 @@ Vill du ladda ned den nu ?</translation>
         <translation>Det går inte att identifiera sändaren. Verifiera att EEPOROM-skivan är ansluteten.</translation>
     </message>
     <message>
-        <location line="-695"/>
+        <location line="-732"/>
         <location line="+29"/>
         <source>Yes</source>
         <translation>Ja</translation>
@@ -2612,7 +2609,29 @@ Vill du ladda ned den nu ?</translation>
         <translation>Release notes innehåller väldigt viktig information. Vill du läsa dem nu?</translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+66"/>
+        <source>The selected language will be used the next time you start Companion.</source>
+        <translation>Språket som valts kommer att användas nästa gång Companion startas.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+12"/>
+        <location line="+12"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location line="-14"/>
+        <source>The new theme will be loaded the next time you start Companion.</source>
+        <translation>De nya ikonerna kommer att användas nästa gång Companion startas.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The icon size will be used the next time you start Companion.</source>
+        <translation>Ikonernas storlek kommer att justeras nästa gång Companion startas.</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Firmware updates</source>
         <translation>Firmware-uppdatering</translation>
     </message>
@@ -2725,7 +2744,12 @@ Starta skrivningen i alla fall ?</translation>
         <translation>Om Companion</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+85"/>
+        <source>&amp;General Preferences...</source>
+        <translation>&amp;Generella Inställningar...</translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Check for new version of Companion</source>
         <translation>Sök efter ny version av Companion</translation>
     </message>
@@ -2750,7 +2774,212 @@ Starta skrivningen i alla fall ?</translation>
         <translation>Visa firmware-förändringar</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+8"/>
+        <source>Configure transmitter start screen...</source>
+        <translation>Konfigurera sändarens startbild...</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>&amp;Configure connection software...</source>
+        <translation>Inställningar för &amp;kommunikation...</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Classic</source>
+        <translation>Klassiskt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The multicolor classical Companion icon theme</source>
+        <translation>Det flerfärgade klassiska Companion-temat</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>A monochrome black icon theme</source>
+        <translation>Ett monokromt svart tema</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>A monochrome white icon theme</source>
+        <translation>Ett monokromt vitt tema</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>A monochrome blue icon theme</source>
+        <translation>Ett monokromt blått tema</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Small</source>
+        <translation>Liten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use small toolbar icons</source>
+        <translation>Använd små ikoner i verktygsfälten</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Use normal size toolbar icons</source>
+        <translation>Använd normalstora ikoner i verktygsfälten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Normal</source>
+        <translation>Normal</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Use big toolbar icons</source>
+        <translation>Använd stora ikoner i verktygsfälten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Big</source>
+        <translation>Stor</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Use huge toolbar icons</source>
+        <translation>Använd mycket stora ikoner i verktygsfälten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Huge</source>
+        <translation>Mycket Stor</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>System default language</source>
+        <translation>Systemspråk</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use system default language in menus</source>
+        <translation>Använd systemspråket i menyerna (om tillgängligt)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Czech</source>
+        <translation>Czeckiska</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use Czech in menus</source>
+        <translation>Använd Tjeckiska i menyerna</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>German</source>
+        <translation>Tyska</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use German in menus</source>
+        <translation>Använd Tyska i menyerna</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>English</source>
+        <translation>Engelska</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use English in menus</source>
+        <translation>Använd Engelska i menyerna</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>French</source>
+        <translation>Franska</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use French in menus</source>
+        <translation>Använd Franska i menyerna</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Italian</source>
+        <translation>Italienska</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use Italian in menus</source>
+        <translation>Använd Italienska i menyerna</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Hebrew</source>
+        <translation>Hebreiska</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use Hebrew in menus</source>
+        <translation>Använd Hebreiska i menyerna</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Polish</source>
+        <translation>Polska</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use Polish in menus</source>
+        <translation>Använd Polska i menyerna</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Portuguese</source>
+        <translation>Portugisiska</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use Portuguese in menus</source>
+        <translation>Använd Portugisiska i menyerna</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Swedish</source>
+        <translation>Svenska</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use Swedish in menus</source>
+        <translation>Använd Svenska i menyerna</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Russian</source>
+        <translation>Ryska</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Use Russian in menus</source>
+        <translation>Använd Ryska i menyerna</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Set MenuLanguage</source>
+        <translation>Ställ in menyspråk</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set Icon Theme</source>
+        <translation>Ställ in Ikontema</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set Icon Size</source>
+        <translation>Ställ in Ikonstorlek</translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>&amp;Settings</source>
+        <translation>&amp;Inställningar</translation>
+    </message>
+    <message>
+        <location line="+303"/>
         <location line="+6"/>
         <source>Invalid Models and Settings File %1</source>
         <translation>Filen innehåller inte Modeller och Inställningar: %1</translation>
@@ -2884,7 +3113,7 @@ Vill du spara förändringarna?</translation>
     <message>
         <location line="+44"/>
         <source>The backup dir set in preferences does not exist</source>
-        <translation>Katalog för säkerhetskopiering saknas i inställningarna</translation>
+        <translation>Den katalog som konfigurerats för säkerhetskopiering existerar inte</translation>
     </message>
     <message>
         <location line="+38"/>
@@ -2907,7 +3136,7 @@ Vill du spara förändringarna?</translation>
     <message>
         <location line="-3"/>
         <source>Firmware in radio is of a different family of eeprom written, check file and preferences!</source>
-        <translation>sändarens firmware är av en annan typ än den aktuella. Kontrollera Arkiv och Inställningar!</translation>
+        <translation>sändarens firmware är av en annan typ än den aktuella. Kontrollera konfigurationen!</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6468,7 +6697,7 @@ m2560 för v4.1-kort</translation>
     <message>
         <location filename="../burndialog.ui" line="+26"/>
         <source>Customize Splash</source>
-        <translation>Välj Startbild</translation>
+        <translation>Välj Sändarens Startbild</translation>
     </message>
     <message>
         <location line="+173"/>
@@ -8338,15 +8567,14 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
     <message>
         <location filename="../preferencesdialog.ui" line="+26"/>
         <source>Preferences</source>
-        <translation>Inställningar</translation>
+        <translation>Konfiguration</translation>
     </message>
     <message>
-        <location line="+295"/>
         <source>Language (requires restart)</source>
-        <translation>Språk (kräver omstart)</translation>
+        <translation type="obsolete">Språk (kräver omstart)</translation>
     </message>
     <message>
-        <location line="+638"/>
+        <location line="+927"/>
         <source>Recent History Size</source>
         <translation>Loggstorlek</translation>
     </message>
@@ -8357,7 +8585,7 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
         <translation>Nedladdning</translation>
     </message>
     <message>
-        <location line="-167"/>
+        <location line="-119"/>
         <source>Default Channel Order</source>
         <translation>Kanalordning</translation>
     </message>
@@ -8371,17 +8599,17 @@ This is used by the templated to determine which channel goes to what number out
 Detta används av mallen för att koppla kanal till output-nummer.</translation>
     </message>
     <message>
-        <location line="-268"/>
+        <location line="-226"/>
         <source>Show Splash At Start</source>
         <translation>Visa Startbild</translation>
     </message>
     <message>
-        <location line="+629"/>
+        <location line="+587"/>
         <source>Default Stick Mode</source>
         <translation>Spaktilldelning</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="-702"/>
         <source>Mode selection:
 
 Mode 1:
@@ -8442,73 +8670,61 @@ Mode 4:
         <translation>Mode 4 (SKE GAS HÖJ ROD)</translation>
     </message>
     <message>
-        <location line="-657"/>
+        <location line="+62"/>
         <source>Automatic Backup Folder</source>
         <translation>Säkerhetskopiera till folder</translation>
     </message>
     <message>
-        <location line="+814"/>
+        <location line="+772"/>
         <source>Firmware</source>
         <translation>Firmware</translation>
     </message>
     <message>
-        <location line="+659"/>
         <source>Theme</source>
-        <translation>Tema</translation>
+        <translation type="obsolete">Tema</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location line="+53"/>
         <source>Requires restart</source>
-        <translation>Kräver omstart</translation>
+        <translation type="obsolete">Kräver omstart</translation>
     </message>
     <message>
-        <location line="-49"/>
         <source>Classic</source>
-        <translation>Klassiskt</translation>
+        <translation type="obsolete">Klassiskt</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Monochrome</source>
-        <translation>Monokromt</translation>
+        <translation type="obsolete">Monokromt</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>MonoWhite</source>
-        <translation>Monokromt Vitt</translation>
+        <translation type="obsolete">Monokromt Vitt</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>MonoBlue</source>
-        <translation>Monokromt Blått</translation>
+        <translation type="obsolete">Monokromt Blått</translation>
     </message>
     <message>
-        <location line="+27"/>
         <source>Icon  size</source>
-        <translation>Ikonstorlek</translation>
+        <translation type="obsolete">Ikonstorlek</translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>Small</source>
-        <translation>Liten</translation>
+        <translation type="obsolete">Liten</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Normal</source>
-        <translation>Normal</translation>
+        <translation type="obsolete">Normal</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Big</source>
-        <translation>Stor</translation>
+        <translation type="obsolete">Stor</translation>
     </message>
     <message>
-        <location line="+5"/>
         <source>Huge</source>
-        <translation>Enorm</translation>
+        <translation type="obsolete">Enorm</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+707"/>
         <source>Find Executable</source>
         <translation>Sök Program</translation>
     </message>
@@ -8523,36 +8739,36 @@ Mode 4:
         <translation>Sök efter uppdateringar vid start</translation>
     </message>
     <message>
-        <location line="-1468"/>
-        <location line="+60"/>
+        <location line="-1268"/>
+        <location line="+31"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location line="+1246"/>
+        <location line="+1185"/>
         <source>Splash library behaviour</source>
         <translation>Beteende för bildbibliotek</translation>
     </message>
     <message>
-        <location line="-993"/>
+        <location line="-938"/>
         <source>Personal splash library</source>
         <translation>Personligt bildbibliotek</translation>
     </message>
     <message>
-        <location line="+1183"/>
+        <location line="+1018"/>
         <source>Joystick</source>
         <translation>Joystick</translation>
     </message>
     <message>
-        <location line="-1672"/>
-        <location line="+440"/>
+        <location line="-1472"/>
+        <location line="+405"/>
         <location line="+179"/>
-        <location line="+229"/>
+        <location line="+181"/>
         <source>Open Folder</source>
         <translation>Öppna katalog</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+79"/>
         <location line="+13"/>
         <location line="+13"/>
         <location line="+13"/>
@@ -8598,12 +8814,12 @@ Mode 4:
         <translation>Kryssruta</translation>
     </message>
     <message>
-        <location line="-993"/>
+        <location line="-938"/>
         <source>Check for updates</source>
         <translation>Sök efter uppdateringar</translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-476"/>
         <source>Blue</source>
         <oldsource>Blu</oldsource>
         <translation>Blå</translation>
@@ -8629,7 +8845,7 @@ Mode 4:
         <translation>Gul</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="+55"/>
         <source>Enable</source>
         <translation>Slå på</translation>
     </message>
@@ -8639,28 +8855,28 @@ Mode 4:
         <translation>Kalibrera</translation>
     </message>
     <message>
-        <location line="+201"/>
+        <location line="+165"/>
         <source>Open Image</source>
         <translation>Öppna bild</translation>
     </message>
     <message>
-        <location line="-80"/>
+        <location line="-51"/>
         <source>Invert Pixels</source>
         <translation>Invertera bild</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+263"/>
         <source>FwInfo</source>
         <translation>Firmware-info</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="+235"/>
+        <location filename="../preferencesdialog.cpp" line="+234"/>
         <source>Last downloaded release: %1</source>
         <translation>Senast nedladdade release: %1</translation>
     </message>
     <message>
-        <location line="+243"/>
-        <location line="+332"/>
+        <location line="+231"/>
+        <location line="+313"/>
         <source>No joysticks found</source>
         <translation>Ingen joystick hittades</translation>
     </message>
@@ -8691,7 +8907,7 @@ Mode 4:
         <translation>Fel</translation>
     </message>
     <message>
-        <location line="-521"/>
+        <location line="-490"/>
         <source>The selected firmware has never been downloaded by Companion.</source>
         <translation>Firmware-filen har aldrig laddats ned av Companion.</translation>
     </message>
@@ -8701,18 +8917,18 @@ Mode 4:
         <translation>Firmware-filen kan inte laddas ned av Companion.</translation>
     </message>
     <message>
-        <location line="+366"/>
+        <location line="+335"/>
         <location line="+151"/>
         <source>Cannot load %1.</source>
         <translation>%1 kunde inte laddas.</translation>
     </message>
     <message>
-        <location line="-298"/>
+        <location line="-279"/>
         <source>Image stored in settings</source>
         <translation>Bilden lagras i inställningar</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="+1029"/>
+        <location filename="../preferencesdialog.ui" line="+974"/>
         <source>Include companion splashes</source>
         <translation>Användarens bilder och companion-bilder</translation>
     </message>
@@ -8722,7 +8938,7 @@ Mode 4:
         <translation>Enbart användarens bilder</translation>
     </message>
     <message>
-        <location line="-1073"/>
+        <location line="-1018"/>
         <source>Custom TX splash screen</source>
         <translation>Egen uppstartsbild</translation>
     </message>
@@ -8732,12 +8948,12 @@ Mode 4:
         <translation>Fråga om skrivning efter Nedladdning</translation>
     </message>
     <message>
-        <location line="+268"/>
+        <location line="+220"/>
         <source>Language</source>
         <translation>Språk</translation>
     </message>
     <message>
-        <location line="-213"/>
+        <location line="-165"/>
         <source>Profile Name</source>
         <translation>Profilnamn</translation>
     </message>
@@ -8747,22 +8963,22 @@ Mode 4:
         <translation>Spara Profil</translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+99"/>
         <source>Profile slot</source>
         <translation>Profilplats</translation>
     </message>
     <message>
-        <location line="-715"/>
+        <location line="-632"/>
         <source>auto backup before write</source>
         <translation>säkerhetskopiera innan skrivning</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="+85"/>
+        <location filename="../preferencesdialog.cpp" line="+66"/>
         <source>Select your library folder</source>
         <translation>Välj bibliotekskatalog</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="+561"/>
+        <location filename="../preferencesdialog.ui" line="+526"/>
         <source>Export Profile</source>
         <translation>Exportera Profil</translation>
     </message>
@@ -8772,7 +8988,7 @@ Mode 4:
         <translation>Importera Profil</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+113"/>
         <source>Automatically add version number to the filename after download</source>
         <translation>Lägg automatiskt till ett versionsnummer till filnamnet</translation>
     </message>
@@ -8804,22 +9020,22 @@ Får skilja från språket för mjukvaran</translation>
         <translation>Öppna profil för import</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="-677"/>
+        <location filename="../preferencesdialog.ui" line="-594"/>
         <source>Simu BackLight</source>
         <translation>Simulatorbelysning</translation>
     </message>
     <message>
-        <location line="+774"/>
+        <location line="+691"/>
         <source>Processor ID</source>
         <translation>Processortyp</translation>
     </message>
     <message>
-        <location line="-636"/>
+        <location line="-582"/>
         <source>Simulator capture folder</source>
         <translation>Katalog för simulator-data</translation>
     </message>
     <message>
-        <location line="+378"/>
+        <location line="+372"/>
         <source>Use clipboard only</source>
         <translation>Använd bara clipboard</translation>
     </message>
@@ -8834,12 +9050,12 @@ Får skilja från språket för mjukvaran</translation>
         <translation>Profilnamn saknas, profilplats %1 kommer att raderas.&lt;br&gt; Är du säker?</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.ui" line="+1018"/>
+        <location filename="../preferencesdialog.ui" line="+853"/>
         <source>Check for selected Fw updates</source>
         <translation>Sök efter updatering av vald FW</translation>
     </message>
     <message>
-        <location line="-1559"/>
+        <location line="-1359"/>
         <source>Ask use of wizard for new models</source>
         <translation>Använd modell-guiden för nya modeller</translation>
     </message>
@@ -8849,7 +9065,7 @@ Får skilja från språket för mjukvaran</translation>
         <translation>Minns brytare i simulator</translation>
     </message>
     <message>
-        <location line="+699"/>
+        <location line="+616"/>
         <source>SD Structure path</source>
         <translation>Sökväg till SD-struktur</translation>
     </message>