chore(cpn): generic simulator (#5692)

2025-01-01 11:48:17 +10:00
parent 0a39cb001b
commit 7b1ae2404c
423 changed files with 1181 additions and 14124 deletions
@@ -32,6 +32,8 @@
 #include "filtereditemmodels.h"
 #include "updates/updatefactories.h"
 #include "updates/updateoptionsdialog.h"
+#include <QPalette>
+#include <QColorDialog>

 constexpr char FIM_TEMPLATESETUP[]    {"Template Setup"};

@@ -84,12 +86,9 @@ void AppPreferencesDialog::accept()
  g.showSplash(ui->showSplash->isChecked());
  g.sortProfiles(ui->sortProfiles->isChecked());
  g.promptProfile(ui->chkPromptProfile->isChecked());
-  g.simuSW(ui->simuSW->isChecked());
-  g.disableJoystickWarning(ui->joystickWarningCB->isChecked());
  g.removeModelSlots(ui->opt_removeBlankSlots->isChecked());
  g.newModelAction((AppData::NewModelAction)ui->cboNewModelAction->currentIndex());
  g.historySize(ui->historySize->value());
-  g.backLight(ui->backLightColor->currentIndex());
  profile.volumeGain(round(ui->volumeGain->value() * 10.0));
  g.libDir(ui->libraryPath->text());
  g.gePath(ui->ge_lineedit->text());
@@ -101,6 +100,14 @@ void AppPreferencesDialog::accept()
  g.appLogsDir(ui->appLogsDir->text());
  g.runAppInstaller(ui->chkPromptInstall->isChecked());

+//  Simulator tab
+  g.simuSW(ui->simuSW->isChecked());
+  g.backLight(ui->backLightColor->currentIndex());
+  g.simuGenericKeysPos((AppData::SimuGenericKeysPos)ui->cboSimuGenericKeysPos->currentIndex());
+  g.simuScrollButtons(ui->chkSimuScrollButtons->isChecked());
+
+  g.disableJoystickWarning(ui->joystickWarningCB->isChecked());
+
  if (ui->joystickChkB ->isChecked()) {
    g.jsSupport(ui->joystickChkB ->isChecked());
    // Don't overwrite selected joystick if not connected. Avoid surprising the user.
@@ -169,6 +176,7 @@ void AppPreferencesDialog::accept()
  profile.penableBackup(ui->pbackupEnable->isChecked());
  profile.splashFile(ui->SplashFileName->text());
  profile.runSDSync(ui->chkPromptSDSync->isChecked());
+  profile.radioSimCaseColor(ui->lblRadioColorSample->palette().button().color());

  // The profile name may NEVER be empty
  if (ui->profileNameLE->text().isEmpty())
@@ -224,32 +232,25 @@ void AppPreferencesDialog::on_snapshotPathButton_clicked()
  }
 }

+void AppPreferencesDialog::on_btnRadioColor_clicked()
+{
+  Profile & profile = g.currentProfile();
+  QColorDialog *dlg = new QColorDialog(this);
+  QColor color = dlg->getColor(profile.radioSimCaseColor(), this);
+  ui->lblRadioColorSample->setPalette(QPalette(color));
+  ui->lblRadioColorSample->repaint();
+}
+
 void AppPreferencesDialog::initSettings()
 {
  const Profile & profile = g.currentProfile();

-  ui->snapshotClipboardCKB->setChecked(g.snapToClpbrd());
  ui->burnFirmware->setChecked(profile.burnFirmware());
-  ui->snapshotPath->setText(g.snapshotDir());
-  ui->snapshotPath->setReadOnly(true);
-  if (ui->snapshotClipboardCKB->isChecked()) {
-    ui->snapshotPath->setDisabled(true);
-    ui->snapshotPathButton->setDisabled(true);
-  }

  ui->showSplash->setChecked(g.showSplash());
  ui->sortProfiles->setChecked(g.sortProfiles());
  ui->chkPromptProfile->setChecked(g.promptProfile());
  ui->historySize->setValue(g.historySize());
-  ui->backLightColor->setCurrentIndex(g.backLight());
-  ui->volumeGain->setValue(profile.volumeGain() / 10.0);
-
-  if (IS_HORUS_OR_TARANIS(getCurrentBoard())) {
-    ui->backLightColor->setEnabled(false);
-  }
-
-  ui->simuSW->setChecked(g.simuSW());
-  ui->joystickWarningCB->setChecked(g.disableJoystickWarning());
  ui->opt_removeBlankSlots->setChecked(g.removeModelSlots());
  ui->cboNewModelAction->addItems(AppData::newModelActionsList());
  ui->cboNewModelAction->setCurrentIndex(g.newModelAction());
@@ -277,6 +278,24 @@ void AppPreferencesDialog::initSettings()
  toggleAppLogSettings();
  ui->chkPromptInstall->setChecked(g.runAppInstaller());

+  //  Simulator tab
+  ui->snapshotPath->setText(g.snapshotDir());
+  ui->snapshotPath->setReadOnly(true);
+  ui->snapshotClipboardCKB->setChecked(g.snapToClpbrd());
+  if (ui->snapshotClipboardCKB->isChecked()) {
+    ui->snapshotPath->setDisabled(true);
+    ui->snapshotPathButton->setDisabled(true);
+  }
+  ui->simuSW->setChecked(g.simuSW());
+  ui->backLightColor->setCurrentIndex(g.backLight());
+  if (!Boards::getCapability(getCurrentBoard(), Board::HasBacklightColor))
+    ui->backLightColor->setEnabled(false);
+  ui->volumeGain->setValue(profile.volumeGain() / 10.0);
+  ui->cboSimuGenericKeysPos->addItems(AppData::simuGenericKeysPosList());
+  ui->cboSimuGenericKeysPos->setCurrentIndex(g.simuGenericKeysPos());
+  ui->chkSimuScrollButtons->setChecked(g.simuScrollButtons());
+  ui->joystickWarningCB->setChecked(g.disableJoystickWarning());
+
 #if defined(JOYSTICKS)
  ui->joystickChkB->setChecked(g.jsSupport());
  if (ui->joystickChkB->isChecked()) {
@@ -350,6 +369,7 @@ void AppPreferencesDialog::initSettings()
  }
  ui->lblGeneralSettings->setText(hwSettings);
  ui->chkPromptSDSync->setChecked(profile.runSDSync());
+  ui->lblRadioColorSample->setPalette(QPalette(profile.radioSimCaseColor()));

  QString currType = QStringList(profile.fwType().split('-').mid(0, 2)).join('-');
  foreach(Firmware * firmware, Firmware::getRegisteredFirmwares()) {
@@ -79,6 +79,8 @@ class AppPreferencesDialog : public QDialog
    void on_joystickcalButton_clicked();
 #endif

+    void on_btnRadioColor_clicked();
+
  private:
    void initSettings();
    void populateFirmwareOptions(const Firmware *);
@@ -6,6 +6,7 @@
    <file>images/screenshot.png</file>
    <file>images/splash.png</file>
    <file>images/companion-title.png</file>
+    <file>images/simulator-title.png</file>
    <file>images/maps.png</file>
    <file>images/track.png</file>
    <file>images/track0.png</file>
@@ -46,323 +47,6 @@
    <file>images/simulator/icons/svg/trainer-active.svg</file>
    <file>images/simulator/icons/svg/word_wrap.svg</file>
    <file>images/simulator/icons/svg/word_wrap-on.svg</file>
-    <file>images/simulator/X12/middle.png</file>
-    <file>images/simulator/X12/left.png</file>
-    <file>images/simulator/X12/right.png</file>
-    <file>images/simulator/X12/top.png</file>
-    <file>images/simulator/X12/bottom.png</file>
-    <file>images/simulator/X12/led.png</file>
-    <file>images/simulator/X12/border-right.png</file>
-    <file>images/simulator/X12/left_btn1.png</file>
-    <file>images/simulator/X12/left_btn2.png</file>
-    <file>images/simulator/X12/left_scrnsht.png</file>
-    <file>images/simulator/X12/right_btnU.png</file>
-    <file>images/simulator/X12/right_btnL.png</file>
-    <file>images/simulator/X12/right_btnD.png</file>
-    <file>images/simulator/X12/right_btnR.png</file>
-    <file>images/simulator/X12/right_ent.png</file>
-    <file>images/simulator/X10/left.png</file>
-    <file>images/simulator/X10/right.png</file>
-    <file>images/simulator/X10/top.png</file>
-    <file>images/simulator/X10/bottom.png</file>
-    <file>images/simulator/X10/left_mdl.png</file>
-    <file>images/simulator/X10/left_page.png</file>
-    <file>images/simulator/X10/left_scrnsht.png</file>
-    <file>images/simulator/X10/left_rtn.png</file>
-    <file>images/simulator/X10/left_sys.png</file>
-    <file>images/simulator/X10/left_tele.png</file>
-    <file>images/simulator/X10/right_ent.png</file>
-    <file>images/simulator/9X/9xdb.png</file>
-    <file>images/simulator/9X/9xdl.png</file>
-    <file>images/simulator/9X/9xdr.png</file>
-    <file>images/simulator/9X/9xdt.png</file>
-    <file>images/simulator/9X/9xdb-bl.png</file>
-    <file>images/simulator/9X/9xdl-bl.png</file>
-    <file>images/simulator/9X/9xdr-bl.png</file>
-    <file>images/simulator/9X/9xdt-bl.png</file>
-    <file>images/simulator/9X/9xdb-gr.png</file>
-    <file>images/simulator/9X/9xdl-gr.png</file>
-    <file>images/simulator/9X/9xdr-gr.png</file>
-    <file>images/simulator/9X/9xdt-gr.png</file>
-    <file>images/simulator/9X/9xdb-or.png</file>
-    <file>images/simulator/9X/9xdl-or.png</file>
-    <file>images/simulator/9X/9xdr-or.png</file>
-    <file>images/simulator/9X/9xdt-or.png</file>
-    <file>images/simulator/9X/9xdb-yl.png</file>
-    <file>images/simulator/9X/9xdl-yl.png</file>
-    <file>images/simulator/9X/9xdr-yl.png</file>
-    <file>images/simulator/9X/9xdt-yl.png</file>
-    <file>images/simulator/9X/9xdb-rd.png</file>
-    <file>images/simulator/9X/9xdl-rd.png</file>
-    <file>images/simulator/9X/9xdr-rd.png</file>
-    <file>images/simulator/9X/9xdt-rd.png</file>
-    <file>images/simulator/9X/9xmenu.png</file>
-    <file>images/simulator/9X/9xmenumenu.png</file>
-    <file>images/simulator/9X/9xmenuexit.png</file>
-    <file>images/simulator/9X/9xcurs.png</file>
-    <file>images/simulator/9X/9xcursup.png</file>
-    <file>images/simulator/9X/9xcursplus.png</file>
-    <file>images/simulator/9X/9xcursmin.png</file>
-    <file>images/simulator/9X/9xcursdown.png</file>
-    <file>images/simulator/9X/9xcursphoto.png</file>
-    <file>images/simulator/X9D/x9b0.png</file>
-    <file>images/simulator/X9D/x9l0.png</file>
-    <file>images/simulator/X9D/x9l1.png</file>
-    <file>images/simulator/X9D/x9l2.png</file>
-    <file>images/simulator/X9D/x9l3.png</file>
-    <file>images/simulator/X9D/x9l4.png</file>
-    <file>images/simulator/X9D/x9r0.png</file>
-    <file>images/simulator/X9D/x9r1.png</file>
-    <file>images/simulator/X9D/x9r2.png</file>
-    <file>images/simulator/X9D/x9r3.png</file>
-    <file>images/simulator/X9D/x9s0.png</file>
-    <file>images/simulator/X9D/x9t0.png</file>
-    <file>images/simulator/X7/bottom.png</file>
-    <file>images/simulator/X7/left.png</file>
-    <file>images/simulator/X7/left_exit.png</file>
-    <file>images/simulator/X7/left_menu.png</file>
-    <file>images/simulator/X7/left_page.png</file>
-    <file>images/simulator/X7/left_scrnshot.png</file>
-    <file>images/simulator/X7/right.png</file>
-    <file>images/simulator/X7/right_ent.png</file>
-    <file>images/simulator/X7/top.png</file>
-    <file>images/simulator/X9E/bottom.png</file>
-    <file>images/simulator/X9E/left.png</file>
-    <file>images/simulator/X9E/left_exit.png</file>
-    <file>images/simulator/X9E/left_menu.png</file>
-    <file>images/simulator/X9E/left_page.png</file>
-    <file>images/simulator/X9E/left_scrnshot.png</file>
-    <file>images/simulator/X9E/right.png</file>
-    <file>images/simulator/X9E/right_enter.png</file>
-    <file>images/simulator/X9E/top.png</file>
-    <file>images/simulator/X9D2019/bottom.png</file>
-    <file>images/simulator/X9D2019/bottom_scrnshot.png</file>
-    <file>images/simulator/X9D2019/left.png</file>
-    <file>images/simulator/X9D2019/left_exit.png</file>
-    <file>images/simulator/X9D2019/left_menu.png</file>
-    <file>images/simulator/X9D2019/left_page.png</file>
-    <file>images/simulator/X9D2019/right.png</file>
-    <file>images/simulator/X9D2019/right_enter.png</file>
-    <file>images/simulator/X9D2019/top.png</file>
-    <file>images/simulator/X9LITE/bottom.png</file>
-    <file>images/simulator/X9LITE/left.png</file>
-    <file>images/simulator/X9LITE/left_exit.png</file>
-    <file>images/simulator/X9LITE/left_menu.png</file>
-    <file>images/simulator/X9LITE/left_page.png</file>
-    <file>images/simulator/X9LITE/left_scrnshot.png</file>
-    <file>images/simulator/X9LITE/right.png</file>
-    <file>images/simulator/X9LITE/right_ent.png</file>
-    <file>images/simulator/X9LITE/top.png</file>
-    <file>images/simulator/XLITE/bottom.png</file>
-    <file>images/simulator/XLITE/left.png</file>
-    <file>images/simulator/XLITE/left_scrnshot.png</file>
-    <file>images/simulator/XLITE/right.png</file>
-    <file>images/simulator/XLITE/right_ent.png</file>
-    <file>images/simulator/XLITE/top.png</file>
-    <file>images/simulator/XLITE/right_exit.png</file>
-    <file>images/simulator/XLITE/right_shift.png</file>
-    <file>images/simulator/XLITE/right_right.png</file>
-    <file>images/simulator/XLITE/right_left.png</file>
-    <file>images/simulator/XLITE/right_up.png</file>
-    <file>images/simulator/XLITE/right_down.png</file>
-    <file>images/simulator/LR3PRO/top.png</file>
-    <file>images/simulator/LR3PRO/bottom.png</file>
-    <file>images/simulator/LR3PRO/left.png</file>
-    <file>images/simulator/LR3PRO/right.png</file>
-    <file>images/simulator/LR3PRO/right_plus.png</file>
-    <file>images/simulator/LR3PRO/right_minus.png</file>
-    <file>images/simulator/LR3PRO/right_up.png</file>
-    <file>images/simulator/LR3PRO/right_down.png</file>
-    <file>images/simulator/LR3PRO/right_enter.png</file>
-    <file>images/simulator/LR3PRO/left_escape.png</file>
-    <file>images/simulator/Commando8/left-mdl.png</file>
-    <file>images/simulator/Commando8/left-rtn.png</file>
-    <file>images/simulator/Commando8/left-sys.png</file>
-    <file>images/simulator/Commando8/right-up.png</file>
-    <file>images/simulator/Commando8/right-dn.png</file>
-    <file>images/simulator/Commando8/right-pageup.png</file>
-    <file>images/simulator/Commando8/right-pagedn.png</file>
-    <file>images/simulator/Commando8/right-ent.png</file>
-    <file>images/simulator/Commando8/top.png</file>
-    <file>images/simulator/Commando8/bottom.png</file>
-    <file>images/simulator/JumperT12/right_up.png</file>
-    <file>images/simulator/JumperT12/right_down.png</file>
-    <file>images/simulator/JumperT12/right_right.png</file>
-    <file>images/simulator/JumperT12/right_left.png</file>
-    <file>images/simulator/JumperT12/left_ent.png</file>
-    <file>images/simulator/JumperT12/left_exit.png</file>
-    <file>images/simulator/JumperT12/JumperT12.png</file>
-    <file>images/simulator/JumperT12/JumperT12-208.png</file>
-    <file>images/simulator/JumperT12/JumperT12-left.png</file>
-    <file>images/simulator/JumperT12/JumperT12-right.png</file>
-    <file>images/simulator/JumperT12/JumperT12-x.png</file>
-    <file>images/simulator/JumperT12/JumperT12-center.png</file>
-    <file>images/simulator/JumperT12/JumperT12-top.png</file>
-    <file>images/simulator/JumperTLITE/bottom.png</file>
-    <file>images/simulator/JumperTLITE/bottom_right.png</file>
-    <file>images/simulator/JumperTLITE/bottom_left.png</file>
-    <file>images/simulator/JumperTLITE/left.png</file>
-    <file>images/simulator/JumperTLITE/left_top.png</file>
-    <file>images/simulator/JumperTLITE/left_bottom.png</file>
-    <file>images/simulator/JumperTLITE/right.png</file>
-    <file>images/simulator/JumperTLITE/right_top.png</file>
-    <file>images/simulator/JumperTLITE/right_bottom.png</file>
-    <file>images/simulator/JumperTLITE/top.png</file>
-    <file>images/simulator/JumperTPRO/bottom.png</file>
-    <file>images/simulator/JumperTPRO/left.png</file>
-    <file>images/simulator/JumperTPRO/right.png</file>
-    <file>images/simulator/JumperTPRO/top.png</file>
-    <file>images/simulator/JumperTPROS/bottom.png</file>
-    <file>images/simulator/JumperTPROS/left.png</file>
-    <file>images/simulator/JumperTPROS/right.png</file>
-    <file>images/simulator/JumperTPROS/right-ent.png</file>
-    <file>images/simulator/JumperTPROS/top.png</file>
-    <file>images/simulator/JumperTPROS/exit.png</file>
-    <file>images/simulator/JumperTPROS/menu.png</file>
-    <file>images/simulator/JumperTPROS/page.png</file>
-    <file>images/simulator/JumperBumblebee/top.png</file>
-    <file>images/simulator/JumperBumblebee/bottom.png</file>
-    <file>images/simulator/JumperBumblebee/enter.png</file>
-    <file>images/simulator/JumperBumblebee/exit.png</file>
-    <file>images/simulator/JumperBumblebee/left.png</file>
-    <file>images/simulator/JumperBumblebee/menu.png</file>
-    <file>images/simulator/JumperBumblebee/page.png</file>
-    <file>images/simulator/JumperBumblebee/right.png</file>
-    <file>images/simulator/TX12/left.png</file>
-    <file>images/simulator/TX12/left-pageup.png</file>
-    <file>images/simulator/TX12/left-pagedn.png</file>
-    <file>images/simulator/TX12/left-rtn.png</file>
-    <file>images/simulator/TX12/left-sys.png</file>
-    <file>images/simulator/TX12/left-tele.png</file>
-    <file>images/simulator/TX12/right.png</file>
-    <file>images/simulator/TX12/right-ent.png</file>
-    <file>images/simulator/TX12/right-mdl.png</file>
-    <file>images/simulator/TX12/bottom.png</file>
-    <file>images/simulator/TX12/top.png</file>
-    <file>images/simulator/Zorro/left.png</file>
-    <file>images/simulator/Zorro/left-pageup.png</file>
-    <file>images/simulator/Zorro/left-pagedn.png</file>
-    <file>images/simulator/Zorro/left-rtn.png</file>
-    <file>images/simulator/Zorro/left-sys.png</file>
-    <file>images/simulator/Zorro/right-tele.png</file>
-    <file>images/simulator/Zorro/right.png</file>
-    <file>images/simulator/Zorro/right-ent.png</file>
-    <file>images/simulator/Zorro/right-mdl.png</file>
-    <file>images/simulator/Zorro/bottom.png</file>
-    <file>images/simulator/Zorro/top.png</file>
-    <file>images/simulator/Boxer/bottom.png</file>
-    <file>images/simulator/Boxer/left.png</file>
-    <file>images/simulator/Boxer/left-sys.png</file>
-    <file>images/simulator/Boxer/left-pageup.png</file>
-    <file>images/simulator/Boxer/left-pagedn.png</file>
-    <file>images/simulator/Boxer/left-rtn.png</file>
-    <file>images/simulator/Boxer/left-tele.png</file>
-    <file>images/simulator/Boxer/right.png</file>
-    <file>images/simulator/Boxer/right-mdl.png</file>
-    <file>images/simulator/Boxer/right-ent.png</file>
-    <file>images/simulator/Boxer/top.png</file>
-    <file>images/simulator/T8/left.png</file>
-    <file>images/simulator/T8/left-pageup.png</file>
-    <file>images/simulator/T8/left-pagedn.png</file>
-    <file>images/simulator/T8/left-rtn.png</file>
-    <file>images/simulator/T8/left-sys.png</file>
-    <file>images/simulator/T8/right.png</file>
-    <file>images/simulator/T8/right-ent.png</file>
-    <file>images/simulator/T8/right-mdl.png</file>
-    <file>images/simulator/T8/right-up.png</file>
-    <file>images/simulator/T8/right-dn.png</file>
-    <file>images/simulator/T8/bottom.png</file>
-    <file>images/simulator/T8/top.png</file>
-    <file>images/simulator/Fatfish/F16/left.png</file>
-    <file>images/simulator/Fatfish/F16/right.png</file>
-    <file>images/simulator/Fatfish/F16/top.png</file>
-    <file>images/simulator/Fatfish/F16/bottom.png</file>
-    <file>images/simulator/JumperT12max/bottom.png</file>
-    <file>images/simulator/JumperT12max/left.png</file>
-    <file>images/simulator/JumperT12max/right.png</file>
-    <file>images/simulator/JumperT12max/right-ent.png</file>
-    <file>images/simulator/JumperT12max/top.png</file>
-    <file>images/simulator/JumperT12max/exit.png</file>
-    <file>images/simulator/JumperT12max/menu.png</file>
-    <file>images/simulator/JumperT12max/page.png</file>
-    <file>images/simulator/JumperT14/bottom.png</file>
-    <file>images/simulator/JumperT14/left.png</file>
-    <file>images/simulator/JumperT14/right.png</file>
-    <file>images/simulator/JumperT14/top.png</file>
-    <file>images/simulator/JumperT15/left.png</file>
-    <file>images/simulator/JumperT15/right.png</file>
-    <file>images/simulator/JumperT15/top.png</file>
-    <file>images/simulator/JumperT15/bottom.png</file>
-    <file>images/simulator/JumperT15/model.png</file>
-    <file>images/simulator/JumperT15/exit.png</file>
-    <file>images/simulator/JumperT15/page.png</file>
-    <file>images/simulator/JumperT16/left.png</file>
-    <file>images/simulator/JumperT16/right.png</file>
-    <file>images/simulator/JumperT16/top.png</file>
-    <file>images/simulator/JumperT16/bottom.png</file>
-    <file>images/simulator/JumperT16/left_mdl.png</file>
-    <file>images/simulator/JumperT16/left_page.png</file>
-    <file>images/simulator/JumperT16/left_scrnsht.png</file>
-    <file>images/simulator/JumperT16/left_sys.png</file>
-    <file>images/simulator/JumperT16/left_tele.png</file>
-    <file>images/simulator/JumperT16/right_ent.png</file>
-    <file>images/simulator/JumperT16/right_rtn.png</file>
-    <file>images/simulator/JumperT18/left.png</file>
-    <file>images/simulator/JumperT18/right.png</file>
-    <file>images/simulator/JumperT18/top.png</file>
-    <file>images/simulator/JumperT18/bottom.png</file>
-    <file>images/simulator/JumperT18/left_mdl.png</file>
-    <file>images/simulator/JumperT18/left_page.png</file>
-    <file>images/simulator/JumperT18/left_sys.png</file>
-    <file>images/simulator/JumperT18/left_tele.png</file>
-    <file>images/simulator/JumperT18/right_ent.png</file>
-    <file>images/simulator/JumperT18/right_rtn.png</file>
-    <file>images/simulator/JumperT20/left.png</file>
-    <file>images/simulator/JumperT20/right.png</file>
-    <file>images/simulator/JumperT20/top.png</file>
-    <file>images/simulator/JumperT20/bottom.png</file>
-    <file>images/simulator/TX16S/left.png</file>
-    <file>images/simulator/TX16S/right.png</file>
-    <file>images/simulator/TX16S/top.png</file>
-    <file>images/simulator/TX16S/bottom.png</file>
-    <file>images/simulator/TX16S/left_page.png</file>
-    <file>images/simulator/TX16S/left_page2.png</file>
-    <file>images/simulator/TX16S/left_rtn.png</file>
-    <file>images/simulator/TX16S/left_sys.png</file>
-    <file>images/simulator/TX16S/left_tele.png</file>
-    <file>images/simulator/TX16S/right_ent.png</file>
-    <file>images/simulator/TX16S/right_mdl.png</file>
-    <file>images/simulator/NV14/top.png</file>
-    <file>images/simulator/NV14/bottom.png</file>
-    <file>images/simulator/NV14/lhs.png</file>
-    <file>images/simulator/NV14/rhs.png</file>
-    <file>images/simulator/NV14/lhs_hat_left.png</file>
-    <file>images/simulator/NV14/lhs_hat_right.png</file>
-    <file>images/simulator/NV14/lhs_hat_up.png</file>
-    <file>images/simulator/NV14/lhs_hat_down.png</file>
-    <file>images/simulator/NV14/lhs_hat_press.png</file>
-    <file>images/simulator/NV14/rhs_hat_left.png</file>
-    <file>images/simulator/NV14/rhs_hat_right.png</file>
-    <file>images/simulator/NV14/rhs_hat_up.png</file>
-    <file>images/simulator/NV14/rhs_hat_down.png</file>
-    <file>images/simulator/NV14/rhs_hat_press.png</file>
-    <file>images/simulator/PL18/left.png</file>
-    <file>images/simulator/PL18/right.png</file>
-    <file>images/simulator/PL18/top.png</file>
-    <file>images/simulator/PL18/bottom.png</file>
-    <file>images/simulator/Pocket/left.png</file>
-    <file>images/simulator/Pocket/right.png</file>
-    <file>images/simulator/Pocket/top.png</file>
-    <file>images/simulator/Pocket/bottom.png</file>
-    <file>images/simulator/V16/left.png</file>
-    <file>images/simulator/V16/left_pagedn.png</file>
-    <file>images/simulator/V16/left_pageup.png</file>
-    <file>images/simulator/V16/left_rtn.png</file>
-    <file>images/simulator/V16/left_sys.png</file>
-    <file>images/simulator/V16/left_tele.png</file>
-    <file>images/simulator/V16/right.png</file>
-    <file>images/simulator/V16/right_ent.png</file>
-    <file>images/simulator/V16/right_mdl.png</file>    
    <file>images/wizard/ailerons.png</file>
    <file>images/wizard/airbrakes.png</file>
    <file>images/wizard/elevons.png</file>
@@ -96,6 +96,9 @@

 #define CPN_STR_SRC_INDICATOR_NEG      QCoreApplication::translate("RawSource", "-")             // Source negative value indicator.

-#define EDGETX_HOME_PAGE_URL           "https://edgetx.org"
+#define EDGETX_HOME_PAGE_URL           QStringLiteral("https://edgetx.org")
+#define EDGETX_DONATE_URL              QStringLiteral("https://opencollective.com/edgetx/donate")
+#define EDGETX_COMMIT_URL              QStringLiteral("https://github.com/EdgeTX/edgetx/commit/")
+#define EDGETX_ISSUES_URL              QStringLiteral("https://github.com/EdgeTX/edgetx/issues/new/choose")

 #define CPN_ADC_REFACTOR_VERSION       "2.10.0"
@@ -321,6 +321,9 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
      // TX12, TX12MK2, ZORRO, BOXER, T8, TLITE, TPRO, LR3PRO, COMMANDO8
      return (IS_FAMILY_HORUS_OR_T16(board) && !IS_HORUS_X12S(board)) || IS_FAMILY_T12(board);

+    case HasBacklightColor:
+      return IS_TARANIS_PLUS(board) || IS_TARANIS_X9DP_2019(board);
+
    case HasColorLcd:
      return IS_FAMILY_HORUS_OR_T16(board);

@@ -347,9 +350,13 @@ int Boards::getCapability(Board::Type board, Board::Capability capability)
      return ((IS_TARANIS_X9LITE(board) || (IS_TARANIS_XLITE(board) && !IS_TARANIS_X9LITES(board)) ||
              IS_TARANIS_X9DP_2019(board) || IS_TARANIS_X7_ACCESS(board) || IS_RADIOMASTER_ZORRO(board) ||
              IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_POCKET(board)) ||
-              IS_FAMILY_T16(board) || IS_FAMILY_HORUS(board) || 
+              IS_FAMILY_T16(board) || IS_FAMILY_HORUS(board) ||
              (getCapability(board, HasExternalModuleSupport) && (IS_TARANIS(board) && !IS_FAMILY_T12(board))));

+    case LcdOLED:
+      return IS_BETAFPV_LR3PRO(board) || IS_JUMPER_TPROV2(board) || IS_JUMPER_TPROS(board) || IS_JUMPER_T20(board) ||
+             IS_JUMPER_T14(board) || IS_JUMPER_BUMBLEBEE(board) || IS_RADIOMASTER_GX12(board);
+
    case LcdDepth:
      if (IS_FAMILY_HORUS_OR_T16(board))
        return 16;
@@ -212,6 +212,7 @@ namespace Board {
    Gyros,
    GyroAxes,
    HasAudioMuteGPIO,
+    HasBacklightColor,
    HasColorLcd,
    HasExternalModuleSupport,
    HasIMU,
@@ -223,6 +224,7 @@ namespace Board {
    HasTrainerModuleCPPM,
    HasTrainerModuleSBUS,
    HasVBat,
+    LcdOLED,
    LcdDepth,
    LcdHeight,
    LcdWidth,
@@ -326,13 +326,11 @@ int OpenTxFirmware::getCapability(::Capability capability)
    case HasFlySkyGimbals:
      return (IS_RADIOMASTER_TX16S(board) && id.contains("flyskygimbals"));
    case RotaryEncoderNavigation:
-      return (IS_TARANIS_X9E(board) || IS_TARANIS_X9DP_2019(board) ||
-              IS_TARANIS_X7(board) || IS_JUMPER_TPRO(board) ||
-              IS_TARANIS_X9LITE(board) || IS_RADIOMASTER_TX12(board) ||
-              IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_ZORRO(board) ||
-              IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_TX16S(board) ||
-              IS_JUMPER_T18(board) || IS_JUMPER_T20(board) ||
-              IS_RADIOMASTER_POCKET(board) || IS_RADIOMASTER_MT12(board));
+      return (IS_TARANIS_X7(board) || IS_TARANIS_X9DP_2019(board) || IS_TARANIS_X9E(board) || IS_TARANIS_X9LITE(board) ||
+              IS_JUMPER_T15(board) || IS_JUMPER_T18(board) || IS_JUMPER_T20(board) || IS_JUMPER_TPRO(board) ||
+              IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_GX12(board) || IS_RADIOMASTER_MT12(board) ||
+              IS_RADIOMASTER_POCKET(board) || IS_RADIOMASTER_TX12(board) || IS_RADIOMASTER_TX12_MK2(board) ||
+              IS_RADIOMASTER_TX16S(board) || IS_RADIOMASTER_ZORRO(board));
    case HasSoftwareSerialPower:
      return IS_RADIOMASTER_TX16S(board);
    case HasIntModuleMulti:
@@ -339,7 +339,7 @@ ui(new Ui::GeneralSetup)
    ui->stickReverse4->hide();
  }

-  if (IS_TARANIS_PLUS(board)) {
+  if (Boards::getCapability(board, Board::HasBacklightColor)) {
    ui->backlightColor_SL->setValue(generalSettings.backlightColor);
  }
  else {
--- a/Show More
+++ b/Show More