diff --git a/companion/src/apppreferencesdialog.cpp b/companion/src/apppreferencesdialog.cpp index 13d86e902..ee51eff3f 100644 --- a/companion/src/apppreferencesdialog.cpp +++ b/companion/src/apppreferencesdialog.cpp @@ -32,6 +32,8 @@ #include "filtereditemmodels.h" #include "updates/updatefactories.h" #include "updates/updateoptionsdialog.h" +#include +#include 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()) { diff --git a/companion/src/apppreferencesdialog.h b/companion/src/apppreferencesdialog.h index c96caa693..efc87e500 100644 --- a/companion/src/apppreferencesdialog.h +++ b/companion/src/apppreferencesdialog.h @@ -79,6 +79,8 @@ class AppPreferencesDialog : public QDialog void on_joystickcalButton_clicked(); #endif + void on_btnRadioColor_clicked(); + private: void initSettings(); void populateFirmwareOptions(const Firmware *); diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui index c7ed3d7d5..f98d802c1 100644 --- a/companion/src/apppreferencesdialog.ui +++ b/companion/src/apppreferencesdialog.ui @@ -52,55 +52,23 @@ Radio Profile - - - - true - + + - + 0 0 - General Settings Label - - - - - - - - - - - 0 - 0 - - - - Options + SD Structure path - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - 0 - 0 - - - - Qt::Horizontal - - - - + @@ -113,278 +81,6 @@ - - - - If set it will override the application general setting - - - false - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - General Settings - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 5 - - - 4 - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 6 - - - - - - 0 - 0 - - - - - 75 - true - - - - Splash Screen - - - - - - - true - - - true - - - - - - - Select Image - - - - - - - - 0 - 0 - - - - - 128 - 64 - - - - - 212 - 64 - - - - QFrame::StyledPanel - - - QFrame::Plain - - - 1 - - - - - - true - - - - - - - Clear Image - - - - - - - - 0 - 0 - - - - Qt::Horizontal - - - - - - - - - - The profile specific folder, if set, will override general Backup folder - - - Select Folder - - - - - - - true - - - - - - - - - - External Module - - - - - - - Prompt to run SD Sync after update - - - - - - - Default Int. Module - - - - - - - - 0 - 0 - - - - - 75 - true - - - - Radio Type - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 75 - true - - - - Other Settings - - - - - - - Qt::Vertical - - - - 20 - 5 - - - - @@ -521,6 +217,156 @@ + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 6 + + + + + + 0 + 0 + + + + + 75 + true + + + + Splash Screen + + + + + + + true + + + true + + + + + + + Select Image + + + + + + + + 0 + 0 + + + + + 128 + 64 + + + + + 212 + 64 + + + + QFrame::StyledPanel + + + QFrame::Plain + + + 1 + + + + + + true + + + + + + + Clear Image + + + + + + + + 0 + 0 + + + + Qt::Horizontal + + + + + + + + + + Prompt to run SD Sync after update + + + + + + + true + + + + 0 + 0 + + + + General Settings Label + + + + + + + + 0 + 0 + + + + Qt::Horizontal + + + @@ -575,19 +421,10 @@ Mode 4: - - - - - - - true - + + - - - - false + Default Int. Module @@ -607,71 +444,39 @@ Mode 4: - - - - - 0 - 0 - + + + + The profile specific folder, if set, will override general Backup folder - - Language - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - Default Stick Mode - - - - - Select Folder - - - - - 0 - 0 - + + + + + + + If set it will override the application general setting - - SD Structure path - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + false - - + + 0 0 - - The profile specific folder, if set, will override general Backup folder - - Backup folder + General Settings @@ -691,19 +496,6 @@ Mode 4: - - - - - 0 - 0 - - - - Qt::Horizontal - - - @@ -723,6 +515,238 @@ Mode 4: + + + + + 0 + 0 + + + + + 75 + true + + + + Other Settings + + + + + + + + + + + 0 + 0 + + + + Language + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Select Folder + + + + + + + + + + + 0 + 0 + + + + Options + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Default Stick Mode + + + + + + + + 0 + 0 + + + + + + + + External Module + + + + + + + + 0 + 0 + + + + The profile specific folder, if set, will override general Backup folder + + + Backup folder + + + + + + + + 0 + 0 + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 5 + + + 4 + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Radio Type + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + + 20 + 5 + + + + + + + + true + + + + + + false + + + + + + + true + + + + + + + Simulator Case Colour + + + + + + + true + + + + + + + + + + Select Colour + + + @@ -1166,60 +1190,52 @@ Mode 4: 6 - - + + + + Display Scroll Buttons + + + + + + + true + - + 0 0 - + - 50 - 16777215 + 0 + 0 - - 1 - - - 0.500000000000000 - - - 3.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 + + true - - - - - 0 - 0 - + + + + Qt::Vertical - - QComboBox::AdjustToContents + + + 20 + 5 + - + - - - - - 0 - 0 - - + + - Screenshot capture folder + Calibrate @@ -1258,20 +1274,10 @@ Mode 4: - - + + - Calibrate - - - - - - - Select Folder - - - false + Disable 'Cannot open joystick, joystick disabled' warning @@ -1288,103 +1294,6 @@ Mode 4: - - - - - 0 - 0 - - - - Enable - - - - - - - Qt::Vertical - - - - 20 - 5 - - - - - - - - - 0 - 0 - - - - Joystick - - - - - - - - 0 - 0 - - - - Simulator Volume Gain - - - - - - - - 0 - 0 - - - - Simulator BackLight - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - true - - - - 0 - 0 - - - - - 0 - 0 - - - - true - - - - - - - Simulator controls - - - @@ -1405,10 +1314,149 @@ Mode 4: - - + + + + + 0 + 0 + + - Disable 'Cannot open joystick, joystick disabled' warning + BackLight Color + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + Screenshot capture folder + + + + + + + + + + + 0 + 0 + + + + Enable + + + + + + + + 0 + 0 + + + + Simulator Volume Gain + + + + + + + Enable for mouse without scroll wheel + + + + + + + + 0 + 0 + + + + + 50 + 16777215 + + + + 1 + + + 0.500000000000000 + + + 3.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Position of Keys + + + + + + + Simulator controls + + + + + + + Select Folder + + + false + + + + + + + + 0 + 0 + + + + QComboBox::AdjustToContents + + + + + + + + 0 + 0 + + + + Joystick diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index f1ad0c30b..b78cf3506 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -6,6 +6,7 @@ images/screenshot.png images/splash.png images/companion-title.png + images/simulator-title.png images/maps.png images/track.png images/track0.png @@ -46,323 +47,6 @@ images/simulator/icons/svg/trainer-active.svg images/simulator/icons/svg/word_wrap.svg images/simulator/icons/svg/word_wrap-on.svg - images/simulator/X12/middle.png - images/simulator/X12/left.png - images/simulator/X12/right.png - images/simulator/X12/top.png - images/simulator/X12/bottom.png - images/simulator/X12/led.png - images/simulator/X12/border-right.png - images/simulator/X12/left_btn1.png - images/simulator/X12/left_btn2.png - images/simulator/X12/left_scrnsht.png - images/simulator/X12/right_btnU.png - images/simulator/X12/right_btnL.png - images/simulator/X12/right_btnD.png - images/simulator/X12/right_btnR.png - images/simulator/X12/right_ent.png - images/simulator/X10/left.png - images/simulator/X10/right.png - images/simulator/X10/top.png - images/simulator/X10/bottom.png - images/simulator/X10/left_mdl.png - images/simulator/X10/left_page.png - images/simulator/X10/left_scrnsht.png - images/simulator/X10/left_rtn.png - images/simulator/X10/left_sys.png - images/simulator/X10/left_tele.png - images/simulator/X10/right_ent.png - images/simulator/9X/9xdb.png - images/simulator/9X/9xdl.png - images/simulator/9X/9xdr.png - images/simulator/9X/9xdt.png - images/simulator/9X/9xdb-bl.png - images/simulator/9X/9xdl-bl.png - images/simulator/9X/9xdr-bl.png - images/simulator/9X/9xdt-bl.png - images/simulator/9X/9xdb-gr.png - images/simulator/9X/9xdl-gr.png - images/simulator/9X/9xdr-gr.png - images/simulator/9X/9xdt-gr.png - images/simulator/9X/9xdb-or.png - images/simulator/9X/9xdl-or.png - images/simulator/9X/9xdr-or.png - images/simulator/9X/9xdt-or.png - images/simulator/9X/9xdb-yl.png - images/simulator/9X/9xdl-yl.png - images/simulator/9X/9xdr-yl.png - images/simulator/9X/9xdt-yl.png - images/simulator/9X/9xdb-rd.png - images/simulator/9X/9xdl-rd.png - images/simulator/9X/9xdr-rd.png - images/simulator/9X/9xdt-rd.png - images/simulator/9X/9xmenu.png - images/simulator/9X/9xmenumenu.png - images/simulator/9X/9xmenuexit.png - images/simulator/9X/9xcurs.png - images/simulator/9X/9xcursup.png - images/simulator/9X/9xcursplus.png - images/simulator/9X/9xcursmin.png - images/simulator/9X/9xcursdown.png - images/simulator/9X/9xcursphoto.png - images/simulator/X9D/x9b0.png - images/simulator/X9D/x9l0.png - images/simulator/X9D/x9l1.png - images/simulator/X9D/x9l2.png - images/simulator/X9D/x9l3.png - images/simulator/X9D/x9l4.png - images/simulator/X9D/x9r0.png - images/simulator/X9D/x9r1.png - images/simulator/X9D/x9r2.png - images/simulator/X9D/x9r3.png - images/simulator/X9D/x9s0.png - images/simulator/X9D/x9t0.png - images/simulator/X7/bottom.png - images/simulator/X7/left.png - images/simulator/X7/left_exit.png - images/simulator/X7/left_menu.png - images/simulator/X7/left_page.png - images/simulator/X7/left_scrnshot.png - images/simulator/X7/right.png - images/simulator/X7/right_ent.png - images/simulator/X7/top.png - images/simulator/X9E/bottom.png - images/simulator/X9E/left.png - images/simulator/X9E/left_exit.png - images/simulator/X9E/left_menu.png - images/simulator/X9E/left_page.png - images/simulator/X9E/left_scrnshot.png - images/simulator/X9E/right.png - images/simulator/X9E/right_enter.png - images/simulator/X9E/top.png - images/simulator/X9D2019/bottom.png - images/simulator/X9D2019/bottom_scrnshot.png - images/simulator/X9D2019/left.png - images/simulator/X9D2019/left_exit.png - images/simulator/X9D2019/left_menu.png - images/simulator/X9D2019/left_page.png - images/simulator/X9D2019/right.png - images/simulator/X9D2019/right_enter.png - images/simulator/X9D2019/top.png - images/simulator/X9LITE/bottom.png - images/simulator/X9LITE/left.png - images/simulator/X9LITE/left_exit.png - images/simulator/X9LITE/left_menu.png - images/simulator/X9LITE/left_page.png - images/simulator/X9LITE/left_scrnshot.png - images/simulator/X9LITE/right.png - images/simulator/X9LITE/right_ent.png - images/simulator/X9LITE/top.png - images/simulator/XLITE/bottom.png - images/simulator/XLITE/left.png - images/simulator/XLITE/left_scrnshot.png - images/simulator/XLITE/right.png - images/simulator/XLITE/right_ent.png - images/simulator/XLITE/top.png - images/simulator/XLITE/right_exit.png - images/simulator/XLITE/right_shift.png - images/simulator/XLITE/right_right.png - images/simulator/XLITE/right_left.png - images/simulator/XLITE/right_up.png - images/simulator/XLITE/right_down.png - images/simulator/LR3PRO/top.png - images/simulator/LR3PRO/bottom.png - images/simulator/LR3PRO/left.png - images/simulator/LR3PRO/right.png - images/simulator/LR3PRO/right_plus.png - images/simulator/LR3PRO/right_minus.png - images/simulator/LR3PRO/right_up.png - images/simulator/LR3PRO/right_down.png - images/simulator/LR3PRO/right_enter.png - images/simulator/LR3PRO/left_escape.png - images/simulator/Commando8/left-mdl.png - images/simulator/Commando8/left-rtn.png - images/simulator/Commando8/left-sys.png - images/simulator/Commando8/right-up.png - images/simulator/Commando8/right-dn.png - images/simulator/Commando8/right-pageup.png - images/simulator/Commando8/right-pagedn.png - images/simulator/Commando8/right-ent.png - images/simulator/Commando8/top.png - images/simulator/Commando8/bottom.png - images/simulator/JumperT12/right_up.png - images/simulator/JumperT12/right_down.png - images/simulator/JumperT12/right_right.png - images/simulator/JumperT12/right_left.png - images/simulator/JumperT12/left_ent.png - images/simulator/JumperT12/left_exit.png - images/simulator/JumperT12/JumperT12.png - images/simulator/JumperT12/JumperT12-208.png - images/simulator/JumperT12/JumperT12-left.png - images/simulator/JumperT12/JumperT12-right.png - images/simulator/JumperT12/JumperT12-x.png - images/simulator/JumperT12/JumperT12-center.png - images/simulator/JumperT12/JumperT12-top.png - images/simulator/JumperTLITE/bottom.png - images/simulator/JumperTLITE/bottom_right.png - images/simulator/JumperTLITE/bottom_left.png - images/simulator/JumperTLITE/left.png - images/simulator/JumperTLITE/left_top.png - images/simulator/JumperTLITE/left_bottom.png - images/simulator/JumperTLITE/right.png - images/simulator/JumperTLITE/right_top.png - images/simulator/JumperTLITE/right_bottom.png - images/simulator/JumperTLITE/top.png - images/simulator/JumperTPRO/bottom.png - images/simulator/JumperTPRO/left.png - images/simulator/JumperTPRO/right.png - images/simulator/JumperTPRO/top.png - images/simulator/JumperTPROS/bottom.png - images/simulator/JumperTPROS/left.png - images/simulator/JumperTPROS/right.png - images/simulator/JumperTPROS/right-ent.png - images/simulator/JumperTPROS/top.png - images/simulator/JumperTPROS/exit.png - images/simulator/JumperTPROS/menu.png - images/simulator/JumperTPROS/page.png - images/simulator/JumperBumblebee/top.png - images/simulator/JumperBumblebee/bottom.png - images/simulator/JumperBumblebee/enter.png - images/simulator/JumperBumblebee/exit.png - images/simulator/JumperBumblebee/left.png - images/simulator/JumperBumblebee/menu.png - images/simulator/JumperBumblebee/page.png - images/simulator/JumperBumblebee/right.png - images/simulator/TX12/left.png - images/simulator/TX12/left-pageup.png - images/simulator/TX12/left-pagedn.png - images/simulator/TX12/left-rtn.png - images/simulator/TX12/left-sys.png - images/simulator/TX12/left-tele.png - images/simulator/TX12/right.png - images/simulator/TX12/right-ent.png - images/simulator/TX12/right-mdl.png - images/simulator/TX12/bottom.png - images/simulator/TX12/top.png - images/simulator/Zorro/left.png - images/simulator/Zorro/left-pageup.png - images/simulator/Zorro/left-pagedn.png - images/simulator/Zorro/left-rtn.png - images/simulator/Zorro/left-sys.png - images/simulator/Zorro/right-tele.png - images/simulator/Zorro/right.png - images/simulator/Zorro/right-ent.png - images/simulator/Zorro/right-mdl.png - images/simulator/Zorro/bottom.png - images/simulator/Zorro/top.png - images/simulator/Boxer/bottom.png - images/simulator/Boxer/left.png - images/simulator/Boxer/left-sys.png - images/simulator/Boxer/left-pageup.png - images/simulator/Boxer/left-pagedn.png - images/simulator/Boxer/left-rtn.png - images/simulator/Boxer/left-tele.png - images/simulator/Boxer/right.png - images/simulator/Boxer/right-mdl.png - images/simulator/Boxer/right-ent.png - images/simulator/Boxer/top.png - images/simulator/T8/left.png - images/simulator/T8/left-pageup.png - images/simulator/T8/left-pagedn.png - images/simulator/T8/left-rtn.png - images/simulator/T8/left-sys.png - images/simulator/T8/right.png - images/simulator/T8/right-ent.png - images/simulator/T8/right-mdl.png - images/simulator/T8/right-up.png - images/simulator/T8/right-dn.png - images/simulator/T8/bottom.png - images/simulator/T8/top.png - images/simulator/Fatfish/F16/left.png - images/simulator/Fatfish/F16/right.png - images/simulator/Fatfish/F16/top.png - images/simulator/Fatfish/F16/bottom.png - images/simulator/JumperT12max/bottom.png - images/simulator/JumperT12max/left.png - images/simulator/JumperT12max/right.png - images/simulator/JumperT12max/right-ent.png - images/simulator/JumperT12max/top.png - images/simulator/JumperT12max/exit.png - images/simulator/JumperT12max/menu.png - images/simulator/JumperT12max/page.png - images/simulator/JumperT14/bottom.png - images/simulator/JumperT14/left.png - images/simulator/JumperT14/right.png - images/simulator/JumperT14/top.png - images/simulator/JumperT15/left.png - images/simulator/JumperT15/right.png - images/simulator/JumperT15/top.png - images/simulator/JumperT15/bottom.png - images/simulator/JumperT15/model.png - images/simulator/JumperT15/exit.png - images/simulator/JumperT15/page.png - images/simulator/JumperT16/left.png - images/simulator/JumperT16/right.png - images/simulator/JumperT16/top.png - images/simulator/JumperT16/bottom.png - images/simulator/JumperT16/left_mdl.png - images/simulator/JumperT16/left_page.png - images/simulator/JumperT16/left_scrnsht.png - images/simulator/JumperT16/left_sys.png - images/simulator/JumperT16/left_tele.png - images/simulator/JumperT16/right_ent.png - images/simulator/JumperT16/right_rtn.png - images/simulator/JumperT18/left.png - images/simulator/JumperT18/right.png - images/simulator/JumperT18/top.png - images/simulator/JumperT18/bottom.png - images/simulator/JumperT18/left_mdl.png - images/simulator/JumperT18/left_page.png - images/simulator/JumperT18/left_sys.png - images/simulator/JumperT18/left_tele.png - images/simulator/JumperT18/right_ent.png - images/simulator/JumperT18/right_rtn.png - images/simulator/JumperT20/left.png - images/simulator/JumperT20/right.png - images/simulator/JumperT20/top.png - images/simulator/JumperT20/bottom.png - images/simulator/TX16S/left.png - images/simulator/TX16S/right.png - images/simulator/TX16S/top.png - images/simulator/TX16S/bottom.png - images/simulator/TX16S/left_page.png - images/simulator/TX16S/left_page2.png - images/simulator/TX16S/left_rtn.png - images/simulator/TX16S/left_sys.png - images/simulator/TX16S/left_tele.png - images/simulator/TX16S/right_ent.png - images/simulator/TX16S/right_mdl.png - images/simulator/NV14/top.png - images/simulator/NV14/bottom.png - images/simulator/NV14/lhs.png - images/simulator/NV14/rhs.png - images/simulator/NV14/lhs_hat_left.png - images/simulator/NV14/lhs_hat_right.png - images/simulator/NV14/lhs_hat_up.png - images/simulator/NV14/lhs_hat_down.png - images/simulator/NV14/lhs_hat_press.png - images/simulator/NV14/rhs_hat_left.png - images/simulator/NV14/rhs_hat_right.png - images/simulator/NV14/rhs_hat_up.png - images/simulator/NV14/rhs_hat_down.png - images/simulator/NV14/rhs_hat_press.png - images/simulator/PL18/left.png - images/simulator/PL18/right.png - images/simulator/PL18/top.png - images/simulator/PL18/bottom.png - images/simulator/Pocket/left.png - images/simulator/Pocket/right.png - images/simulator/Pocket/top.png - images/simulator/Pocket/bottom.png - images/simulator/V16/left.png - images/simulator/V16/left_pagedn.png - images/simulator/V16/left_pageup.png - images/simulator/V16/left_rtn.png - images/simulator/V16/left_sys.png - images/simulator/V16/left_tele.png - images/simulator/V16/right.png - images/simulator/V16/right_ent.png - images/simulator/V16/right_mdl.png images/wizard/ailerons.png images/wizard/airbrakes.png images/wizard/elevons.png diff --git a/companion/src/constants.h b/companion/src/constants.h index 0d822189c..0dde000d6 100644 --- a/companion/src/constants.h +++ b/companion/src/constants.h @@ -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" diff --git a/companion/src/firmwares/boards.cpp b/companion/src/firmwares/boards.cpp index 7212287d8..356e573b7 100644 --- a/companion/src/firmwares/boards.cpp +++ b/companion/src/firmwares/boards.cpp @@ -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; diff --git a/companion/src/firmwares/boards.h b/companion/src/firmwares/boards.h index 37340c0cb..2a3a8523d 100644 --- a/companion/src/firmwares/boards.h +++ b/companion/src/firmwares/boards.h @@ -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, diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index c857049ce..9d1f26bac 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -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: diff --git a/companion/src/generaledit/generalsetup.cpp b/companion/src/generaledit/generalsetup.cpp index 7419ba7ff..18cb7a742 100644 --- a/companion/src/generaledit/generalsetup.cpp +++ b/companion/src/generaledit/generalsetup.cpp @@ -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 { diff --git a/companion/src/images/originals/simulator-title.xcf b/companion/src/images/originals/simulator-title.xcf new file mode 100644 index 000000000..75c225b59 Binary files /dev/null and b/companion/src/images/originals/simulator-title.xcf differ diff --git a/companion/src/images/simulator-title.png b/companion/src/images/simulator-title.png new file mode 100644 index 000000000..bbbccc56a Binary files /dev/null and b/companion/src/images/simulator-title.png differ diff --git a/companion/src/images/simulator/9X/9xcurs.png b/companion/src/images/simulator/9X/9xcurs.png deleted file mode 100644 index e526a44a0..000000000 Binary files a/companion/src/images/simulator/9X/9xcurs.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xcursdown.png b/companion/src/images/simulator/9X/9xcursdown.png deleted file mode 100644 index d1460c08f..000000000 Binary files a/companion/src/images/simulator/9X/9xcursdown.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xcursmin.png b/companion/src/images/simulator/9X/9xcursmin.png deleted file mode 100644 index 0cc3ee566..000000000 Binary files a/companion/src/images/simulator/9X/9xcursmin.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xcursphoto.png b/companion/src/images/simulator/9X/9xcursphoto.png deleted file mode 100644 index 7cf83599b..000000000 Binary files a/companion/src/images/simulator/9X/9xcursphoto.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xcursplus.png b/companion/src/images/simulator/9X/9xcursplus.png deleted file mode 100644 index 177975166..000000000 Binary files a/companion/src/images/simulator/9X/9xcursplus.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xcursup.png b/companion/src/images/simulator/9X/9xcursup.png deleted file mode 100644 index bb3130d4b..000000000 Binary files a/companion/src/images/simulator/9X/9xcursup.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdb-bl.png b/companion/src/images/simulator/9X/9xdb-bl.png deleted file mode 100644 index ba1dfbd4c..000000000 Binary files a/companion/src/images/simulator/9X/9xdb-bl.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdb-gr.png b/companion/src/images/simulator/9X/9xdb-gr.png deleted file mode 100644 index 89778a54f..000000000 Binary files a/companion/src/images/simulator/9X/9xdb-gr.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdb-or.png b/companion/src/images/simulator/9X/9xdb-or.png deleted file mode 100644 index c61b410ab..000000000 Binary files a/companion/src/images/simulator/9X/9xdb-or.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdb-rd.png b/companion/src/images/simulator/9X/9xdb-rd.png deleted file mode 100644 index 2d18d84af..000000000 Binary files a/companion/src/images/simulator/9X/9xdb-rd.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdb-yl.png b/companion/src/images/simulator/9X/9xdb-yl.png deleted file mode 100644 index 158f1e94e..000000000 Binary files a/companion/src/images/simulator/9X/9xdb-yl.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdb.png b/companion/src/images/simulator/9X/9xdb.png deleted file mode 100644 index e6198c2a7..000000000 Binary files a/companion/src/images/simulator/9X/9xdb.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdl-bl.png b/companion/src/images/simulator/9X/9xdl-bl.png deleted file mode 100644 index 30d1f0f95..000000000 Binary files a/companion/src/images/simulator/9X/9xdl-bl.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdl-gr.png b/companion/src/images/simulator/9X/9xdl-gr.png deleted file mode 100644 index a0da4e476..000000000 Binary files a/companion/src/images/simulator/9X/9xdl-gr.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdl-or.png b/companion/src/images/simulator/9X/9xdl-or.png deleted file mode 100644 index df98260ab..000000000 Binary files a/companion/src/images/simulator/9X/9xdl-or.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdl-rd.png b/companion/src/images/simulator/9X/9xdl-rd.png deleted file mode 100644 index 82842278a..000000000 Binary files a/companion/src/images/simulator/9X/9xdl-rd.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdl-yl.png b/companion/src/images/simulator/9X/9xdl-yl.png deleted file mode 100644 index 56b18334f..000000000 Binary files a/companion/src/images/simulator/9X/9xdl-yl.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdl.png b/companion/src/images/simulator/9X/9xdl.png deleted file mode 100644 index b4fd96045..000000000 Binary files a/companion/src/images/simulator/9X/9xdl.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdr-bl.png b/companion/src/images/simulator/9X/9xdr-bl.png deleted file mode 100644 index a7aadb322..000000000 Binary files a/companion/src/images/simulator/9X/9xdr-bl.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdr-gr.png b/companion/src/images/simulator/9X/9xdr-gr.png deleted file mode 100644 index b2e91e9c3..000000000 Binary files a/companion/src/images/simulator/9X/9xdr-gr.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdr-or.png b/companion/src/images/simulator/9X/9xdr-or.png deleted file mode 100644 index 175a136fd..000000000 Binary files a/companion/src/images/simulator/9X/9xdr-or.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdr-rd.png b/companion/src/images/simulator/9X/9xdr-rd.png deleted file mode 100644 index 8bb5cd82c..000000000 Binary files a/companion/src/images/simulator/9X/9xdr-rd.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdr-yl.png b/companion/src/images/simulator/9X/9xdr-yl.png deleted file mode 100644 index 9d8caf725..000000000 Binary files a/companion/src/images/simulator/9X/9xdr-yl.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdr.png b/companion/src/images/simulator/9X/9xdr.png deleted file mode 100644 index 929981e4a..000000000 Binary files a/companion/src/images/simulator/9X/9xdr.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdt-bl.png b/companion/src/images/simulator/9X/9xdt-bl.png deleted file mode 100644 index fc6a25f12..000000000 Binary files a/companion/src/images/simulator/9X/9xdt-bl.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdt-gr.png b/companion/src/images/simulator/9X/9xdt-gr.png deleted file mode 100644 index 9f86a1606..000000000 Binary files a/companion/src/images/simulator/9X/9xdt-gr.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdt-or.png b/companion/src/images/simulator/9X/9xdt-or.png deleted file mode 100644 index c0d42c113..000000000 Binary files a/companion/src/images/simulator/9X/9xdt-or.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdt-rd.png b/companion/src/images/simulator/9X/9xdt-rd.png deleted file mode 100644 index 5a2596611..000000000 Binary files a/companion/src/images/simulator/9X/9xdt-rd.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdt-yl.png b/companion/src/images/simulator/9X/9xdt-yl.png deleted file mode 100644 index 174033c3a..000000000 Binary files a/companion/src/images/simulator/9X/9xdt-yl.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xdt.png b/companion/src/images/simulator/9X/9xdt.png deleted file mode 100644 index a8a619a3c..000000000 Binary files a/companion/src/images/simulator/9X/9xdt.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xmenu.png b/companion/src/images/simulator/9X/9xmenu.png deleted file mode 100644 index 284f58d30..000000000 Binary files a/companion/src/images/simulator/9X/9xmenu.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xmenuexit.png b/companion/src/images/simulator/9X/9xmenuexit.png deleted file mode 100644 index 472c6e5c6..000000000 Binary files a/companion/src/images/simulator/9X/9xmenuexit.png and /dev/null differ diff --git a/companion/src/images/simulator/9X/9xmenumenu.png b/companion/src/images/simulator/9X/9xmenumenu.png deleted file mode 100644 index da933e73f..000000000 Binary files a/companion/src/images/simulator/9X/9xmenumenu.png and /dev/null differ diff --git a/companion/src/images/simulator/Boxer/bottom.png b/companion/src/images/simulator/Boxer/bottom.png deleted file mode 100644 index 6c00a1a53..000000000 Binary files a/companion/src/images/simulator/Boxer/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/Boxer/left-pagedn.png b/companion/src/images/simulator/Boxer/left-pagedn.png deleted file mode 100644 index 49ac3ec84..000000000 Binary files a/companion/src/images/simulator/Boxer/left-pagedn.png and /dev/null differ diff --git a/companion/src/images/simulator/Boxer/left-pageup.png b/companion/src/images/simulator/Boxer/left-pageup.png deleted file mode 100644 index 2dff4b2d8..000000000 Binary files a/companion/src/images/simulator/Boxer/left-pageup.png and /dev/null differ diff --git a/companion/src/images/simulator/Boxer/left-rtn.png b/companion/src/images/simulator/Boxer/left-rtn.png deleted file mode 100644 index 44cfaa2ed..000000000 Binary files a/companion/src/images/simulator/Boxer/left-rtn.png and /dev/null differ diff --git a/companion/src/images/simulator/Boxer/left-sys.png b/companion/src/images/simulator/Boxer/left-sys.png deleted file mode 100644 index e22f48796..000000000 Binary files a/companion/src/images/simulator/Boxer/left-sys.png and /dev/null differ diff --git a/companion/src/images/simulator/Boxer/left-tele.png b/companion/src/images/simulator/Boxer/left-tele.png deleted file mode 100644 index bc835305f..000000000 Binary files a/companion/src/images/simulator/Boxer/left-tele.png and /dev/null differ diff --git a/companion/src/images/simulator/Boxer/left.png b/companion/src/images/simulator/Boxer/left.png deleted file mode 100644 index 89ed37d64..000000000 Binary files a/companion/src/images/simulator/Boxer/left.png and /dev/null differ diff --git a/companion/src/images/simulator/Boxer/right-ent.png b/companion/src/images/simulator/Boxer/right-ent.png deleted file mode 100644 index 6449dea55..000000000 Binary files a/companion/src/images/simulator/Boxer/right-ent.png and /dev/null differ diff --git a/companion/src/images/simulator/Boxer/right-mdl.png b/companion/src/images/simulator/Boxer/right-mdl.png deleted file mode 100644 index 53946e275..000000000 Binary files a/companion/src/images/simulator/Boxer/right-mdl.png and /dev/null differ diff --git a/companion/src/images/simulator/Boxer/right.png b/companion/src/images/simulator/Boxer/right.png deleted file mode 100644 index bab435974..000000000 Binary files a/companion/src/images/simulator/Boxer/right.png and /dev/null differ diff --git a/companion/src/images/simulator/Boxer/top.png b/companion/src/images/simulator/Boxer/top.png deleted file mode 100644 index 10ab0f9f0..000000000 Binary files a/companion/src/images/simulator/Boxer/top.png and /dev/null differ diff --git a/companion/src/images/simulator/Commando8/bottom.png b/companion/src/images/simulator/Commando8/bottom.png deleted file mode 100644 index d4bd49202..000000000 Binary files a/companion/src/images/simulator/Commando8/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/Commando8/left-mdl.png b/companion/src/images/simulator/Commando8/left-mdl.png deleted file mode 100644 index f387b2fdb..000000000 Binary files a/companion/src/images/simulator/Commando8/left-mdl.png and /dev/null differ diff --git a/companion/src/images/simulator/Commando8/left-rtn.png b/companion/src/images/simulator/Commando8/left-rtn.png deleted file mode 100644 index 8ef0c6e25..000000000 Binary files a/companion/src/images/simulator/Commando8/left-rtn.png and /dev/null differ diff --git a/companion/src/images/simulator/Commando8/left-sys.png b/companion/src/images/simulator/Commando8/left-sys.png deleted file mode 100644 index 9d1be42d9..000000000 Binary files a/companion/src/images/simulator/Commando8/left-sys.png and /dev/null differ diff --git a/companion/src/images/simulator/Commando8/right-dn.png b/companion/src/images/simulator/Commando8/right-dn.png deleted file mode 100644 index c63e0adad..000000000 Binary files a/companion/src/images/simulator/Commando8/right-dn.png and /dev/null differ diff --git a/companion/src/images/simulator/Commando8/right-ent.png b/companion/src/images/simulator/Commando8/right-ent.png deleted file mode 100644 index 658b2ef3c..000000000 Binary files a/companion/src/images/simulator/Commando8/right-ent.png and /dev/null differ diff --git a/companion/src/images/simulator/Commando8/right-pagedn.png b/companion/src/images/simulator/Commando8/right-pagedn.png deleted file mode 100644 index 187d20765..000000000 Binary files a/companion/src/images/simulator/Commando8/right-pagedn.png and /dev/null differ diff --git a/companion/src/images/simulator/Commando8/right-pageup.png b/companion/src/images/simulator/Commando8/right-pageup.png deleted file mode 100644 index 26529c177..000000000 Binary files a/companion/src/images/simulator/Commando8/right-pageup.png and /dev/null differ diff --git a/companion/src/images/simulator/Commando8/right-up.png b/companion/src/images/simulator/Commando8/right-up.png deleted file mode 100644 index 2ff23d724..000000000 Binary files a/companion/src/images/simulator/Commando8/right-up.png and /dev/null differ diff --git a/companion/src/images/simulator/Commando8/top.png b/companion/src/images/simulator/Commando8/top.png deleted file mode 100644 index f945c91b0..000000000 Binary files a/companion/src/images/simulator/Commando8/top.png and /dev/null differ diff --git a/companion/src/images/simulator/Fatfish/F16/bottom.png b/companion/src/images/simulator/Fatfish/F16/bottom.png deleted file mode 100644 index bbf07f45f..000000000 Binary files a/companion/src/images/simulator/Fatfish/F16/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/Fatfish/F16/left.png b/companion/src/images/simulator/Fatfish/F16/left.png deleted file mode 100644 index 4e3a72d88..000000000 Binary files a/companion/src/images/simulator/Fatfish/F16/left.png and /dev/null differ diff --git a/companion/src/images/simulator/Fatfish/F16/right.png b/companion/src/images/simulator/Fatfish/F16/right.png deleted file mode 100644 index e65f319e0..000000000 Binary files a/companion/src/images/simulator/Fatfish/F16/right.png and /dev/null differ diff --git a/companion/src/images/simulator/Fatfish/F16/top.png b/companion/src/images/simulator/Fatfish/F16/top.png deleted file mode 100644 index dcb37e85d..000000000 Binary files a/companion/src/images/simulator/Fatfish/F16/top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperBumblebee/bottom.png b/companion/src/images/simulator/JumperBumblebee/bottom.png deleted file mode 100644 index aa5a464fc..000000000 Binary files a/companion/src/images/simulator/JumperBumblebee/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperBumblebee/enter.png b/companion/src/images/simulator/JumperBumblebee/enter.png deleted file mode 100644 index 2c7ef315d..000000000 Binary files a/companion/src/images/simulator/JumperBumblebee/enter.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperBumblebee/exit.png b/companion/src/images/simulator/JumperBumblebee/exit.png deleted file mode 100644 index dfa26cad7..000000000 Binary files a/companion/src/images/simulator/JumperBumblebee/exit.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperBumblebee/left.png b/companion/src/images/simulator/JumperBumblebee/left.png deleted file mode 100644 index 7175728bb..000000000 Binary files a/companion/src/images/simulator/JumperBumblebee/left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperBumblebee/menu.png b/companion/src/images/simulator/JumperBumblebee/menu.png deleted file mode 100644 index a6192e94a..000000000 Binary files a/companion/src/images/simulator/JumperBumblebee/menu.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperBumblebee/page.png b/companion/src/images/simulator/JumperBumblebee/page.png deleted file mode 100644 index e9028436b..000000000 Binary files a/companion/src/images/simulator/JumperBumblebee/page.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperBumblebee/right.png b/companion/src/images/simulator/JumperBumblebee/right.png deleted file mode 100644 index 725bb666f..000000000 Binary files a/companion/src/images/simulator/JumperBumblebee/right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperBumblebee/top.png b/companion/src/images/simulator/JumperBumblebee/top.png deleted file mode 100644 index ed0c72018..000000000 Binary files a/companion/src/images/simulator/JumperBumblebee/top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/JumperT12-208.png b/companion/src/images/simulator/JumperT12/JumperT12-208.png deleted file mode 100644 index 00cb7b759..000000000 Binary files a/companion/src/images/simulator/JumperT12/JumperT12-208.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/JumperT12-center.png b/companion/src/images/simulator/JumperT12/JumperT12-center.png deleted file mode 100644 index 4040c2bbe..000000000 Binary files a/companion/src/images/simulator/JumperT12/JumperT12-center.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/JumperT12-left.png b/companion/src/images/simulator/JumperT12/JumperT12-left.png deleted file mode 100644 index ba527bad8..000000000 Binary files a/companion/src/images/simulator/JumperT12/JumperT12-left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/JumperT12-right.png b/companion/src/images/simulator/JumperT12/JumperT12-right.png deleted file mode 100644 index 80552deff..000000000 Binary files a/companion/src/images/simulator/JumperT12/JumperT12-right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/JumperT12-top.png b/companion/src/images/simulator/JumperT12/JumperT12-top.png deleted file mode 100644 index d5585597e..000000000 Binary files a/companion/src/images/simulator/JumperT12/JumperT12-top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/JumperT12-x.png b/companion/src/images/simulator/JumperT12/JumperT12-x.png deleted file mode 100644 index 7230ecf56..000000000 Binary files a/companion/src/images/simulator/JumperT12/JumperT12-x.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/JumperT12.png b/companion/src/images/simulator/JumperT12/JumperT12.png deleted file mode 100644 index 71aa5d7a8..000000000 Binary files a/companion/src/images/simulator/JumperT12/JumperT12.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/left_ent.png b/companion/src/images/simulator/JumperT12/left_ent.png deleted file mode 100644 index ba527bad8..000000000 Binary files a/companion/src/images/simulator/JumperT12/left_ent.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/left_exit.png b/companion/src/images/simulator/JumperT12/left_exit.png deleted file mode 100644 index ba527bad8..000000000 Binary files a/companion/src/images/simulator/JumperT12/left_exit.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/left_page.png b/companion/src/images/simulator/JumperT12/left_page.png deleted file mode 100644 index ba527bad8..000000000 Binary files a/companion/src/images/simulator/JumperT12/left_page.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/right_down.png b/companion/src/images/simulator/JumperT12/right_down.png deleted file mode 100644 index 80552deff..000000000 Binary files a/companion/src/images/simulator/JumperT12/right_down.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/right_left.png b/companion/src/images/simulator/JumperT12/right_left.png deleted file mode 100644 index 80552deff..000000000 Binary files a/companion/src/images/simulator/JumperT12/right_left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/right_right.png b/companion/src/images/simulator/JumperT12/right_right.png deleted file mode 100644 index 80552deff..000000000 Binary files a/companion/src/images/simulator/JumperT12/right_right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12/right_up.png b/companion/src/images/simulator/JumperT12/right_up.png deleted file mode 100644 index 80552deff..000000000 Binary files a/companion/src/images/simulator/JumperT12/right_up.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12max/bottom.png b/companion/src/images/simulator/JumperT12max/bottom.png deleted file mode 100644 index 57a329bed..000000000 Binary files a/companion/src/images/simulator/JumperT12max/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12max/exit.png b/companion/src/images/simulator/JumperT12max/exit.png deleted file mode 100644 index 4e0000295..000000000 Binary files a/companion/src/images/simulator/JumperT12max/exit.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12max/left.png b/companion/src/images/simulator/JumperT12max/left.png deleted file mode 100644 index ddfabd392..000000000 Binary files a/companion/src/images/simulator/JumperT12max/left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12max/menu.png b/companion/src/images/simulator/JumperT12max/menu.png deleted file mode 100644 index 975f8a64e..000000000 Binary files a/companion/src/images/simulator/JumperT12max/menu.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12max/page.png b/companion/src/images/simulator/JumperT12max/page.png deleted file mode 100644 index 2418246cc..000000000 Binary files a/companion/src/images/simulator/JumperT12max/page.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12max/right-ent.png b/companion/src/images/simulator/JumperT12max/right-ent.png deleted file mode 100644 index f342273e0..000000000 Binary files a/companion/src/images/simulator/JumperT12max/right-ent.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12max/right.png b/companion/src/images/simulator/JumperT12max/right.png deleted file mode 100644 index 25fd425e5..000000000 Binary files a/companion/src/images/simulator/JumperT12max/right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT12max/top.png b/companion/src/images/simulator/JumperT12max/top.png deleted file mode 100644 index 04e8490be..000000000 Binary files a/companion/src/images/simulator/JumperT12max/top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT14/bottom.png b/companion/src/images/simulator/JumperT14/bottom.png deleted file mode 100644 index 87c3ba123..000000000 Binary files a/companion/src/images/simulator/JumperT14/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT14/left.png b/companion/src/images/simulator/JumperT14/left.png deleted file mode 100644 index a22312e7b..000000000 Binary files a/companion/src/images/simulator/JumperT14/left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT14/right.png b/companion/src/images/simulator/JumperT14/right.png deleted file mode 100644 index 5f8b45cfb..000000000 Binary files a/companion/src/images/simulator/JumperT14/right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT14/top.png b/companion/src/images/simulator/JumperT14/top.png deleted file mode 100644 index d2e7ad6b2..000000000 Binary files a/companion/src/images/simulator/JumperT14/top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT15/bottom.png b/companion/src/images/simulator/JumperT15/bottom.png deleted file mode 100644 index 8ca5f5a2c..000000000 Binary files a/companion/src/images/simulator/JumperT15/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT15/exit.png b/companion/src/images/simulator/JumperT15/exit.png deleted file mode 100644 index 8e58c7979..000000000 Binary files a/companion/src/images/simulator/JumperT15/exit.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT15/left.png b/companion/src/images/simulator/JumperT15/left.png deleted file mode 100644 index 64d145d4c..000000000 Binary files a/companion/src/images/simulator/JumperT15/left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT15/model.png b/companion/src/images/simulator/JumperT15/model.png deleted file mode 100644 index c97c3ec47..000000000 Binary files a/companion/src/images/simulator/JumperT15/model.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT15/page.png b/companion/src/images/simulator/JumperT15/page.png deleted file mode 100644 index f0d48656d..000000000 Binary files a/companion/src/images/simulator/JumperT15/page.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT15/right.png b/companion/src/images/simulator/JumperT15/right.png deleted file mode 100644 index 4518e620e..000000000 Binary files a/companion/src/images/simulator/JumperT15/right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT15/top.png b/companion/src/images/simulator/JumperT15/top.png deleted file mode 100644 index 27d67c85c..000000000 Binary files a/companion/src/images/simulator/JumperT15/top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT16/JumperT16.svg b/companion/src/images/simulator/JumperT16/JumperT16.svg deleted file mode 100644 index 649a506c4..000000000 --- a/companion/src/images/simulator/JumperT16/JumperT16.svg +++ /dev/null @@ -1,2594 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - Activated button= black/opacity 40% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SYS - SYS - RTN - RTN - MDL - MDL - PAGE - PAGE - TELE - TELE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/companion/src/images/simulator/JumperT16/bottom.png b/companion/src/images/simulator/JumperT16/bottom.png deleted file mode 100644 index 8f0d29f7e..000000000 Binary files a/companion/src/images/simulator/JumperT16/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT16/left.png b/companion/src/images/simulator/JumperT16/left.png deleted file mode 100644 index ed8f9e27f..000000000 Binary files a/companion/src/images/simulator/JumperT16/left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT16/left_mdl.png b/companion/src/images/simulator/JumperT16/left_mdl.png deleted file mode 100644 index 62f64d6f7..000000000 Binary files a/companion/src/images/simulator/JumperT16/left_mdl.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT16/left_page.png b/companion/src/images/simulator/JumperT16/left_page.png deleted file mode 100644 index d135a3307..000000000 Binary files a/companion/src/images/simulator/JumperT16/left_page.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT16/left_scrnsht.png b/companion/src/images/simulator/JumperT16/left_scrnsht.png deleted file mode 100644 index 899f0a9c4..000000000 Binary files a/companion/src/images/simulator/JumperT16/left_scrnsht.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT16/left_sys.png b/companion/src/images/simulator/JumperT16/left_sys.png deleted file mode 100644 index beed21ee5..000000000 Binary files a/companion/src/images/simulator/JumperT16/left_sys.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT16/left_tele.png b/companion/src/images/simulator/JumperT16/left_tele.png deleted file mode 100644 index 029506325..000000000 Binary files a/companion/src/images/simulator/JumperT16/left_tele.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT16/right.png b/companion/src/images/simulator/JumperT16/right.png deleted file mode 100644 index 290803879..000000000 Binary files a/companion/src/images/simulator/JumperT16/right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT16/right_ent.png b/companion/src/images/simulator/JumperT16/right_ent.png deleted file mode 100644 index 8f4fdc769..000000000 Binary files a/companion/src/images/simulator/JumperT16/right_ent.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT16/right_rtn.png b/companion/src/images/simulator/JumperT16/right_rtn.png deleted file mode 100644 index 00114f2a7..000000000 Binary files a/companion/src/images/simulator/JumperT16/right_rtn.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT16/top.png b/companion/src/images/simulator/JumperT16/top.png deleted file mode 100644 index 3bc1784ee..000000000 Binary files a/companion/src/images/simulator/JumperT16/top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT18/bottom.png b/companion/src/images/simulator/JumperT18/bottom.png deleted file mode 100644 index 8f0d29f7e..000000000 Binary files a/companion/src/images/simulator/JumperT18/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT18/left.png b/companion/src/images/simulator/JumperT18/left.png deleted file mode 100644 index 4683595ec..000000000 Binary files a/companion/src/images/simulator/JumperT18/left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT18/left_mdl.png b/companion/src/images/simulator/JumperT18/left_mdl.png deleted file mode 100644 index 8260dad5d..000000000 Binary files a/companion/src/images/simulator/JumperT18/left_mdl.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT18/left_page.png b/companion/src/images/simulator/JumperT18/left_page.png deleted file mode 100644 index 5fbeafbde..000000000 Binary files a/companion/src/images/simulator/JumperT18/left_page.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT18/left_sys.png b/companion/src/images/simulator/JumperT18/left_sys.png deleted file mode 100644 index 777f996e4..000000000 Binary files a/companion/src/images/simulator/JumperT18/left_sys.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT18/left_tele.png b/companion/src/images/simulator/JumperT18/left_tele.png deleted file mode 100644 index 3867d3eed..000000000 Binary files a/companion/src/images/simulator/JumperT18/left_tele.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT18/right.png b/companion/src/images/simulator/JumperT18/right.png deleted file mode 100644 index fced173dd..000000000 Binary files a/companion/src/images/simulator/JumperT18/right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT18/right_ent.png b/companion/src/images/simulator/JumperT18/right_ent.png deleted file mode 100644 index eaf7c6acc..000000000 Binary files a/companion/src/images/simulator/JumperT18/right_ent.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT18/right_rtn.png b/companion/src/images/simulator/JumperT18/right_rtn.png deleted file mode 100644 index bf3d51d7d..000000000 Binary files a/companion/src/images/simulator/JumperT18/right_rtn.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT18/top.png b/companion/src/images/simulator/JumperT18/top.png deleted file mode 100644 index 3bc1784ee..000000000 Binary files a/companion/src/images/simulator/JumperT18/top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT20/bottom.png b/companion/src/images/simulator/JumperT20/bottom.png deleted file mode 100644 index 88ab44d41..000000000 Binary files a/companion/src/images/simulator/JumperT20/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT20/left.png b/companion/src/images/simulator/JumperT20/left.png deleted file mode 100644 index 803238075..000000000 Binary files a/companion/src/images/simulator/JumperT20/left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT20/right.png b/companion/src/images/simulator/JumperT20/right.png deleted file mode 100644 index dacd3e240..000000000 Binary files a/companion/src/images/simulator/JumperT20/right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperT20/top.png b/companion/src/images/simulator/JumperT20/top.png deleted file mode 100644 index 583444838..000000000 Binary files a/companion/src/images/simulator/JumperT20/top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTLITE/bottom.png b/companion/src/images/simulator/JumperTLITE/bottom.png deleted file mode 100644 index d7e3f42fc..000000000 Binary files a/companion/src/images/simulator/JumperTLITE/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTLITE/bottom_left.png b/companion/src/images/simulator/JumperTLITE/bottom_left.png deleted file mode 100644 index e6332207c..000000000 Binary files a/companion/src/images/simulator/JumperTLITE/bottom_left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTLITE/bottom_right.png b/companion/src/images/simulator/JumperTLITE/bottom_right.png deleted file mode 100644 index ee5912547..000000000 Binary files a/companion/src/images/simulator/JumperTLITE/bottom_right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTLITE/center_LCD.png b/companion/src/images/simulator/JumperTLITE/center_LCD.png deleted file mode 100644 index f3249de16..000000000 Binary files a/companion/src/images/simulator/JumperTLITE/center_LCD.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTLITE/left.png b/companion/src/images/simulator/JumperTLITE/left.png deleted file mode 100644 index eb54a3967..000000000 Binary files a/companion/src/images/simulator/JumperTLITE/left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTLITE/left_bottom.png b/companion/src/images/simulator/JumperTLITE/left_bottom.png deleted file mode 100644 index 60e4d30a7..000000000 Binary files a/companion/src/images/simulator/JumperTLITE/left_bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTLITE/left_top.png b/companion/src/images/simulator/JumperTLITE/left_top.png deleted file mode 100644 index 5ded766e0..000000000 Binary files a/companion/src/images/simulator/JumperTLITE/left_top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTLITE/right.png b/companion/src/images/simulator/JumperTLITE/right.png deleted file mode 100644 index 6c455081f..000000000 Binary files a/companion/src/images/simulator/JumperTLITE/right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTLITE/right_bottom.png b/companion/src/images/simulator/JumperTLITE/right_bottom.png deleted file mode 100644 index 55c1e5f5f..000000000 Binary files a/companion/src/images/simulator/JumperTLITE/right_bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTLITE/right_top.png b/companion/src/images/simulator/JumperTLITE/right_top.png deleted file mode 100644 index 6e83d354e..000000000 Binary files a/companion/src/images/simulator/JumperTLITE/right_top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTLITE/top.png b/companion/src/images/simulator/JumperTLITE/top.png deleted file mode 100644 index d90d836d8..000000000 Binary files a/companion/src/images/simulator/JumperTLITE/top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTPRO/bottom.png b/companion/src/images/simulator/JumperTPRO/bottom.png deleted file mode 100644 index e45c587c7..000000000 Binary files a/companion/src/images/simulator/JumperTPRO/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTPRO/left.png b/companion/src/images/simulator/JumperTPRO/left.png deleted file mode 100644 index ae0b10c72..000000000 Binary files a/companion/src/images/simulator/JumperTPRO/left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTPRO/right.png b/companion/src/images/simulator/JumperTPRO/right.png deleted file mode 100644 index d26f7eea1..000000000 Binary files a/companion/src/images/simulator/JumperTPRO/right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTPRO/top.png b/companion/src/images/simulator/JumperTPRO/top.png deleted file mode 100644 index 8b562ea19..000000000 Binary files a/companion/src/images/simulator/JumperTPRO/top.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTPROS/bottom.png b/companion/src/images/simulator/JumperTPROS/bottom.png deleted file mode 100644 index 5878810b8..000000000 Binary files a/companion/src/images/simulator/JumperTPROS/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTPROS/exit.png b/companion/src/images/simulator/JumperTPROS/exit.png deleted file mode 100644 index ac187242f..000000000 Binary files a/companion/src/images/simulator/JumperTPROS/exit.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTPROS/left.png b/companion/src/images/simulator/JumperTPROS/left.png deleted file mode 100644 index 2ec9ade5b..000000000 Binary files a/companion/src/images/simulator/JumperTPROS/left.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTPROS/menu.png b/companion/src/images/simulator/JumperTPROS/menu.png deleted file mode 100644 index 18e807246..000000000 Binary files a/companion/src/images/simulator/JumperTPROS/menu.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTPROS/page.png b/companion/src/images/simulator/JumperTPROS/page.png deleted file mode 100644 index ee73613e6..000000000 Binary files a/companion/src/images/simulator/JumperTPROS/page.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTPROS/right-ent.png b/companion/src/images/simulator/JumperTPROS/right-ent.png deleted file mode 100644 index f2d9f0770..000000000 Binary files a/companion/src/images/simulator/JumperTPROS/right-ent.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTPROS/right.png b/companion/src/images/simulator/JumperTPROS/right.png deleted file mode 100644 index 60eeaad79..000000000 Binary files a/companion/src/images/simulator/JumperTPROS/right.png and /dev/null differ diff --git a/companion/src/images/simulator/JumperTPROS/top.png b/companion/src/images/simulator/JumperTPROS/top.png deleted file mode 100644 index eacf96a65..000000000 Binary files a/companion/src/images/simulator/JumperTPROS/top.png and /dev/null differ diff --git a/companion/src/images/simulator/LR3PRO/bottom.png b/companion/src/images/simulator/LR3PRO/bottom.png deleted file mode 100644 index 0835af9a1..000000000 Binary files a/companion/src/images/simulator/LR3PRO/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/LR3PRO/center_LCD.png b/companion/src/images/simulator/LR3PRO/center_LCD.png deleted file mode 100644 index 04598efea..000000000 Binary files a/companion/src/images/simulator/LR3PRO/center_LCD.png and /dev/null differ diff --git a/companion/src/images/simulator/LR3PRO/left.png b/companion/src/images/simulator/LR3PRO/left.png deleted file mode 100644 index e6d56e970..000000000 Binary files a/companion/src/images/simulator/LR3PRO/left.png and /dev/null differ diff --git a/companion/src/images/simulator/LR3PRO/left_escape.png b/companion/src/images/simulator/LR3PRO/left_escape.png deleted file mode 100644 index 052dbda6c..000000000 Binary files a/companion/src/images/simulator/LR3PRO/left_escape.png and /dev/null differ diff --git a/companion/src/images/simulator/LR3PRO/right.png b/companion/src/images/simulator/LR3PRO/right.png deleted file mode 100644 index 8ac3a3869..000000000 Binary files a/companion/src/images/simulator/LR3PRO/right.png and /dev/null differ diff --git a/companion/src/images/simulator/LR3PRO/right_down.png b/companion/src/images/simulator/LR3PRO/right_down.png deleted file mode 100644 index 77450d7da..000000000 Binary files a/companion/src/images/simulator/LR3PRO/right_down.png and /dev/null differ diff --git a/companion/src/images/simulator/LR3PRO/right_enter.png b/companion/src/images/simulator/LR3PRO/right_enter.png deleted file mode 100644 index 09e4cfd41..000000000 Binary files a/companion/src/images/simulator/LR3PRO/right_enter.png and /dev/null differ diff --git a/companion/src/images/simulator/LR3PRO/right_minus.png b/companion/src/images/simulator/LR3PRO/right_minus.png deleted file mode 100644 index 044585512..000000000 Binary files a/companion/src/images/simulator/LR3PRO/right_minus.png and /dev/null differ diff --git a/companion/src/images/simulator/LR3PRO/right_plus.png b/companion/src/images/simulator/LR3PRO/right_plus.png deleted file mode 100644 index 3684a50ab..000000000 Binary files a/companion/src/images/simulator/LR3PRO/right_plus.png and /dev/null differ diff --git a/companion/src/images/simulator/LR3PRO/right_up.png b/companion/src/images/simulator/LR3PRO/right_up.png deleted file mode 100644 index 3fe8eb697..000000000 Binary files a/companion/src/images/simulator/LR3PRO/right_up.png and /dev/null differ diff --git a/companion/src/images/simulator/LR3PRO/top.png b/companion/src/images/simulator/LR3PRO/top.png deleted file mode 100644 index a10a1fa63..000000000 Binary files a/companion/src/images/simulator/LR3PRO/top.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/bottom.png b/companion/src/images/simulator/NV14/bottom.png deleted file mode 100755 index 627269dc5..000000000 Binary files a/companion/src/images/simulator/NV14/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/lhs.png b/companion/src/images/simulator/NV14/lhs.png deleted file mode 100755 index 7ebf1fdfb..000000000 Binary files a/companion/src/images/simulator/NV14/lhs.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/lhs_hat_down.png b/companion/src/images/simulator/NV14/lhs_hat_down.png deleted file mode 100755 index 4c748b035..000000000 Binary files a/companion/src/images/simulator/NV14/lhs_hat_down.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/lhs_hat_left.png b/companion/src/images/simulator/NV14/lhs_hat_left.png deleted file mode 100755 index acf36ab73..000000000 Binary files a/companion/src/images/simulator/NV14/lhs_hat_left.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/lhs_hat_press.png b/companion/src/images/simulator/NV14/lhs_hat_press.png deleted file mode 100755 index 87db60e0a..000000000 Binary files a/companion/src/images/simulator/NV14/lhs_hat_press.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/lhs_hat_right.png b/companion/src/images/simulator/NV14/lhs_hat_right.png deleted file mode 100755 index 06b603390..000000000 Binary files a/companion/src/images/simulator/NV14/lhs_hat_right.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/lhs_hat_up.png b/companion/src/images/simulator/NV14/lhs_hat_up.png deleted file mode 100755 index 191806702..000000000 Binary files a/companion/src/images/simulator/NV14/lhs_hat_up.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/rhs.png b/companion/src/images/simulator/NV14/rhs.png deleted file mode 100755 index 453105102..000000000 Binary files a/companion/src/images/simulator/NV14/rhs.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/rhs_hat_down.png b/companion/src/images/simulator/NV14/rhs_hat_down.png deleted file mode 100755 index 58cebc341..000000000 Binary files a/companion/src/images/simulator/NV14/rhs_hat_down.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/rhs_hat_left.png b/companion/src/images/simulator/NV14/rhs_hat_left.png deleted file mode 100755 index caea0bde9..000000000 Binary files a/companion/src/images/simulator/NV14/rhs_hat_left.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/rhs_hat_press.png b/companion/src/images/simulator/NV14/rhs_hat_press.png deleted file mode 100755 index 225d045f7..000000000 Binary files a/companion/src/images/simulator/NV14/rhs_hat_press.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/rhs_hat_right.png b/companion/src/images/simulator/NV14/rhs_hat_right.png deleted file mode 100755 index b76d380f7..000000000 Binary files a/companion/src/images/simulator/NV14/rhs_hat_right.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/rhs_hat_up.png b/companion/src/images/simulator/NV14/rhs_hat_up.png deleted file mode 100755 index 5c0abc608..000000000 Binary files a/companion/src/images/simulator/NV14/rhs_hat_up.png and /dev/null differ diff --git a/companion/src/images/simulator/NV14/top.png b/companion/src/images/simulator/NV14/top.png deleted file mode 100755 index 924a0ff5f..000000000 Binary files a/companion/src/images/simulator/NV14/top.png and /dev/null differ diff --git a/companion/src/images/simulator/PL18/bottom.png b/companion/src/images/simulator/PL18/bottom.png deleted file mode 100644 index 35710ce35..000000000 Binary files a/companion/src/images/simulator/PL18/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/PL18/left.png b/companion/src/images/simulator/PL18/left.png deleted file mode 100644 index a57a7e538..000000000 Binary files a/companion/src/images/simulator/PL18/left.png and /dev/null differ diff --git a/companion/src/images/simulator/PL18/right.png b/companion/src/images/simulator/PL18/right.png deleted file mode 100644 index a60f9650e..000000000 Binary files a/companion/src/images/simulator/PL18/right.png and /dev/null differ diff --git a/companion/src/images/simulator/PL18/top.png b/companion/src/images/simulator/PL18/top.png deleted file mode 100644 index 510d780fd..000000000 Binary files a/companion/src/images/simulator/PL18/top.png and /dev/null differ diff --git a/companion/src/images/simulator/Pocket/bottom.png b/companion/src/images/simulator/Pocket/bottom.png deleted file mode 100644 index 9490f7949..000000000 Binary files a/companion/src/images/simulator/Pocket/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/Pocket/left.png b/companion/src/images/simulator/Pocket/left.png deleted file mode 100644 index b6a0f4312..000000000 Binary files a/companion/src/images/simulator/Pocket/left.png and /dev/null differ diff --git a/companion/src/images/simulator/Pocket/right.png b/companion/src/images/simulator/Pocket/right.png deleted file mode 100644 index 4391f34fe..000000000 Binary files a/companion/src/images/simulator/Pocket/right.png and /dev/null differ diff --git a/companion/src/images/simulator/Pocket/top.png b/companion/src/images/simulator/Pocket/top.png deleted file mode 100644 index e0281d577..000000000 Binary files a/companion/src/images/simulator/Pocket/top.png and /dev/null differ diff --git a/companion/src/images/simulator/T8/bottom.png b/companion/src/images/simulator/T8/bottom.png deleted file mode 100644 index 055c7db62..000000000 Binary files a/companion/src/images/simulator/T8/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/T8/left-pagedn.png b/companion/src/images/simulator/T8/left-pagedn.png deleted file mode 100644 index 6b290e368..000000000 Binary files a/companion/src/images/simulator/T8/left-pagedn.png and /dev/null differ diff --git a/companion/src/images/simulator/T8/left-pageup.png b/companion/src/images/simulator/T8/left-pageup.png deleted file mode 100644 index c155649a1..000000000 Binary files a/companion/src/images/simulator/T8/left-pageup.png and /dev/null differ diff --git a/companion/src/images/simulator/T8/left-rtn.png b/companion/src/images/simulator/T8/left-rtn.png deleted file mode 100644 index 95cc700f6..000000000 Binary files a/companion/src/images/simulator/T8/left-rtn.png and /dev/null differ diff --git a/companion/src/images/simulator/T8/left-sys.png b/companion/src/images/simulator/T8/left-sys.png deleted file mode 100644 index 7943ed93d..000000000 Binary files a/companion/src/images/simulator/T8/left-sys.png and /dev/null differ diff --git a/companion/src/images/simulator/T8/left.png b/companion/src/images/simulator/T8/left.png deleted file mode 100644 index ff25c9543..000000000 Binary files a/companion/src/images/simulator/T8/left.png and /dev/null differ diff --git a/companion/src/images/simulator/T8/right-dn.png b/companion/src/images/simulator/T8/right-dn.png deleted file mode 100644 index 82a383576..000000000 Binary files a/companion/src/images/simulator/T8/right-dn.png and /dev/null differ diff --git a/companion/src/images/simulator/T8/right-ent.png b/companion/src/images/simulator/T8/right-ent.png deleted file mode 100644 index 8c3be3a56..000000000 Binary files a/companion/src/images/simulator/T8/right-ent.png and /dev/null differ diff --git a/companion/src/images/simulator/T8/right-mdl.png b/companion/src/images/simulator/T8/right-mdl.png deleted file mode 100644 index f385c652e..000000000 Binary files a/companion/src/images/simulator/T8/right-mdl.png and /dev/null differ diff --git a/companion/src/images/simulator/T8/right-up.png b/companion/src/images/simulator/T8/right-up.png deleted file mode 100644 index 5e3bd39ed..000000000 Binary files a/companion/src/images/simulator/T8/right-up.png and /dev/null differ diff --git a/companion/src/images/simulator/T8/right.png b/companion/src/images/simulator/T8/right.png deleted file mode 100644 index 1016d8de5..000000000 Binary files a/companion/src/images/simulator/T8/right.png and /dev/null differ diff --git a/companion/src/images/simulator/T8/top.png b/companion/src/images/simulator/T8/top.png deleted file mode 100644 index 962119223..000000000 Binary files a/companion/src/images/simulator/T8/top.png and /dev/null differ diff --git a/companion/src/images/simulator/TX12/bottom.png b/companion/src/images/simulator/TX12/bottom.png deleted file mode 100644 index 52a35bceb..000000000 Binary files a/companion/src/images/simulator/TX12/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/TX12/left-pagedn.png b/companion/src/images/simulator/TX12/left-pagedn.png deleted file mode 100644 index 3f83d370c..000000000 Binary files a/companion/src/images/simulator/TX12/left-pagedn.png and /dev/null differ diff --git a/companion/src/images/simulator/TX12/left-pageup.png b/companion/src/images/simulator/TX12/left-pageup.png deleted file mode 100644 index 203fd73e7..000000000 Binary files a/companion/src/images/simulator/TX12/left-pageup.png and /dev/null differ diff --git a/companion/src/images/simulator/TX12/left-rtn.png b/companion/src/images/simulator/TX12/left-rtn.png deleted file mode 100644 index 8269d8853..000000000 Binary files a/companion/src/images/simulator/TX12/left-rtn.png and /dev/null differ diff --git a/companion/src/images/simulator/TX12/left-sys.png b/companion/src/images/simulator/TX12/left-sys.png deleted file mode 100644 index 472b412eb..000000000 Binary files a/companion/src/images/simulator/TX12/left-sys.png and /dev/null differ diff --git a/companion/src/images/simulator/TX12/left-tele.png b/companion/src/images/simulator/TX12/left-tele.png deleted file mode 100644 index d7971d791..000000000 Binary files a/companion/src/images/simulator/TX12/left-tele.png and /dev/null differ diff --git a/companion/src/images/simulator/TX12/left.png b/companion/src/images/simulator/TX12/left.png deleted file mode 100644 index e7f5522c1..000000000 Binary files a/companion/src/images/simulator/TX12/left.png and /dev/null differ diff --git a/companion/src/images/simulator/TX12/right-ent.png b/companion/src/images/simulator/TX12/right-ent.png deleted file mode 100644 index 8534cceb2..000000000 Binary files a/companion/src/images/simulator/TX12/right-ent.png and /dev/null differ diff --git a/companion/src/images/simulator/TX12/right-mdl.png b/companion/src/images/simulator/TX12/right-mdl.png deleted file mode 100644 index 4343626ea..000000000 Binary files a/companion/src/images/simulator/TX12/right-mdl.png and /dev/null differ diff --git a/companion/src/images/simulator/TX12/right.png b/companion/src/images/simulator/TX12/right.png deleted file mode 100644 index 0f33cae7c..000000000 Binary files a/companion/src/images/simulator/TX12/right.png and /dev/null differ diff --git a/companion/src/images/simulator/TX12/top.png b/companion/src/images/simulator/TX12/top.png deleted file mode 100644 index ceb68a4c1..000000000 Binary files a/companion/src/images/simulator/TX12/top.png and /dev/null differ diff --git a/companion/src/images/simulator/TX16S/bottom.png b/companion/src/images/simulator/TX16S/bottom.png deleted file mode 100644 index 8f0d29f7e..000000000 Binary files a/companion/src/images/simulator/TX16S/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/TX16S/left.png b/companion/src/images/simulator/TX16S/left.png deleted file mode 100644 index 602017e44..000000000 Binary files a/companion/src/images/simulator/TX16S/left.png and /dev/null differ diff --git a/companion/src/images/simulator/TX16S/left_page.png b/companion/src/images/simulator/TX16S/left_page.png deleted file mode 100644 index 9ea20a59f..000000000 Binary files a/companion/src/images/simulator/TX16S/left_page.png and /dev/null differ diff --git a/companion/src/images/simulator/TX16S/left_page2.png b/companion/src/images/simulator/TX16S/left_page2.png deleted file mode 100644 index 6ef922970..000000000 Binary files a/companion/src/images/simulator/TX16S/left_page2.png and /dev/null differ diff --git a/companion/src/images/simulator/TX16S/left_rtn.png b/companion/src/images/simulator/TX16S/left_rtn.png deleted file mode 100644 index 4fa7d04ff..000000000 Binary files a/companion/src/images/simulator/TX16S/left_rtn.png and /dev/null differ diff --git a/companion/src/images/simulator/TX16S/left_sys.png b/companion/src/images/simulator/TX16S/left_sys.png deleted file mode 100644 index da6b6e939..000000000 Binary files a/companion/src/images/simulator/TX16S/left_sys.png and /dev/null differ diff --git a/companion/src/images/simulator/TX16S/left_tele.png b/companion/src/images/simulator/TX16S/left_tele.png deleted file mode 100644 index a51f18bd1..000000000 Binary files a/companion/src/images/simulator/TX16S/left_tele.png and /dev/null differ diff --git a/companion/src/images/simulator/TX16S/right.png b/companion/src/images/simulator/TX16S/right.png deleted file mode 100644 index f07ca05bf..000000000 Binary files a/companion/src/images/simulator/TX16S/right.png and /dev/null differ diff --git a/companion/src/images/simulator/TX16S/right_ent.png b/companion/src/images/simulator/TX16S/right_ent.png deleted file mode 100644 index 9f407a2cf..000000000 Binary files a/companion/src/images/simulator/TX16S/right_ent.png and /dev/null differ diff --git a/companion/src/images/simulator/TX16S/right_mdl.png b/companion/src/images/simulator/TX16S/right_mdl.png deleted file mode 100644 index 67ca5a0d3..000000000 Binary files a/companion/src/images/simulator/TX16S/right_mdl.png and /dev/null differ diff --git a/companion/src/images/simulator/TX16S/top.png b/companion/src/images/simulator/TX16S/top.png deleted file mode 100644 index 3bc1784ee..000000000 Binary files a/companion/src/images/simulator/TX16S/top.png and /dev/null differ diff --git a/companion/src/images/simulator/V16/left.png b/companion/src/images/simulator/V16/left.png deleted file mode 100644 index 5e0e80427..000000000 Binary files a/companion/src/images/simulator/V16/left.png and /dev/null differ diff --git a/companion/src/images/simulator/V16/left_pagedn.png b/companion/src/images/simulator/V16/left_pagedn.png deleted file mode 100644 index e4fb28d61..000000000 Binary files a/companion/src/images/simulator/V16/left_pagedn.png and /dev/null differ diff --git a/companion/src/images/simulator/V16/left_pageup.png b/companion/src/images/simulator/V16/left_pageup.png deleted file mode 100644 index 016af4aac..000000000 Binary files a/companion/src/images/simulator/V16/left_pageup.png and /dev/null differ diff --git a/companion/src/images/simulator/V16/left_rtn.png b/companion/src/images/simulator/V16/left_rtn.png deleted file mode 100644 index 0862203d8..000000000 Binary files a/companion/src/images/simulator/V16/left_rtn.png and /dev/null differ diff --git a/companion/src/images/simulator/V16/left_sys.png b/companion/src/images/simulator/V16/left_sys.png deleted file mode 100644 index e4118ef13..000000000 Binary files a/companion/src/images/simulator/V16/left_sys.png and /dev/null differ diff --git a/companion/src/images/simulator/V16/left_tele.png b/companion/src/images/simulator/V16/left_tele.png deleted file mode 100644 index 84a845175..000000000 Binary files a/companion/src/images/simulator/V16/left_tele.png and /dev/null differ diff --git a/companion/src/images/simulator/V16/right.png b/companion/src/images/simulator/V16/right.png deleted file mode 100644 index 3679aa452..000000000 Binary files a/companion/src/images/simulator/V16/right.png and /dev/null differ diff --git a/companion/src/images/simulator/V16/right_ent.png b/companion/src/images/simulator/V16/right_ent.png deleted file mode 100644 index a2d8e4f3c..000000000 Binary files a/companion/src/images/simulator/V16/right_ent.png and /dev/null differ diff --git a/companion/src/images/simulator/V16/right_mdl.png b/companion/src/images/simulator/V16/right_mdl.png deleted file mode 100644 index 7fbccb49d..000000000 Binary files a/companion/src/images/simulator/V16/right_mdl.png and /dev/null differ diff --git a/companion/src/images/simulator/X10/bottom.png b/companion/src/images/simulator/X10/bottom.png deleted file mode 100644 index ad95f1a8e..000000000 Binary files a/companion/src/images/simulator/X10/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/X10/left.png b/companion/src/images/simulator/X10/left.png deleted file mode 100644 index 347439306..000000000 Binary files a/companion/src/images/simulator/X10/left.png and /dev/null differ diff --git a/companion/src/images/simulator/X10/left_mdl.png b/companion/src/images/simulator/X10/left_mdl.png deleted file mode 100644 index 4f21760cf..000000000 Binary files a/companion/src/images/simulator/X10/left_mdl.png and /dev/null differ diff --git a/companion/src/images/simulator/X10/left_page.png b/companion/src/images/simulator/X10/left_page.png deleted file mode 100644 index 6d76939db..000000000 Binary files a/companion/src/images/simulator/X10/left_page.png and /dev/null differ diff --git a/companion/src/images/simulator/X10/left_rtn.png b/companion/src/images/simulator/X10/left_rtn.png deleted file mode 100644 index 87ec8a5e2..000000000 Binary files a/companion/src/images/simulator/X10/left_rtn.png and /dev/null differ diff --git a/companion/src/images/simulator/X10/left_scrnsht.png b/companion/src/images/simulator/X10/left_scrnsht.png deleted file mode 100644 index 14712df36..000000000 Binary files a/companion/src/images/simulator/X10/left_scrnsht.png and /dev/null differ diff --git a/companion/src/images/simulator/X10/left_sys.png b/companion/src/images/simulator/X10/left_sys.png deleted file mode 100644 index 2c950a9b1..000000000 Binary files a/companion/src/images/simulator/X10/left_sys.png and /dev/null differ diff --git a/companion/src/images/simulator/X10/left_tele.png b/companion/src/images/simulator/X10/left_tele.png deleted file mode 100644 index 273de274b..000000000 Binary files a/companion/src/images/simulator/X10/left_tele.png and /dev/null differ diff --git a/companion/src/images/simulator/X10/right.png b/companion/src/images/simulator/X10/right.png deleted file mode 100644 index abb3b1fad..000000000 Binary files a/companion/src/images/simulator/X10/right.png and /dev/null differ diff --git a/companion/src/images/simulator/X10/right_ent.png b/companion/src/images/simulator/X10/right_ent.png deleted file mode 100644 index e70f01301..000000000 Binary files a/companion/src/images/simulator/X10/right_ent.png and /dev/null differ diff --git a/companion/src/images/simulator/X10/top.png b/companion/src/images/simulator/X10/top.png deleted file mode 100644 index accd140e2..000000000 Binary files a/companion/src/images/simulator/X10/top.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/border-right.png b/companion/src/images/simulator/X12/border-right.png deleted file mode 100644 index 8c2398885..000000000 Binary files a/companion/src/images/simulator/X12/border-right.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/bottom.png b/companion/src/images/simulator/X12/bottom.png deleted file mode 100644 index 7d3fb11b1..000000000 Binary files a/companion/src/images/simulator/X12/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/led.png b/companion/src/images/simulator/X12/led.png deleted file mode 100644 index faa808888..000000000 Binary files a/companion/src/images/simulator/X12/led.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/left.png b/companion/src/images/simulator/X12/left.png deleted file mode 100644 index 4b0778bd4..000000000 Binary files a/companion/src/images/simulator/X12/left.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/left_btn1.png b/companion/src/images/simulator/X12/left_btn1.png deleted file mode 100644 index e7b724405..000000000 Binary files a/companion/src/images/simulator/X12/left_btn1.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/left_btn2.png b/companion/src/images/simulator/X12/left_btn2.png deleted file mode 100644 index ec827999b..000000000 Binary files a/companion/src/images/simulator/X12/left_btn2.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/left_scrnsht.png b/companion/src/images/simulator/X12/left_scrnsht.png deleted file mode 100644 index 1f164b696..000000000 Binary files a/companion/src/images/simulator/X12/left_scrnsht.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/middle.png b/companion/src/images/simulator/X12/middle.png deleted file mode 100644 index 2964334da..000000000 Binary files a/companion/src/images/simulator/X12/middle.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/right.png b/companion/src/images/simulator/X12/right.png deleted file mode 100644 index bf0979ca5..000000000 Binary files a/companion/src/images/simulator/X12/right.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/right_btnD.png b/companion/src/images/simulator/X12/right_btnD.png deleted file mode 100644 index e5fa84acb..000000000 Binary files a/companion/src/images/simulator/X12/right_btnD.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/right_btnL.png b/companion/src/images/simulator/X12/right_btnL.png deleted file mode 100644 index 4d5485650..000000000 Binary files a/companion/src/images/simulator/X12/right_btnL.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/right_btnR.png b/companion/src/images/simulator/X12/right_btnR.png deleted file mode 100644 index db3ad3bf2..000000000 Binary files a/companion/src/images/simulator/X12/right_btnR.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/right_btnU.png b/companion/src/images/simulator/X12/right_btnU.png deleted file mode 100644 index bee417dd1..000000000 Binary files a/companion/src/images/simulator/X12/right_btnU.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/right_ent.png b/companion/src/images/simulator/X12/right_ent.png deleted file mode 100644 index c78108067..000000000 Binary files a/companion/src/images/simulator/X12/right_ent.png and /dev/null differ diff --git a/companion/src/images/simulator/X12/top.png b/companion/src/images/simulator/X12/top.png deleted file mode 100644 index 334f6bc56..000000000 Binary files a/companion/src/images/simulator/X12/top.png and /dev/null differ diff --git a/companion/src/images/simulator/X7/bottom.png b/companion/src/images/simulator/X7/bottom.png deleted file mode 100644 index 3f709a449..000000000 Binary files a/companion/src/images/simulator/X7/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/X7/left.png b/companion/src/images/simulator/X7/left.png deleted file mode 100644 index 4d3376c48..000000000 Binary files a/companion/src/images/simulator/X7/left.png and /dev/null differ diff --git a/companion/src/images/simulator/X7/left_exit.png b/companion/src/images/simulator/X7/left_exit.png deleted file mode 100644 index 0d7cd5b5b..000000000 Binary files a/companion/src/images/simulator/X7/left_exit.png and /dev/null differ diff --git a/companion/src/images/simulator/X7/left_menu.png b/companion/src/images/simulator/X7/left_menu.png deleted file mode 100644 index b97ba1da4..000000000 Binary files a/companion/src/images/simulator/X7/left_menu.png and /dev/null differ diff --git a/companion/src/images/simulator/X7/left_page.png b/companion/src/images/simulator/X7/left_page.png deleted file mode 100644 index 9fd9d5b8e..000000000 Binary files a/companion/src/images/simulator/X7/left_page.png and /dev/null differ diff --git a/companion/src/images/simulator/X7/left_scrnshot.png b/companion/src/images/simulator/X7/left_scrnshot.png deleted file mode 100644 index c01e802de..000000000 Binary files a/companion/src/images/simulator/X7/left_scrnshot.png and /dev/null differ diff --git a/companion/src/images/simulator/X7/right.png b/companion/src/images/simulator/X7/right.png deleted file mode 100644 index 73a2a1e30..000000000 Binary files a/companion/src/images/simulator/X7/right.png and /dev/null differ diff --git a/companion/src/images/simulator/X7/right_ent.png b/companion/src/images/simulator/X7/right_ent.png deleted file mode 100644 index 3292fb0e5..000000000 Binary files a/companion/src/images/simulator/X7/right_ent.png and /dev/null differ diff --git a/companion/src/images/simulator/X7/top.png b/companion/src/images/simulator/X7/top.png deleted file mode 100644 index 427ee0911..000000000 Binary files a/companion/src/images/simulator/X7/top.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D/x9b0.png b/companion/src/images/simulator/X9D/x9b0.png deleted file mode 100644 index 7eb73ef92..000000000 Binary files a/companion/src/images/simulator/X9D/x9b0.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D/x9l0.png b/companion/src/images/simulator/X9D/x9l0.png deleted file mode 100644 index 4bfd3b76b..000000000 Binary files a/companion/src/images/simulator/X9D/x9l0.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D/x9l1.png b/companion/src/images/simulator/X9D/x9l1.png deleted file mode 100644 index 28277baca..000000000 Binary files a/companion/src/images/simulator/X9D/x9l1.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D/x9l2.png b/companion/src/images/simulator/X9D/x9l2.png deleted file mode 100644 index f44a5329c..000000000 Binary files a/companion/src/images/simulator/X9D/x9l2.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D/x9l3.png b/companion/src/images/simulator/X9D/x9l3.png deleted file mode 100644 index ed66df458..000000000 Binary files a/companion/src/images/simulator/X9D/x9l3.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D/x9l4.png b/companion/src/images/simulator/X9D/x9l4.png deleted file mode 100644 index 2550ea1df..000000000 Binary files a/companion/src/images/simulator/X9D/x9l4.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D/x9r0.png b/companion/src/images/simulator/X9D/x9r0.png deleted file mode 100644 index 20625f468..000000000 Binary files a/companion/src/images/simulator/X9D/x9r0.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D/x9r1.png b/companion/src/images/simulator/X9D/x9r1.png deleted file mode 100644 index ec0583c92..000000000 Binary files a/companion/src/images/simulator/X9D/x9r1.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D/x9r2.png b/companion/src/images/simulator/X9D/x9r2.png deleted file mode 100644 index eb59bfd01..000000000 Binary files a/companion/src/images/simulator/X9D/x9r2.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D/x9r3.png b/companion/src/images/simulator/X9D/x9r3.png deleted file mode 100644 index 50b7ca4fa..000000000 Binary files a/companion/src/images/simulator/X9D/x9r3.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D/x9s0.png b/companion/src/images/simulator/X9D/x9s0.png deleted file mode 100644 index 568a647c8..000000000 Binary files a/companion/src/images/simulator/X9D/x9s0.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D/x9t0.png b/companion/src/images/simulator/X9D/x9t0.png deleted file mode 100644 index 030f88116..000000000 Binary files a/companion/src/images/simulator/X9D/x9t0.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D2019/Readme.md b/companion/src/images/simulator/X9D2019/Readme.md deleted file mode 100644 index 75a11a3ad..000000000 --- a/companion/src/images/simulator/X9D2019/Readme.md +++ /dev/null @@ -1,28 +0,0 @@ - -# "Taranis X9D+ 2019" dark blue skin for the Companion simulator -![X9D+ 2019 Image for Companion](X9DP2019_Companion_image.png "Taranis X9D+ 2019") - -## The different parts of the image - -The image is divided into 4 pieces: top, bottom, left and right. -For the images concerned, there is the version with the activated element and the version without the activated element (such as a button, a rotary encoder, clicking on the rotary encoder). - -| File name | What is this image ? | -|:---------------------|:----------------------------------------------| -| `bottom.png` | central lower band | -| `center_LCD.png` | central LCD 424x128px (useless for simulator) | -| `left.png` | left part with inactive elements | -| `left_exit.png` | left part with the EXIT button activated | -| `left_menu.png` | left part with the MENU button activated | -| `left_page.png` | left part with the PAGE button activated | -| `bottom_scrnshot.png`| central lower band with the SCREENSHOT button activated| -| `right_ent.png` | right part with the ENTER button activated | -| `right.png` | right part with inactive elements | -| `top.png` | central upper band | - -`X9DP2019_Companion_image.png` is the image displayed here. - - -## Software used : -- **Inkscape** : vector drawing software (http://www.inkscape.org/) -- **Gimp** : image editor (http://www.gimp.org/) \ No newline at end of file diff --git a/companion/src/images/simulator/X9D2019/X9DP2019_Companion_image.png b/companion/src/images/simulator/X9D2019/X9DP2019_Companion_image.png deleted file mode 100644 index 9f28d54a8..000000000 Binary files a/companion/src/images/simulator/X9D2019/X9DP2019_Companion_image.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D2019/bottom.png b/companion/src/images/simulator/X9D2019/bottom.png deleted file mode 100644 index bc812ddb0..000000000 Binary files a/companion/src/images/simulator/X9D2019/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D2019/bottom_scrnshot.png b/companion/src/images/simulator/X9D2019/bottom_scrnshot.png deleted file mode 100644 index b46eaa9ec..000000000 Binary files a/companion/src/images/simulator/X9D2019/bottom_scrnshot.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D2019/center_LCD.png b/companion/src/images/simulator/X9D2019/center_LCD.png deleted file mode 100644 index 3bc62efd0..000000000 Binary files a/companion/src/images/simulator/X9D2019/center_LCD.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D2019/left.png b/companion/src/images/simulator/X9D2019/left.png deleted file mode 100644 index 113cd1611..000000000 Binary files a/companion/src/images/simulator/X9D2019/left.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D2019/left_exit.png b/companion/src/images/simulator/X9D2019/left_exit.png deleted file mode 100644 index 4b6376c0f..000000000 Binary files a/companion/src/images/simulator/X9D2019/left_exit.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D2019/left_menu.png b/companion/src/images/simulator/X9D2019/left_menu.png deleted file mode 100644 index 9e2a74ecc..000000000 Binary files a/companion/src/images/simulator/X9D2019/left_menu.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D2019/left_page.png b/companion/src/images/simulator/X9D2019/left_page.png deleted file mode 100644 index 4ad08533f..000000000 Binary files a/companion/src/images/simulator/X9D2019/left_page.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D2019/right.png b/companion/src/images/simulator/X9D2019/right.png deleted file mode 100644 index a16456573..000000000 Binary files a/companion/src/images/simulator/X9D2019/right.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D2019/right_enter.png b/companion/src/images/simulator/X9D2019/right_enter.png deleted file mode 100644 index 8f9c5f1cb..000000000 Binary files a/companion/src/images/simulator/X9D2019/right_enter.png and /dev/null differ diff --git a/companion/src/images/simulator/X9D2019/top.png b/companion/src/images/simulator/X9D2019/top.png deleted file mode 100644 index 083fd6e3c..000000000 Binary files a/companion/src/images/simulator/X9D2019/top.png and /dev/null differ diff --git a/companion/src/images/simulator/X9E/bottom.png b/companion/src/images/simulator/X9E/bottom.png deleted file mode 100644 index 2e8461078..000000000 Binary files a/companion/src/images/simulator/X9E/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/X9E/left.png b/companion/src/images/simulator/X9E/left.png deleted file mode 100644 index 9a8570847..000000000 Binary files a/companion/src/images/simulator/X9E/left.png and /dev/null differ diff --git a/companion/src/images/simulator/X9E/left_exit.png b/companion/src/images/simulator/X9E/left_exit.png deleted file mode 100644 index 6691c04e7..000000000 Binary files a/companion/src/images/simulator/X9E/left_exit.png and /dev/null differ diff --git a/companion/src/images/simulator/X9E/left_menu.png b/companion/src/images/simulator/X9E/left_menu.png deleted file mode 100644 index 3e17d75a0..000000000 Binary files a/companion/src/images/simulator/X9E/left_menu.png and /dev/null differ diff --git a/companion/src/images/simulator/X9E/left_page.png b/companion/src/images/simulator/X9E/left_page.png deleted file mode 100644 index 7ebd35671..000000000 Binary files a/companion/src/images/simulator/X9E/left_page.png and /dev/null differ diff --git a/companion/src/images/simulator/X9E/left_scrnshot.png b/companion/src/images/simulator/X9E/left_scrnshot.png deleted file mode 100644 index b2d77970f..000000000 Binary files a/companion/src/images/simulator/X9E/left_scrnshot.png and /dev/null differ diff --git a/companion/src/images/simulator/X9E/right.png b/companion/src/images/simulator/X9E/right.png deleted file mode 100644 index 2539aef04..000000000 Binary files a/companion/src/images/simulator/X9E/right.png and /dev/null differ diff --git a/companion/src/images/simulator/X9E/right_enter.png b/companion/src/images/simulator/X9E/right_enter.png deleted file mode 100644 index 9eff4b761..000000000 Binary files a/companion/src/images/simulator/X9E/right_enter.png and /dev/null differ diff --git a/companion/src/images/simulator/X9E/top.png b/companion/src/images/simulator/X9E/top.png deleted file mode 100644 index 32bee242b..000000000 Binary files a/companion/src/images/simulator/X9E/top.png and /dev/null differ diff --git a/companion/src/images/simulator/X9LITE/Readme.md b/companion/src/images/simulator/X9LITE/Readme.md deleted file mode 100644 index 46b4f4f4b..000000000 --- a/companion/src/images/simulator/X9LITE/Readme.md +++ /dev/null @@ -1,29 +0,0 @@ - -# X9-Lite skin for the Companion simulator -![X9-Lite Image for Companion](X9-Lite_Companion_image.png "X9-Lite") - -## The different parts of the image - -The image is divided into 4 pieces: top, bottom, left and right. -For the images concerned, there is the version with the activated element and the version without the activated element (such as a button, a rotary encoder, clicking on the rotary encoder). - -| File name | What is this image ? | -|:---------------------|:----------------------------------------------| -| `bottom.png` | central lower band | -| `center_LCD.png` | central LCD 256x128px (useless for simulator) | -| `left.png` | left part with inactive elements | -| `left_exit.png` | left part with the EXIT button activated | -| `left_menu.png` | left part with the MENU button activated | -| `left_page.png` | left part with the PAGE button activated | -| `left_scrnshot.png `| left part with the SCREENSHOT button activated| -| `right_ent.png` | right part with the ENT button activated | -| `right_rotcoder.png` | right part with the Rotary Encoder actuated | -| `right.png` | right part with inactive elements | -| `top.png` | central upper band | -`X9-Lite_Companion_image.png` is the image displayed here. - -When turning the rotary encoder, it is possible to make a motion effect by displaying `right_rotcoder.png` and `right.png`. - -## Software used : -- **Inkscape** : vector drawing software (http://www.inkscape.org/) -- **Gimp** : image editor (http://www.gimp.org/) \ No newline at end of file diff --git a/companion/src/images/simulator/X9LITE/X9-Lite_Companion_image.png b/companion/src/images/simulator/X9LITE/X9-Lite_Companion_image.png deleted file mode 100644 index d206c83e1..000000000 Binary files a/companion/src/images/simulator/X9LITE/X9-Lite_Companion_image.png and /dev/null differ diff --git a/companion/src/images/simulator/X9LITE/bottom.png b/companion/src/images/simulator/X9LITE/bottom.png deleted file mode 100644 index 43f26ab49..000000000 Binary files a/companion/src/images/simulator/X9LITE/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/X9LITE/center_LCD.png b/companion/src/images/simulator/X9LITE/center_LCD.png deleted file mode 100644 index f3249de16..000000000 Binary files a/companion/src/images/simulator/X9LITE/center_LCD.png and /dev/null differ diff --git a/companion/src/images/simulator/X9LITE/left.png b/companion/src/images/simulator/X9LITE/left.png deleted file mode 100644 index 5d784b68c..000000000 Binary files a/companion/src/images/simulator/X9LITE/left.png and /dev/null differ diff --git a/companion/src/images/simulator/X9LITE/left_exit.png b/companion/src/images/simulator/X9LITE/left_exit.png deleted file mode 100644 index 16a7dfda9..000000000 Binary files a/companion/src/images/simulator/X9LITE/left_exit.png and /dev/null differ diff --git a/companion/src/images/simulator/X9LITE/left_menu.png b/companion/src/images/simulator/X9LITE/left_menu.png deleted file mode 100644 index db1cbd768..000000000 Binary files a/companion/src/images/simulator/X9LITE/left_menu.png and /dev/null differ diff --git a/companion/src/images/simulator/X9LITE/left_page.png b/companion/src/images/simulator/X9LITE/left_page.png deleted file mode 100644 index bf5b3ce36..000000000 Binary files a/companion/src/images/simulator/X9LITE/left_page.png and /dev/null differ diff --git a/companion/src/images/simulator/X9LITE/left_scrnshot.png b/companion/src/images/simulator/X9LITE/left_scrnshot.png deleted file mode 100644 index afd46507e..000000000 Binary files a/companion/src/images/simulator/X9LITE/left_scrnshot.png and /dev/null differ diff --git a/companion/src/images/simulator/X9LITE/right.png b/companion/src/images/simulator/X9LITE/right.png deleted file mode 100644 index fcb8efd75..000000000 Binary files a/companion/src/images/simulator/X9LITE/right.png and /dev/null differ diff --git a/companion/src/images/simulator/X9LITE/right_ent.png b/companion/src/images/simulator/X9LITE/right_ent.png deleted file mode 100644 index 1640129f8..000000000 Binary files a/companion/src/images/simulator/X9LITE/right_ent.png and /dev/null differ diff --git a/companion/src/images/simulator/X9LITE/right_rotary_encoder.png b/companion/src/images/simulator/X9LITE/right_rotary_encoder.png deleted file mode 100644 index 3d9f7cf82..000000000 Binary files a/companion/src/images/simulator/X9LITE/right_rotary_encoder.png and /dev/null differ diff --git a/companion/src/images/simulator/X9LITE/top.png b/companion/src/images/simulator/X9LITE/top.png deleted file mode 100644 index bd15db2b7..000000000 Binary files a/companion/src/images/simulator/X9LITE/top.png and /dev/null differ diff --git a/companion/src/images/simulator/XLITE/bottom.png b/companion/src/images/simulator/XLITE/bottom.png deleted file mode 100644 index 88fac40b0..000000000 Binary files a/companion/src/images/simulator/XLITE/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/XLITE/left.png b/companion/src/images/simulator/XLITE/left.png deleted file mode 100644 index 7e4766150..000000000 Binary files a/companion/src/images/simulator/XLITE/left.png and /dev/null differ diff --git a/companion/src/images/simulator/XLITE/left_scrnshot.png b/companion/src/images/simulator/XLITE/left_scrnshot.png deleted file mode 100644 index 90f6d52af..000000000 Binary files a/companion/src/images/simulator/XLITE/left_scrnshot.png and /dev/null differ diff --git a/companion/src/images/simulator/XLITE/right.png b/companion/src/images/simulator/XLITE/right.png deleted file mode 100644 index d0e3d85eb..000000000 Binary files a/companion/src/images/simulator/XLITE/right.png and /dev/null differ diff --git a/companion/src/images/simulator/XLITE/right_down.png b/companion/src/images/simulator/XLITE/right_down.png deleted file mode 100644 index 12bba08d3..000000000 Binary files a/companion/src/images/simulator/XLITE/right_down.png and /dev/null differ diff --git a/companion/src/images/simulator/XLITE/right_ent.png b/companion/src/images/simulator/XLITE/right_ent.png deleted file mode 100644 index c4f3cf77e..000000000 Binary files a/companion/src/images/simulator/XLITE/right_ent.png and /dev/null differ diff --git a/companion/src/images/simulator/XLITE/right_exit.png b/companion/src/images/simulator/XLITE/right_exit.png deleted file mode 100644 index e0760815e..000000000 Binary files a/companion/src/images/simulator/XLITE/right_exit.png and /dev/null differ diff --git a/companion/src/images/simulator/XLITE/right_left.png b/companion/src/images/simulator/XLITE/right_left.png deleted file mode 100644 index b8fc4d027..000000000 Binary files a/companion/src/images/simulator/XLITE/right_left.png and /dev/null differ diff --git a/companion/src/images/simulator/XLITE/right_right.png b/companion/src/images/simulator/XLITE/right_right.png deleted file mode 100644 index 9063cebd9..000000000 Binary files a/companion/src/images/simulator/XLITE/right_right.png and /dev/null differ diff --git a/companion/src/images/simulator/XLITE/right_shift.png b/companion/src/images/simulator/XLITE/right_shift.png deleted file mode 100644 index adc895c84..000000000 Binary files a/companion/src/images/simulator/XLITE/right_shift.png and /dev/null differ diff --git a/companion/src/images/simulator/XLITE/right_up.png b/companion/src/images/simulator/XLITE/right_up.png deleted file mode 100644 index 878a6bd94..000000000 Binary files a/companion/src/images/simulator/XLITE/right_up.png and /dev/null differ diff --git a/companion/src/images/simulator/XLITE/top.png b/companion/src/images/simulator/XLITE/top.png deleted file mode 100644 index d76c4b793..000000000 Binary files a/companion/src/images/simulator/XLITE/top.png and /dev/null differ diff --git a/companion/src/images/simulator/Zorro/bottom.png b/companion/src/images/simulator/Zorro/bottom.png deleted file mode 100644 index 15c9630e1..000000000 Binary files a/companion/src/images/simulator/Zorro/bottom.png and /dev/null differ diff --git a/companion/src/images/simulator/Zorro/left-pagedn.png b/companion/src/images/simulator/Zorro/left-pagedn.png deleted file mode 100644 index e16d2256c..000000000 Binary files a/companion/src/images/simulator/Zorro/left-pagedn.png and /dev/null differ diff --git a/companion/src/images/simulator/Zorro/left-pageup.png b/companion/src/images/simulator/Zorro/left-pageup.png deleted file mode 100644 index a5c474b8e..000000000 Binary files a/companion/src/images/simulator/Zorro/left-pageup.png and /dev/null differ diff --git a/companion/src/images/simulator/Zorro/left-rtn.png b/companion/src/images/simulator/Zorro/left-rtn.png deleted file mode 100644 index 551af92c2..000000000 Binary files a/companion/src/images/simulator/Zorro/left-rtn.png and /dev/null differ diff --git a/companion/src/images/simulator/Zorro/left-sys.png b/companion/src/images/simulator/Zorro/left-sys.png deleted file mode 100644 index c5c785a1b..000000000 Binary files a/companion/src/images/simulator/Zorro/left-sys.png and /dev/null differ diff --git a/companion/src/images/simulator/Zorro/left.png b/companion/src/images/simulator/Zorro/left.png deleted file mode 100644 index eef3f9a72..000000000 Binary files a/companion/src/images/simulator/Zorro/left.png and /dev/null differ diff --git a/companion/src/images/simulator/Zorro/right-ent.png b/companion/src/images/simulator/Zorro/right-ent.png deleted file mode 100644 index 349ea0513..000000000 Binary files a/companion/src/images/simulator/Zorro/right-ent.png and /dev/null differ diff --git a/companion/src/images/simulator/Zorro/right-mdl.png b/companion/src/images/simulator/Zorro/right-mdl.png deleted file mode 100644 index 80d701e05..000000000 Binary files a/companion/src/images/simulator/Zorro/right-mdl.png and /dev/null differ diff --git a/companion/src/images/simulator/Zorro/right-tele.png b/companion/src/images/simulator/Zorro/right-tele.png deleted file mode 100644 index 330fbfcef..000000000 Binary files a/companion/src/images/simulator/Zorro/right-tele.png and /dev/null differ diff --git a/companion/src/images/simulator/Zorro/right.png b/companion/src/images/simulator/Zorro/right.png deleted file mode 100644 index ee592bae5..000000000 Binary files a/companion/src/images/simulator/Zorro/right.png and /dev/null differ diff --git a/companion/src/images/simulator/Zorro/top.png b/companion/src/images/simulator/Zorro/top.png deleted file mode 100644 index 00fdd86cb..000000000 Binary files a/companion/src/images/simulator/Zorro/top.png and /dev/null differ diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index dc00e5b39..542b15d73 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -53,8 +53,6 @@ #include #include -#define DONATE_STR QStringLiteral("https://opencollective.com/edgetx/donate") - MainWindow::MainWindow(): updateFactories(nullptr), windowsListActions(new QActionGroup(this)) @@ -642,27 +640,27 @@ void MainWindow::logFile() void MainWindow::about() { QString aboutStr = "

"; - aboutStr.append(tr("EdgeTX Home Page: %1").arg("https://edgetx.org")); + aboutStr.append(tr("EdgeTX Home Page: %1").arg(EDGETX_HOME_PAGE_URL)); aboutStr.append("

"); - aboutStr.append(tr("The EdgeTX Companion project was originally forked from OpenTX").arg("https://github.com/opentx/opentx")); + aboutStr.append(tr("The EdgeTX project was originally forked from OpenTX").arg("https://github.com/opentx/opentx")); aboutStr.append("

"); - aboutStr.append(tr("If you've found this program useful, please support by donating").arg(DONATE_STR)); + aboutStr.append(tr("If you've found this program useful, please support by donating").arg(EDGETX_DONATE_URL)); aboutStr.append("

"); #if defined(VERSION_TAG) aboutStr.append(QString("Version %1 \"%2\", %3").arg(VERSION_TAG).arg(CODENAME).arg(__DATE__)); #else aboutStr.append(QString("Version %1-%2, %3").arg(VERSION).arg(VERSION_SUFFIX).arg(__DATE__)); aboutStr.append("
"); - aboutStr.append(QString("Commit %2").arg("https://github.com/EdgeTX/edgetx/commit/" GIT_STR).arg(GIT_STR)); + aboutStr.append(QString("Commit %2").arg(EDGETX_COMMIT_URL % GIT_STR).arg(GIT_STR)); #endif aboutStr.append("

"); - aboutStr.append(tr("File new Issue or Request").arg("https://github.com/EdgeTX/edgetx/issues/new/choose")); + aboutStr.append(tr("File new Issue or Request").arg(EDGETX_ISSUES_URL)); aboutStr.append("

"); aboutStr.append(tr("Copyright") + QString(" © 2021-%1 EdgeTX
").arg(BUILD_YEAR)); QMessageBox msgBox(this); msgBox.setWindowIcon(CompanionIcon("information.png")); - msgBox.setWindowTitle(tr("About Companion")); + msgBox.setWindowTitle(tr("About EdgeTX Companion")); msgBox.setText(aboutStr); msgBox.exec(); } diff --git a/companion/src/simulation/CMakeLists.txt b/companion/src/simulation/CMakeLists.txt index 2191c8b87..a3728eda1 100644 --- a/companion/src/simulation/CMakeLists.txt +++ b/companion/src/simulation/CMakeLists.txt @@ -21,6 +21,7 @@ set(${PROJECT_NAME}_NAMES widgets/virtualjoystickwidget serialportsdialog hostserialconnector + simulateduiwidgetGeneric ) if(SDL2_FOUND) @@ -33,48 +34,9 @@ endif() AddHeadersSources() -set(${PROJECT_NAME}_SRCS - ${${PROJECT_NAME}_SRCS} - simulateduiwidget9X.cpp - simulateduiwidgetBoxer.cpp - simulateduiwidgetCommando8.cpp - simulateduiwidgetEL18.cpp - simulateduiwidgetFatfishF16.cpp - simulateduiwidgetJumperT12.cpp - simulateduiwidgetJumperT12max.cpp - simulateduiwidgetJumperT14.cpp - simulateduiwidgetJumperT15.cpp - simulateduiwidgetJumperT16.cpp - simulateduiwidgetJumperT18.cpp - simulateduiwidgetJumperT20.cpp - simulateduiwidgetJumperTLITE.cpp - simulateduiwidgetJumperTPRO.cpp - simulateduiwidgetJumperTPROS.cpp - simulateduiwidgetJumperBumblebee.cpp - simulateduiwidgetLR3PRO.cpp - simulateduiwidgetMT12.cpp - simulateduiwidgetNV14.cpp - simulateduiwidgetPL18.cpp - simulateduiwidgetPocket.cpp - simulateduiwidgetT8.cpp - simulateduiwidgetTX12.cpp - simulateduiwidgetTX16S.cpp - simulateduiwidgetV16.cpp - simulateduiwidgetX10.cpp - simulateduiwidgetX12.cpp - simulateduiwidgetX7.cpp - simulateduiwidgetX9.cpp - simulateduiwidgetX9D2019.cpp - simulateduiwidgetX9E.cpp - simulateduiwidgetX9LITE.cpp - simulateduiwidgetXLITE.cpp - simulateduiwidgetZorro.cpp -) - set(${PROJECT_NAME}_HDRS ${${PROJECT_NAME}_HDRS} radiouiaction.h - simulateduiwidgetGeneric.h widgets/buttonswidget.h widgets/radiofaderwidget.h widgets/radiokeywidget.h @@ -89,11 +51,6 @@ qt5_wrap_cpp(${PROJECT_NAME}_SRCS ${${PROJECT_NAME}_HDRS} ) -# AUTOUIC does not detect as ui in .h so manually process -qt5_wrap_ui(${PROJECT_NAME}_SRCS - simulateduiwidgetGeneric.ui -) - add_library(${PROJECT_NAME} ${${PROJECT_NAME}_SRCS} ) diff --git a/companion/src/simulation/radiouiaction.h b/companion/src/simulation/radiouiaction.h index fa6909dbb..739b3d432 100644 --- a/companion/src/simulation/radiouiaction.h +++ b/companion/src/simulation/radiouiaction.h @@ -27,7 +27,7 @@ /* * This class is somewhat like a QAction but specific for the radio UI. - * Actions can have one or more keyboard shortcuts associated with them (currently single-key only, w/out modifiers). + * Actions can have one or more keyboard shortcuts associated with them. */ class RadioUiAction : public QObject { @@ -115,11 +115,26 @@ class RadioUiAction : public QObject { if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) { QKeyEvent *keyEvent = static_cast(event); - if ((!keyEvent->modifiers() || keyEvent->modifiers() == Qt::KeypadModifier) && m_keys.contains(keyEvent->key())) { + // Note: Qt::KeypadModifier is required for arrow keys as they are considered part of the keypad + if (((keyEvent->modifiers() == Qt::NoModifier) || (keyEvent->modifiers() & Qt::ShiftModifier) || (keyEvent->modifiers() & Qt::KeypadModifier)) && + m_keys.contains(keyEvent->key())) { + // qDebug() << "Event:" << event->type() << "Key:" << QString("0x%1").arg(keyEvent->key(), 8, 16, QLatin1Char( '0' )) << "Text:" << keyEvent->text() << "found"; trigger(event->type() == QEvent::KeyPress); return true; } + else { + // qDebug() << "Key not found"; + // qDebug() << "Event:" << event->type() << + // "Key:" << QString("0x%1").arg(keyEvent->key(), 8, 16, QLatin1Char( '0' )) << + // "Text:" << keyEvent->text() << + // "Shift:" << (bool)(keyEvent->modifiers() & Qt::ShiftModifier) << + // "Keypad:" << (bool)(keyEvent->modifiers() & Qt::KeypadModifier) << + // "Ctrl:" << (bool)(keyEvent->modifiers() & Qt::ControlModifier) << + // "Alt:" << (bool)(keyEvent->modifiers() & Qt::AltModifier) << + // "Meta:" << (bool)(keyEvent->modifiers() & Qt::MetaModifier); + } } + return QObject::eventFilter(obj, event); } diff --git a/companion/src/simulation/simulateduiwidget.cpp b/companion/src/simulation/simulateduiwidget.cpp index b05f0daec..965cadb60 100644 --- a/companion/src/simulation/simulateduiwidget.cpp +++ b/companion/src/simulation/simulateduiwidget.cpp @@ -26,10 +26,14 @@ #include "radiokeywidget.h" #include "simulatorinterface.h" #include "buttonswidget.h" +#include "appdata.h" #include #include +constexpr int BUTTON_WIDTH {65}; +constexpr int BUTTON_HEIGHT {30}; + //#define FLASH_DURATION 10 //#define CBEEP_ON "QLabel { background-color: #FF364E }" //#define CBEEP_OFF "QLabel { }" @@ -195,11 +199,10 @@ void SimulatedUIWidget::mouseReleaseEvent(QMouseEvent * event) void SimulatedUIWidget::setLcd(LcdWidget * lcd) { m_lcd = lcd; - Board::Type board = getCurrentBoard(); - auto width = Boards::getCapability(board, Board::LcdWidth); - auto height = Boards::getCapability(board, Board::LcdHeight); - auto depth = Boards::getCapability(board, Board::LcdDepth); + auto width = Boards::getCapability(m_board, Board::LcdWidth); + auto height = Boards::getCapability(m_board, Board::LcdHeight); + auto depth = Boards::getCapability(m_board, Board::LcdDepth); m_lcd->setData(width, height, depth); if (!m_backlightColors.size()) @@ -235,6 +238,7 @@ void SimulatedUIWidget::connectScrollActions() // static int SimulatedUIWidget::strKeyToInt(std::string key) { +// MUST be kept in sync with EnumKeys QStringList keys = { "KEY_MENU", "KEY_EXIT", @@ -257,115 +261,203 @@ int SimulatedUIWidget::strKeyToInt(std::string key) return keys.indexOf(key.c_str()); } +// Notes: unused rows will be hidden and squashed +static const QList radioKeyDefinitions = { + { KEY_SYS, 'L', 0, QList() << Qt::Key_S, SIMU_STR_HLP_KEY_S, SIMU_STR_HLP_ACT_SYS }, + + { KEY_MODEL, 'R', 0, QList() << Qt::Key_M, SIMU_STR_HLP_KEY_M, SIMU_STR_HLP_ACT_MDL }, + + { KEY_PAGEUP, 'L', 1, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP }, + + { KEY_PAGEDN, 'R', 1, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN }, + + { KEY_UP, 'L', 2, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_UP }, + + { KEY_DOWN, 'R', 2, QList() << Qt::Key_Down, SIMU_STR_HLP_KEY_DN, SIMU_STR_HLP_ACT_DOWN }, + + { KEY_LEFT, 'L', 3, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_LFT }, + + { KEY_RIGHT, 'R', 3, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_RGT }, + + { KEY_MINUS, 'L', 4, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN, SIMU_STR_HLP_ACT_MIN }, + + { KEY_PLUS, 'R', 4, QList() << Qt::Key_Plus, SIMU_STR_HLP_KEY_PLS, SIMU_STR_HLP_ACT_PLS }, + + { KEY_TELE, 'R', 5, QList() << Qt::Key_T, SIMU_STR_HLP_KEY_T, SIMU_STR_HLP_ACT_TELE }, + + { KEY_MENU, 'L', 6, QList() << Qt::Key_Equal, SIMU_STR_HLP_KEY_EQL, SIMU_STR_HLP_ACT_MENU }, + + { KEY_SHIFT, 'R', 6, QList() << Qt::Key_Insert, SIMU_STR_HLP_KEY_INS, SIMU_STR_HLP_ACT_SHIFT }, + + { KEY_EXIT, 'L', 7, QList() << Qt::Key_Escape + << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT }, + + { KEY_ENTER, 'R', 7, QList() << Qt::Key_Enter + << Qt::Key_Return, SIMU_STR_HLP_KEYS_ENTER, SIMU_STR_HLP_ACT_ENTER }, + + // keep these on the last row + { KEY_SCRLUP, 'L', 8, QList() << Qt::Key_Comma, SIMU_STR_HLP_KEYS_SCRLUP, SIMU_STR_HLP_ACT_ROT_LFT }, + + { KEY_SCRLDN, 'R', 8, QList() << Qt::Key_Period, SIMU_STR_HLP_KEYS_SCRLDN, SIMU_STR_HLP_ACT_ROT_RGT }, +}; + void SimulatedUIWidget::addScrollActions() { - // Note: the keys cannot duplicate those used for radio buttons - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, - SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, - SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); + if (g.simuScrollButtons() || !getCurrentFirmware()->getCapability(RotaryEncoderNavigation)) + return; + + const RadioKeyDefinition *updefn = getRadioKeyDefinition(KEY_SCRLUP); + if (updefn) + m_scrollUpAction = new RadioUiAction(-2, updefn->keys, updefn->helpKeys, updefn->helpActions); + + const RadioKeyDefinition *downdefn = getRadioKeyDefinition(KEY_SCRLDN); + if (downdefn) + m_scrollDnAction = new RadioUiAction(-3, downdefn->keys, downdefn->helpKeys, downdefn->helpActions); + connectScrollActions(); } void SimulatedUIWidget::addMouseActions() { - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, - SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); + const RadioKeyDefinition *defn = getRadioKeyDefinition(KEY_ENTER); + if (defn) + m_mouseMidClickAction = new RadioUiAction(defn->index, defn->keys, defn->helpKeys, defn->helpActions); } -// Notes: unused rows will be hidden and squashed -// keys cannot duplicate those used for scrolling tefer m_mouseMidClickAction -static const QList genericKeyDefinitions = { - { KEY_SYS, 'R', 0, 0, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS }, - - { KEY_MODEL, 'R', 0, 1, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL }, - - { KEY_PAGEUP, 'R', 1, 0, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP }, - - { KEY_PAGEDN, 'R', 1, 1, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN }, - - { KEY_UP, 'R', 2, 0, QList() << Qt::Key_Up - << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_UP }, - - { KEY_DOWN, 'R', 2, 1, QList() << Qt::Key_Down - << Qt::Key_PageDown, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_DN }, - - { KEY_LEFT, 'R', 3, 0, QList() << Qt::Key_Left - << Qt::Key_Minus, SIMU_STR_HLP_KEY_LFT % "|" % SIMU_STR_HLP_KEY_MIN, SIMU_STR_HLP_ACT_MIN }, - - { KEY_RIGHT, 'R', 3, 1, QList() << Qt::Key_Right - << Qt::Key_Plus, SIMU_STR_HLP_KEY_RGT % "|" % SIMU_STR_HLP_KEY_PLS, SIMU_STR_HLP_ACT_PLS }, - - { KEY_MINUS, 'R', 4, 0, QList() << Qt::Key_Minus - << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT % "|" % SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_MIN }, - - { KEY_PLUS, 'R', 4, 1, QList() << Qt::Key_Plus - << Qt::Key_Equal - << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT % "|" % SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_PLS }, - - { KEY_TELE, 'R', 5, 1, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE }, - - { KEY_MENU, 'R', 6, 0, QList() << Qt::Key_Up - << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU }, - - { KEY_SHIFT, 'R', 6, 1, QList() << Qt::Key_S, SIMU_STR_HLP_KEY_SHIFT, SIMU_STR_HLP_ACT_SHIFT }, - - { KEY_EXIT, 'R', 7, 0, QList() << Qt::Key_Down - << Qt::Key_Delete - << Qt::Key_Escape - << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT }, - - { KEY_ENTER, 'R', 7, 1, QList() << Qt::Key_Enter - << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN }, -}; - -void SimulatedUIWidget::addGenericPushButtons(ButtonsWidget * leftButtons, ButtonsWidget * rightButtons) +void SimulatedUIWidget::addPushButtons(ButtonsWidget * leftButtons, ButtonsWidget * rightButtons) { + QGridLayout * gridLeft = new QGridLayout((QWidget *)leftButtons); QGridLayout * leftButtonsGrid = new QGridLayout(); + + if (g.simuGenericKeysPos() != AppData::SIMU_GENERIC_KEYS_RIGHT) { + leftButtons->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding); + gridLeft->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 0); + + int width = 0; + int col = 0; + leftButtonsGrid->setColumnMinimumWidth(col++, BUTTON_WIDTH); + width += BUTTON_WIDTH; + + if (g.simuGenericKeysPos() == AppData::SIMU_GENERIC_KEYS_LEFT) { + leftButtonsGrid->setColumnMinimumWidth(col++, 2); + width += 2; + leftButtonsGrid->setColumnMinimumWidth(col++, BUTTON_WIDTH); + width += BUTTON_WIDTH; + } + + leftButtonsGrid->setColumnMinimumWidth(col++, 2); + width += 2; + leftButtons->setMinimumWidth(width); + gridLeft->addLayout(leftButtonsGrid, 0, 1); + } + else { + leftButtons->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + leftButtons->setFixedSize(0, 0); + } + + QGridLayout * gridRight = new QGridLayout((QWidget *)rightButtons); QGridLayout * rightButtonsGrid = new QGridLayout(); + if (g.simuGenericKeysPos() != AppData::SIMU_GENERIC_KEYS_LEFT) { + rightButtons->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding); + int width = 0; + int col = 0; + rightButtonsGrid->setColumnMinimumWidth(col++, BUTTON_WIDTH); + width += BUTTON_WIDTH; + + if (g.simuGenericKeysPos() == AppData::SIMU_GENERIC_KEYS_RIGHT) { + rightButtonsGrid->setColumnMinimumWidth(col++, 2); + width += 2; + rightButtonsGrid->setColumnMinimumWidth(col++, BUTTON_WIDTH); + width += BUTTON_WIDTH; + } + + rightButtonsGrid->setColumnMinimumWidth(col++, 2); + width += 2; + + rightButtons->setMinimumWidth(width); + gridRight->addLayout(rightButtonsGrid, 0, 0); + gridRight->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1); + } + else { + rightButtons->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + rightButtons->setFixedSize(0, 0); + } + for (int i = 0; i < Boards::getCapability(m_board, Board::Keys); i++) { Board::KeyInfo info = Boards::getKeyInfo(i, m_board); int idx = strKeyToInt(info.key); //qDebug() << "key:" << info.key.c_str() << info.name.c_str() << info.label.c_str() << idx; if (idx >= 0) - addGenericPushButton(idx, info.label.c_str(), leftButtons, leftButtonsGrid, rightButtons, rightButtonsGrid); + addPushButton(idx, info.label.c_str(), leftButtons, leftButtonsGrid, rightButtons, rightButtonsGrid); else qDebug() << "Unknown key:" << info.key.c_str() << info.name.c_str() << info.label.c_str(); } - QGridLayout * gridLeft = new QGridLayout((QWidget *)leftButtons); - gridLeft->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 0); - gridLeft->addLayout(leftButtonsGrid, 0, 1); - //gridLeft->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 2); - - QGridLayout * gridRight = new QGridLayout((QWidget *)rightButtons); - //gridRight->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 0); - gridRight->addLayout(rightButtonsGrid, 0, 1); - gridRight->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 2); + if (g.simuScrollButtons() && getCurrentFirmware()->getCapability(RotaryEncoderNavigation)) { + addPushButton(KEY_SCRLUP, tr("Scrl Up"), leftButtons, leftButtonsGrid, rightButtons, rightButtonsGrid); + addPushButton(KEY_SCRLDN, tr("Scrl Dn"), leftButtons, leftButtonsGrid, rightButtons, rightButtonsGrid); + connectScrollActions(); + } } -void SimulatedUIWidget::addGenericPushButton(int index, QString label, ButtonsWidget * leftButtons, QGridLayout * leftButtonsGrid, - ButtonsWidget * rightButtons, QGridLayout * rightButtonsGrid) +void SimulatedUIWidget::addPushButton(int index, QString label, ButtonsWidget * leftButtons, QGridLayout * leftButtonsGrid, + ButtonsWidget * rightButtons, QGridLayout * rightButtonsGrid) { - if (index >= genericKeyDefinitions.size()) - return; - - for (int i = 0; i < genericKeyDefinitions.size(); i++) { - const GenericKeyDefinition defn = genericKeyDefinitions.at(i); + for (int i = 0; i < radioKeyDefinitions.size(); i++) { + const RadioKeyDefinition defn = radioKeyDefinitions.at(i); if (defn.index == index) { QPushButton * b = new QPushButton(label); + b->setToolTip(tr("Shortcut: %1").arg(defn.helpKeys)); b->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - b->setMinimumSize(60, 30); - b->setMaximumSize(60, 30); - RadioUiAction * act = new RadioUiAction(); - ButtonsWidget * btns = defn.side == 'L' ? leftButtons : rightButtons; - QGridLayout * grid = defn.side == 'L' ? leftButtonsGrid : rightButtonsGrid; - grid->addWidget(b, defn.gridRow, defn.gridCol); - act = new RadioUiAction(defn.index, defn.keys, defn.helpKeys, defn.helpActions); + b->setMinimumSize(BUTTON_WIDTH, BUTTON_HEIGHT); + b->setMaximumSize(b->minimumSize()); + ButtonsWidget * btns = g.simuGenericKeysPos() == AppData::SIMU_GENERIC_KEYS_DEFAULT ? (defn.side == 'L' ? leftButtons : rightButtons) : + (g.simuGenericKeysPos() == AppData::SIMU_GENERIC_KEYS_LEFT ? leftButtons : rightButtons); + QGridLayout * grid = g.simuGenericKeysPos() == AppData::SIMU_GENERIC_KEYS_DEFAULT ? (defn.side == 'L' ? leftButtonsGrid : rightButtonsGrid) : + (g.simuGenericKeysPos() == AppData::SIMU_GENERIC_KEYS_LEFT ? leftButtonsGrid : rightButtonsGrid); + int col = g.simuGenericKeysPos() == AppData::SIMU_GENERIC_KEYS_DEFAULT ? 0 : (defn.side == 'L' ? 0 : 2); + grid->setRowMinimumHeight(defn.gridRow, BUTTON_HEIGHT); + grid->addWidget(b, defn.gridRow, col); + int idx = -1; + + switch (defn.index) { + case KEY_SCRLUP: + idx = -2; + break; + case KEY_SCRLDN: + idx = -3; + break; + default: + idx = defn.index; + } + + RadioUiAction * act = new RadioUiAction(idx, defn.keys, defn.helpKeys, defn.helpActions); + + switch (defn.index) { + case KEY_SCRLUP: + m_scrollUpAction = act; + break; + case KEY_SCRLDN: + m_scrollDnAction = act; + break; + } + addRadioWidget(btns->addPushButton(b, act)); break; } } } + +const RadioKeyDefinition * SimulatedUIWidget::getRadioKeyDefinition(const int key) const +{ + for (int i = 0; i < radioKeyDefinitions.size(); i++) { + const RadioKeyDefinition defn = radioKeyDefinitions.at(i); + if (defn.index == key) + return &radioKeyDefinitions.at(i); + } + + qDebug() << "Unknown key:" << key; + return nullptr; +} diff --git a/companion/src/simulation/simulateduiwidget.h b/companion/src/simulation/simulateduiwidget.h index cbb8b557f..c37947f83 100644 --- a/companion/src/simulation/simulateduiwidget.h +++ b/companion/src/simulation/simulateduiwidget.h @@ -38,6 +38,7 @@ class ButtonsWidget; class QPushButton; // Match with /radio/src/hal/key_driver.h +// key in sync with strKeyToInt enum EnumKeys { KEY_MENU, KEY_EXIT, @@ -62,24 +63,25 @@ enum EnumKeys { KEY_SHIFT, KEY_BIND, - MAX_KEYS + // these are only used by the simulator + KEY_SCRLUP, + KEY_SCRLDN }; -struct GenericKeyDefinition { +struct RadioKeyDefinition { int index = 0; QChar side = 'L'; int gridRow = 0; - int gridCol = 0; QList keys = QList(); QString helpKeys = ""; QString helpActions = ""; - GenericKeyDefinition(int index, QChar side, int gridRow, int gridCol, - QList keys, QString helpKeys, QString helpActions) : - index(index), side(side), gridRow(gridRow), gridCol(gridCol), - keys(keys), helpKeys(helpKeys), helpActions(helpActions) {} + RadioKeyDefinition(int index, QChar side, int gridRow, + QList keys, QString helpKeys, QString helpActions) : + index(index), side(side), gridRow(gridRow), + keys(keys), helpKeys(helpKeys), helpActions(helpActions) {} - GenericKeyDefinition() = default; + RadioKeyDefinition() = default; }; /* @@ -115,11 +117,14 @@ class SimulatedUIWidget : public QWidget void mousePressEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event); + virtual void shrink() { }; + signals: void controlValueChange(RadioWidget::RadioWidgetType type, int index, int value); void customStyleRequest(const QString & style); void simulatorWheelEvent(qint8 steps); + void resizeRequest(); protected slots: @@ -147,471 +152,10 @@ class SimulatedUIWidget : public QWidget static int strKeyToInt(std::string key); - void addGenericPushButton(int index, QString label, ButtonsWidget * leftButtons, QGridLayout * leftButtonsGrid, - ButtonsWidget * rightButtons, QGridLayout * rightButtonsGrid); - void addGenericPushButtons(ButtonsWidget * leftButtons, ButtonsWidget * rightButtons); + void addPushButton(int index, QString label, ButtonsWidget * leftButtons, QGridLayout * leftButtonsGrid, + ButtonsWidget * rightButtons, QGridLayout * rightButtonsGrid); + void addPushButtons(ButtonsWidget * leftButtons, ButtonsWidget * rightButtons); void addScrollActions(); void addMouseActions(); -}; - - -// Each subclass is responsible for its own Ui -namespace Ui { - class SimulatedUIWidgetGeneric; - class SimulatedUIWidget9X; - class SimulatedUIWidgetX9LITE; - class SimulatedUIWidgetX7; - class SimulatedUIWidgetX9; - class SimulatedUIWidgetXLITE; - class SimulatedUIWidgetX9E; - class SimulatedUIWidgetX9D2019; - class SimulatedUIWidgetX10; - class SimulatedUIWidgetX12; - class SimulatedUIWidgetLR3PRO; - class SimulatedUIWidgetCommando8; - class SimulatedUIWidgetJumperT12; - class SimulatedUIWidgetJumperTLITE; - class SimulatedUIWidgetJumperTPRO; - class SimulatedUIWidgetJumperTPROS; - class SimulatedUIWidgetJumperBumblebee; - class SimulatedUIWidgetJumperT12max; - class SimulatedUIWidgetJumperT14; - class SimulatedUIWidgetJumperT15; - class SimulatedUIWidgetJumperT16; - class SimulatedUIWidgetJumperT18; - class SimulatedUIWidgetJumperT20; - class SimulatedUIWidgetTX16S; - class SimulatedUIWidgetTX12; - class SimulatedUIWidgetZorro; - class SimulatedUIWidgetBoxer; - class SimulatedUIWidgetMT12; - class SimulatedUIWidgetPocket; - class SimulatedUIWidgetT8; - class SimulatedUIWidgetFatfishF16; - class SimulatedUIWidgetNV14; - class SimulatedUIWidgetEL18; - class SimulatedUIWidgetPL18; - class SimulatedUIWidgetV16; -} - -class SimulatedUIWidgetGeneric: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetGeneric(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetGeneric(); - - private: - Ui::SimulatedUIWidgetGeneric * ui; - -}; - -class SimulatedUIWidget9X: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidget9X(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidget9X(); - - protected: - void setLightOn(bool enable); - - private: - Ui::SimulatedUIWidget9X * ui; - -}; - -class SimulatedUIWidgetX9LITE: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetX9LITE(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetX9LITE(); - - private: - Ui::SimulatedUIWidgetX9LITE * ui; -}; - -class SimulatedUIWidgetX7: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetX7(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetX7(); - - private: - Ui::SimulatedUIWidgetX7 * ui; -}; - -class SimulatedUIWidgetX9: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetX9(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetX9(); - - private: - Ui::SimulatedUIWidgetX9 * ui; -}; - -class SimulatedUIWidgetXLITE: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetXLITE(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetXLITE(); - - private: - Ui::SimulatedUIWidgetXLITE * ui; -}; - -class SimulatedUIWidgetX9E: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetX9E(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetX9E(); - - private: - Ui::SimulatedUIWidgetX9E * ui; -}; - -class SimulatedUIWidgetX9D2019: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetX9D2019(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetX9D2019(); - - private: - Ui::SimulatedUIWidgetX9D2019 * ui; -}; - -class SimulatedUIWidgetX10: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetX10(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetX10(); - - private: - Ui::SimulatedUIWidgetX10 * ui; -}; - -class SimulatedUIWidgetX12: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetX12(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetX12(); - - private: - Ui::SimulatedUIWidgetX12 * ui; -}; - -class SimulatedUIWidgetLR3PRO: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetLR3PRO(SimulatorInterface * simulator, QWidget * parent = NULL); - virtual ~SimulatedUIWidgetLR3PRO(); - - private: - Ui::SimulatedUIWidgetLR3PRO * ui; -}; - -class SimulatedUIWidgetCommando8: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetCommando8(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetCommando8(); - - private: - Ui::SimulatedUIWidgetCommando8 * ui; -}; - -class SimulatedUIWidgetJumperT12: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetJumperT12(SimulatorInterface * simulator, QWidget * parent = NULL); - virtual ~SimulatedUIWidgetJumperT12(); - - private: - Ui::SimulatedUIWidgetJumperT12 * ui; -}; - -class SimulatedUIWidgetJumperTLITE: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetJumperTLITE(SimulatorInterface * simulator, QWidget * parent = NULL); - virtual ~SimulatedUIWidgetJumperTLITE(); - - private: - Ui::SimulatedUIWidgetJumperTLITE * ui; -}; - -class SimulatedUIWidgetJumperTPRO: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetJumperTPRO(SimulatorInterface * simulator, QWidget * parent = NULL); - virtual ~SimulatedUIWidgetJumperTPRO(); - - private: - Ui::SimulatedUIWidgetJumperTPRO * ui; -}; - -class SimulatedUIWidgetJumperTPROS: public SimulatedUIWidget -{ - Q_OBJECT - -public: - explicit SimulatedUIWidgetJumperTPROS(SimulatorInterface * simulator, QWidget * parent = NULL); - virtual ~SimulatedUIWidgetJumperTPROS(); - -private: - Ui::SimulatedUIWidgetJumperTPROS * ui; -}; - -class SimulatedUIWidgetJumperBumblebee: public SimulatedUIWidget -{ - Q_OBJECT - -public: - explicit SimulatedUIWidgetJumperBumblebee(SimulatorInterface * simulator, QWidget * parent = NULL); - virtual ~SimulatedUIWidgetJumperBumblebee(); - -private: - Ui::SimulatedUIWidgetJumperBumblebee * ui; -}; - -class SimulatedUIWidgetJumperT15: public SimulatedUIWidget -{ - Q_OBJECT - -public: - explicit SimulatedUIWidgetJumperT15(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetJumperT15(); - -private: - Ui::SimulatedUIWidgetJumperT15 * ui; -}; - -class SimulatedUIWidgetJumperT16: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetJumperT16(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetJumperT16(); - - private: - Ui::SimulatedUIWidgetJumperT16 * ui; -}; - -class SimulatedUIWidgetJumperT12max: public SimulatedUIWidget -{ - Q_OBJECT - -public: - explicit SimulatedUIWidgetJumperT12max(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetJumperT12max(); - -private: - Ui::SimulatedUIWidgetJumperT12max * ui; -}; - -class SimulatedUIWidgetJumperT14: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetJumperT14(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetJumperT14(); - - private: - Ui::SimulatedUIWidgetJumperT14 * ui; -}; - -class SimulatedUIWidgetJumperT18: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetJumperT18(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetJumperT18(); - - private: - Ui::SimulatedUIWidgetJumperT18 * ui; -}; - -class SimulatedUIWidgetJumperT20: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetJumperT20(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetJumperT20(); - - private: - Ui::SimulatedUIWidgetJumperT20 * ui; -}; - -class SimulatedUIWidgetTX12: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetTX12(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetTX12(); - - private: - Ui::SimulatedUIWidgetTX12 * ui; -}; - -class SimulatedUIWidgetTX16S: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetTX16S(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetTX16S(); - - private: - Ui::SimulatedUIWidgetTX16S * ui; -}; - -class SimulatedUIWidgetZorro: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetZorro(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetZorro(); - - private: - Ui::SimulatedUIWidgetZorro * ui; -}; - -class SimulatedUIWidgetBoxer: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetBoxer(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetBoxer(); - - private: - Ui::SimulatedUIWidgetBoxer * ui; -}; - -class SimulatedUIWidgetMT12: public SimulatedUIWidgetGeneric -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetMT12(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetMT12(); -}; - -class SimulatedUIWidgetPocket: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetPocket(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetPocket(); - - private: - Ui::SimulatedUIWidgetPocket * ui; -}; - -class SimulatedUIWidgetT8: public SimulatedUIWidget -{ -Q_OBJECT - -public: - explicit SimulatedUIWidgetT8(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetT8(); - -private: - Ui::SimulatedUIWidgetT8 * ui; -}; - -class SimulatedUIWidgetFatfishF16: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetFatfishF16(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetFatfishF16(); - - private: - Ui::SimulatedUIWidgetFatfishF16 * ui; -}; - -class SimulatedUIWidgetNV14: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetNV14(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetNV14(); - - private: - Ui::SimulatedUIWidgetNV14 * ui; -}; - -class SimulatedUIWidgetEL18: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetEL18(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetEL18(); - - private: - Ui::SimulatedUIWidgetEL18 * ui; -}; - -class SimulatedUIWidgetPL18: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetPL18(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetPL18(); - - private: - Ui::SimulatedUIWidgetPL18 * ui; -}; - -class SimulatedUIWidgetV16: public SimulatedUIWidget -{ - Q_OBJECT - - public: - explicit SimulatedUIWidgetV16(SimulatorInterface * simulator, QWidget * parent = nullptr); - virtual ~SimulatedUIWidgetV16(); - - private: - Ui::SimulatedUIWidgetV16 * ui; + const RadioKeyDefinition * getRadioKeyDefinition(const int key) const; }; diff --git a/companion/src/simulation/simulateduiwidget9X.cpp b/companion/src/simulation/simulateduiwidget9X.cpp deleted file mode 100644 index fe595b6f0..000000000 --- a/companion/src/simulation/simulateduiwidget9X.cpp +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidget9X.h" -#include "eeprominterface.h" - -SimulatedUIWidget9X::SimulatedUIWidget9X(SimulatorInterface * simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidget9X) -{ - RadioUiAction * act; - QPolygon polygon; - - ui->setupUi(this); - - bool hasRotEnc = getCurrentFirmware()->getCapability(Capability::RotaryEncoders); - - // add actions in order of appearance on the help menu - - int x = 68, y = 91, oR = 63; - - polygon << QPoint(x, y) << polyArc(x, y, oR, -45, 45); - act = new RadioUiAction(KEY_PLUS, QList() << Qt::Key_Up << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP % (hasRotEnc ? QString("") : "|" % SIMU_STR_HLP_MOUSE_UP), SIMU_STR_HLP_ACT_UP); - addRadioWidget(ui->leftbuttons->addArea(polygon, "9X/9xcursup.png", act)); - - polygon.clear(); - polygon << QPoint(x, y) << polyArc(x, y, oR, 135, 225); - act = new RadioUiAction(KEY_MINUS, QList() << Qt::Key_Down << Qt::Key_PageDown, SIMU_STR_HLP_KEYS_GO_DN % (hasRotEnc ? QString("") : "|" % SIMU_STR_HLP_MOUSE_DN), SIMU_STR_HLP_ACT_DN); - addRadioWidget(ui->leftbuttons->addArea(polygon, "9X/9xcursdown.png", act)); - - polygon.clear(); - polygon << QPoint(x, y) << polyArc(x, y, oR, 45, 135); - act = new RadioUiAction(KEY_MINUS, QList() << Qt::Key_Right << Qt::Key_Minus, SIMU_STR_HLP_KEY_RGT % "|" % SIMU_STR_HLP_KEY_MIN, SIMU_STR_HLP_ACT_MIN); - addRadioWidget(ui->leftbuttons->addArea(polygon, "9X/9xcursmin.png", act)); - - polygon.clear(); - polygon << QPoint(x, y) << polyArc(x, y, oR, 225, 315); - act = new RadioUiAction(KEY_PLUS, QList() << Qt::Key_Left << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_LFT % "|" % SIMU_STR_HLP_KEY_PLS, SIMU_STR_HLP_ACT_PLS); - addRadioWidget(ui->leftbuttons->addArea(polygon, "9X/9xcursplus.png", act)); - - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEY_ENTER, SIMU_STR_HLP_ACT_MENU); - addRadioWidget(ui->rightbuttons->addArea(QRect(16, 54, 60, 34), "9X/9xmenumenu.png", act)); - - if (!hasRotEnc) { - m_mouseMidClickAction = act; - m_mouseMidClickAction->setText(act->getText() % "|" % SIMU_STR_HLP_MOUSE_MID); - } - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->rightbuttons->addArea(QRect(16, 114, 60, 34), "9X/9xmenuexit.png", act)); - - addRadioWidget(ui->leftbuttons->addArea(QRect(6, 149, 30, 30), "9X/9xcursphoto.png", m_screenshotAction)); - - if (hasRotEnc) { - addRadioAction(new RadioUiAction(-1, 0, SIMU_STR_HLP_MOUSE_SCRL, SIMU_STR_HLP_ROTENC % "|" % SIMU_STR_HLP_ROTENC_LR)); - m_mouseMidClickAction = new RadioUiAction(KEY_SYS, Qt::Key_Insert, SIMU_STR_HLP_KEY_INS % "|" % SIMU_STR_HLP_MOUSE_MID, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->leftbuttons->addArea(QRect(0, 0, 0, 0), "9X/9xcurs.png", m_mouseMidClickAction)); - } - - m_backlightColors << QColor(159,165,247); - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); -} - -SimulatedUIWidget9X::~SimulatedUIWidget9X() -{ - delete ui; -} - -void SimulatedUIWidget9X::setLightOn(bool enable) -{ - static QStringList list = QStringList() << "bl" << "gr" << "rd" << "or" << "yl"; - static QString bgfmt = "background:url(:/images/simulator/9X/9xd%1%2.png);"; - QString bg = ""; - if (enable && (int)m_backLight < list.size()) { - bg = "-" + list[m_backLight]; - } - ui->top->setStyleSheet(bgfmt.arg("t").arg(bg)); - ui->bottom->setStyleSheet(bgfmt.arg("b").arg(bg)); - ui->left->setStyleSheet(bgfmt.arg("l").arg(bg)); - ui->right->setStyleSheet(bgfmt.arg("r").arg(bg)); -} - diff --git a/companion/src/simulation/simulateduiwidget9X.ui b/companion/src/simulation/simulateduiwidget9X.ui deleted file mode 100644 index 639f3a5b0..000000000 --- a/companion/src/simulation/simulateduiwidget9X.ui +++ /dev/null @@ -1,198 +0,0 @@ - - - SimulatedUIWidget9X - - - - 0 - 0 - 569 - 186 - - - - - 0 - 0 - - - - - 569 - 186 - - - - - 569 - 186 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 128 - 186 - - - - true - - - background:url(:/images/simulator/9X/9xcurs.png); - - - - - - - - 0 - 0 - - - - - 41 - 186 - - - - background:url(:/images/simulator/9X/9xdl.png) - - - - - - - - 0 - 0 - - - - - 256 - 29 - - - - background:url(:/images/simulator/9X/9xdt.png) - - - - - - - - 0 - 0 - - - - - 55 - 186 - - - - background:url(:/images/simulator/9X/9xdr.png) - - - - - - - - 0 - 0 - - - - - 89 - 186 - - - - background:url(:/images/simulator/9X/9xmenu.png) - - - - - - - - 0 - 0 - - - - - 256 - 128 - - - - - - - - - 0 - 0 - - - - - 256 - 29 - - - - background:url(:/images/simulator/9X/9xdb.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetBoxer.cpp b/companion/src/simulation/simulateduiwidgetBoxer.cpp deleted file mode 100644 index 47e2c8190..000000000 --- a/companion/src/simulation/simulateduiwidgetBoxer.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetBoxer.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetBoxer::SimulatedUIWidgetBoxer(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetBoxer) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->rightbuttons->addArea(QRect(80, 10, 60, 30), "Boxer/right-mdl.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(40, 60, 46, 90), "Boxer/right-ent.png", m_mouseMidClickAction)); - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(18, 10, 66, 30), "Boxer/left-sys.png", act)); - - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->leftbuttons->addArea(QRect(72, 149, 62, 24), "Boxer/left-tele.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(QRect(72, 79, 62, 24), "Boxer/left-pagedn.png", act)); - - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->leftbuttons->addArea(QRect(72, 114, 62, 24), "Boxer/left-pageup.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(72, 44, 62, 24), "Boxer/left-rtn.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus << Qt::Key_Equal << Qt::Key_Left, SIMU_STR_HLP_KEYS_GO_LFT, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Right, SIMU_STR_HLP_KEYS_GO_RGT, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetBoxer::~SimulatedUIWidgetBoxer() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetBoxer.ui b/companion/src/simulation/simulateduiwidgetBoxer.ui deleted file mode 100644 index 1a4583b1b..000000000 --- a/companion/src/simulation/simulateduiwidgetBoxer.ui +++ /dev/null @@ -1,219 +0,0 @@ - - - SimulatedUIWidgetBoxer - - - - 0 - 0 - 567 - 186 - - - - - 0 - 0 - - - - - 567 - 186 - - - - - 567 - 186 - - - - Radiomaster Boxer Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - true - - - - 0 - 0 - 157 - 186 - - - - - 0 - 0 - - - - - 157 - 186 - - - - - 157 - 186 - - - - background:url(:/images/simulator/Boxer/left.png); - - - - - - 410 - 0 - 157 - 186 - - - - - 0 - 0 - - - - - 157 - 186 - - - - - 157 - 186 - - - - background:url(:/images/simulator/Boxer/right.png) - - - - - - 155 - 176 - 256 - 10 - - - - - 0 - 0 - - - - - 256 - 10 - - - - - 256 - 10 - - - - background:url(:/images/simulator/Boxer/bottom.png) - - - - - - 155 - 48 - 256 - 128 - - - - - 0 - 0 - - - - - 200 - 100 - - - - - 424 - 180 - - - - background-color: rgb(215, 243, 255); - - - - - - 137 - 0 - 300 - 49 - - - - - 0 - 0 - - - - - 200 - 40 - - - - - 300 - 49 - - - - background:url(:/images/simulator/Boxer/top.png) - - - bottom - top - rightbuttons - leftbuttons - lcd - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - - - diff --git a/companion/src/simulation/simulateduiwidgetCommando8.cpp b/companion/src/simulation/simulateduiwidgetCommando8.cpp deleted file mode 100644 index 3856a38d2..000000000 --- a/companion/src/simulation/simulateduiwidgetCommando8.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetCommando8.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetCommando8::SimulatedUIWidgetCommando8(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetCommando8) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_MINUS, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->bottom->addArea(QRect(50, 44, 18, 18), "Commando8/left-mdl.png", act)); - - act = new RadioUiAction(KEY_PLUS, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_UP); - addRadioWidget(ui->bottom->addArea(QRect(248, 25, 18, 18), "Commando8/right-up.png", act)); - - act = new RadioUiAction(KEY_MINUS, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_DN); - addRadioWidget(ui->bottom->addArea(QRect(248, 62, 18, 18), "Commando8/right-dn.png", act)); - - act = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ENT); - addRadioWidget(ui->bottom->addArea(QRect(250, 45, 15, 15), "Commando8/right-ent.png", act)); - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->bottom->addArea(QRect(34, 46, 15, 15), "Commando8/left-sys.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->bottom->addArea(QRect(14, 44, 18, 18), "Commando8/left-rtn.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->bottom->addArea(QRect(267, 43, 18, 18), "Commando8/right-pagedn.png", act)); - - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->bottom->addArea(QRect(230, 43, 18, 18), "Commando8/right-pageup.png", act)); - - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetCommando8::~SimulatedUIWidgetCommando8() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetCommando8.ui b/companion/src/simulation/simulateduiwidgetCommando8.ui deleted file mode 100644 index aae45c37e..000000000 --- a/companion/src/simulation/simulateduiwidgetCommando8.ui +++ /dev/null @@ -1,149 +0,0 @@ - - - SimulatedUIWidgetCommando8 - - - - 0 - 0 - 300 - 310 - - - - - 0 - 0 - - - - - 300 - 310 - - - - - 300 - 310 - - - - iFlight Commando8 Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - - 0 - 0 - 300 - 79 - - - - - 0 - 0 - - - - - 300 - 79 - - - - - 254 - 79 - - - - background:url(:/images/simulator/Commando8/top.png) - - - - - - 22 - 80 - 256 - 128 - - - - - 0 - 0 - - - - - 256 - 128 - - - - - 256 - 128 - - - - background-color: rgb(215, 243, 255); - - - - - - 0 - 210 - 300 - 99 - - - - - 0 - 0 - - - - - 300 - 99 - - - - - 300 - 99 - - - - background:url(:/images/simulator/Commando8/bottom.png) - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - - - diff --git a/companion/src/simulation/simulateduiwidgetEL18.cpp b/companion/src/simulation/simulateduiwidgetEL18.cpp deleted file mode 100644 index 80e100e0b..000000000 --- a/companion/src/simulation/simulateduiwidgetEL18.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetEL18.h" - -SimulatedUIWidgetEL18::SimulatedUIWidgetEL18(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetEL18) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(QPoint(65, 15), QSize(40, 40)), "NV14/lhs_hat_up.png", act)); - - //act = new RadioUiAction(13, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_EXIT); - //addRadioWidget(ui->leftbuttons->addArea(QRect(QPoint(5, 75), QSize(40, 40)), "NV14/lhs_hat_left.png", act)); - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->leftbuttons->addArea(QRect(QPoint(130, 75), QSize(40, 40)), "NV14/lhs_hat_right.png", act)); - - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Down, SIMU_STR_HLP_KEY_DN, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->leftbuttons->addArea(QRect(QPoint(65, 140), QSize(40, 40)), "NV14/lhs_hat_down.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(QPoint(60, 70), QSize(50, 50)), "NV14/lhs_hat_press.png", act)); - - act = new RadioUiAction(KEY_UP, QList() << Qt::Key_Plus, SIMU_STR_HLP_KEY_PLS, SIMU_STR_HLP_ACT_PREVINC); - addRadioWidget(ui->rightbuttons->addArea(QRect(QPoint(95, 15), QSize(40, 40)), "NV14/rhs_hat_up.png", act)); - - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->rightbuttons->addArea(QRect(QPoint(35, 75), QSize(40, 40)), "NV14/rhs_hat_left.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->rightbuttons->addArea(QRect(QPoint(160, 75), QSize(40, 40)), "NV14/rhs_hat_right.png", act)); - - act = new RadioUiAction(KEY_DOWN, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN, SIMU_STR_HLP_ACT_NEXTDEC); - addRadioWidget(ui->rightbuttons->addArea(QRect(QPoint(95, 140), QSize(40, 40)), "NV14/rhs_hat_down.png", act)); - - act = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ENT); - addRadioWidget(ui->rightbuttons->addArea(QRect(QPoint(90, 70), QSize(50, 50)), "NV14/rhs_hat_press.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_backlightColors << QColor(47, 123, 227); - - setLcd(ui->lcd); -} - -SimulatedUIWidgetEL18::~SimulatedUIWidgetEL18() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetEL18.ui b/companion/src/simulation/simulateduiwidgetEL18.ui deleted file mode 100644 index 82ee92109..000000000 --- a/companion/src/simulation/simulateduiwidgetEL18.ui +++ /dev/null @@ -1,206 +0,0 @@ - - - SimulatedUIWidgetEL18 - - - - 0 - 0 - 724 - 506 - - - - - 0 - 0 - - - - - 724 - 506 - - - - - 724 - 506 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 202 - 506 - - - - - 202 - 506 - - - - background:url(:/images/simulator/NV14/rhs.png) - - - - - - - - 0 - 0 - - - - - 320 - 480 - - - - - 320 - 480 - - - - - 5 - - - - - - - - - 0 - 0 - - - - - 202 - 506 - - - - - 202 - 506 - - - - true - - - background:url(:/images/simulator/NV14/lhs.png); - - - - - - - - 0 - 0 - - - - - 320 - 13 - - - - - 320 - 13 - - - - - 5 - - - - background:url(:/images/simulator/NV14/top.png) - - - - - - - - 0 - 0 - - - - - 320 - 13 - - - - - 320 - 13 - - - - - 5 - false - - - - background:url(:/images/simulator/NV14/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetFatfishF16.cpp b/companion/src/simulation/simulateduiwidgetFatfishF16.cpp deleted file mode 100644 index bdda7580c..000000000 --- a/companion/src/simulation/simulateduiwidgetFatfishF16.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetFatfishF16.h" - -SimulatedUIWidgetFatfishF16::SimulatedUIWidgetFatfishF16(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetFatfishF16) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(60, 10, 90, 50), "Fatfish/F16/left.png", act)); - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->leftbuttons->addArea(QRect(75, 107, 80, 30), "Fatfish/F16/left.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(QRect(75, 172, 80, 30), "Fatfish/F16/left.png", act)); - - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->leftbuttons->addArea(QRect(75, 237, 80, 30), "Fatfish/F16/left.png", act)); - - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->leftbuttons->addArea(QRect(75, 302, 80, 30), "Fatfish/F16/left.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(45, 170, 65, 125), "Fatfish/F16/right.png", m_mouseMidClickAction)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, - SIMU_STR_HLP_KEY_DN % "
" % SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_RTN); - addRadioWidget(ui->rightbuttons->addArea(QRect(50, 10, 90, 50), "Fatfish/F16/right.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_backlightColors << QColor(47, 123, 227); - - setLcd(ui->lcd); -} - -SimulatedUIWidgetFatfishF16::~SimulatedUIWidgetFatfishF16() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetFatfishF16.ui b/companion/src/simulation/simulateduiwidgetFatfishF16.ui deleted file mode 100644 index 00b71129c..000000000 --- a/companion/src/simulation/simulateduiwidgetFatfishF16.ui +++ /dev/null @@ -1,208 +0,0 @@ - - - SimulatedUIWidgetFatfishF16 - - - - 0 - 0 - 868 - 428 - - - - - 0 - 0 - - - - - 868 - 428 - - - - - 868 - 428 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 480 - 116 - - - - - 480 - 116 - - - - - 5 - - - - background:url(:/images/simulator/Fatfish/F16/top.png) - - - - - - - - 0 - 0 - - - - - 480 - 40 - - - - - 480 - 40 - - - - - 5 - false - - - - background:url(:/images/simulator/Fatfish/F16/bottom.png) - - - - - - - - 0 - 0 - - - - - 480 - 272 - - - - - 480 - 272 - - - - - 5 - - - - - - - - - 0 - 0 - - - - - 194 - 428 - - - - - 194 - 428 - - - - background:url(:/images/simulator/Fatfish/F16/right.png) - - - - - - - - 0 - 0 - - - - - 194 - 428 - - - - - 194 - 428 - - - - true - - - background:url(:/images/simulator/Fatfish/F16/left.png); - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - - - diff --git a/companion/src/simulation/simulateduiwidgetGeneric.cpp b/companion/src/simulation/simulateduiwidgetGeneric.cpp new file mode 100644 index 000000000..c8dfef6eb --- /dev/null +++ b/companion/src/simulation/simulateduiwidgetGeneric.cpp @@ -0,0 +1,107 @@ +/* + * Copyright (C) EdgeTX + * + * Based on code named + * opentx - https://github.com/opentx/opentx + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "simulateduiwidgetGeneric.h" +#include "ui_simulateduiwidgetGeneric.h" +#include "eeprominterface.h" + +/* + Note: This class is not expected to be instantiated directly but as the base for each firmware that uses it + due to the methods and functions surrounding the building and loading of radio simulators +*/ + +SimulatedUIWidgetGeneric::SimulatedUIWidgetGeneric(SimulatorInterface *simulator, QWidget * parent): + SimulatedUIWidget(simulator, parent), + ui(new Ui::SimulatedUIWidgetGeneric) +{ + ui->setupUi(this); + Board::Type board = getCurrentBoard(); + + if (Boards::getCapability(board, Board::HasBacklightColor)) { + m_backlightColors << QColor(215, 243, 255); // blue + m_backlightColors << QColor(166, 247, 159); // green + m_backlightColors << QColor(247, 159, 166); // red + m_backlightColors << QColor(255, 195, 151); // orange + m_backlightColors << QColor(247, 242, 159); // yellow + } + else + m_backlightColors << QColor(47, 123, 227); + + if (Boards::getCapability(board, Board::LcdOLED)) { + ui->lcd->setBgDefaultColor(QColor(0, 0, 0)); // black + ui->lcd->setFgDefaultColor(QColor(255, 255, 255)); // white + } + + setLcd(ui->lcd); + + // TODO: move to setLcd when all radios using generic + auto lcdDepth = Boards::getCapability(board, Board::LcdDepth); + auto lcdWidth = Boards::getCapability(board, Board::LcdWidth) * (lcdDepth < 12 ? 2 : 1); + auto lcdHeight = Boards::getCapability(board, Board::LcdHeight) * (lcdDepth < 12 ? 2 : 1); + + ui->lcd->setFixedSize(lcdWidth, lcdHeight); + // end TODO + + addPushButtons(ui->leftbuttons, ui->rightbuttons); + addScrollActions(); + + int widgetHeight = lcdHeight; + + if (ui->leftbuttons->height() > widgetHeight) + widgetHeight = ui->leftbuttons->height(); + + if (ui->rightbuttons->height() > widgetHeight) + widgetHeight = ui->rightbuttons->height(); + + int widgetWidth = lcdWidth + ui->leftbuttons->width() + ui->rightbuttons->width(); + + setFixedSize(50 + widgetWidth, 50 + widgetHeight); + + // workaround to delay resize until after parent has been resized + QTimer * t1 = new QTimer(this); + t1->setSingleShot(true); + connect(t1, &QTimer::timeout, [this]() { + emit resizeRequest(); + }); + t1->start(100); + + // workaround to delay changing until after parent has been initialised + QString css = "#radioUiWidget { background-color: " + QVariant(g.currentProfile().radioSimCaseColor()).toString() + "; }"; + + QTimer * t2 = new QTimer(this); + t2->setSingleShot(true); + connect(t2, &QTimer::timeout, [this, css]() { + emit customStyleRequest(css); + }); + t2->start(100); +} + +SimulatedUIWidgetGeneric::~SimulatedUIWidgetGeneric() +{ + delete ui; +} + +void SimulatedUIWidgetGeneric::shrink() +{ + // adjust parent before child to ensure parent does not constrain child + adjustSize(); + ui->lcd->adjustSize(); +} diff --git a/companion/src/simulation/simulateduiwidgetGeneric.h b/companion/src/simulation/simulateduiwidgetGeneric.h index 8c31d510a..e3c9f1a3e 100644 --- a/companion/src/simulation/simulateduiwidgetGeneric.h +++ b/companion/src/simulation/simulateduiwidgetGeneric.h @@ -22,27 +22,25 @@ #pragma once #include "simulateduiwidget.h" -#include "ui_simulateduiwidgetGeneric.h" -/* - Note: This class is not expected to be instantiated directly but as the base for each firmware that uses it - due to the methods and functions surrounding the building and loading of radio simulators -*/ +// This class could be merged into the base class however in the future there maybe a requirement +// for another generic or specialised simulator ui so keep the separation -SimulatedUIWidgetGeneric::SimulatedUIWidgetGeneric(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetGeneric) -{ - ui->setupUi(this); - - addGenericPushButtons(ui->leftbuttons, ui->rightbuttons); - - addScrollActions(); - - setLcd(ui->lcd); +namespace Ui { + class SimulatedUIWidgetGeneric; } -SimulatedUIWidgetGeneric::~SimulatedUIWidgetGeneric() +class SimulatedUIWidgetGeneric: public SimulatedUIWidget { - delete ui; -} + Q_OBJECT + + public: + explicit SimulatedUIWidgetGeneric(SimulatorInterface * simulator, QWidget * parent = nullptr); + virtual ~SimulatedUIWidgetGeneric(); + + public slots: + virtual void shrink(); + + private: + Ui::SimulatedUIWidgetGeneric * ui; +}; diff --git a/companion/src/simulation/simulateduiwidgetGeneric.ui b/companion/src/simulation/simulateduiwidgetGeneric.ui index c52ad39e7..48080a91c 100644 --- a/companion/src/simulation/simulateduiwidgetGeneric.ui +++ b/companion/src/simulation/simulateduiwidgetGeneric.ui @@ -6,188 +6,114 @@ 0 0 - 737 - 246 + 558 + 118 - + 0 0 - 737 - 246 + 0 + 0 - 737 - 246 + 16777215 + 16777215 Generic Simulator + + Qt::LeftToRight + - - - true - - - - 0 - 0 - 241 - 246 - - - - - 0 - 0 - - - - - 241 - 246 - - - - - 241 - 246 - - - - - - - - - - 496 - 0 - 241 - 246 - - - - - 0 - 0 - - - - - 241 - 246 - - - - - 241 - 246 - - - - - - - 241 - 188 - 255 - 58 - - - - - 0 - 0 - - - - - 255 - 58 - - - - - 255 - 58 - - - - - - - 240 - 59 - 256 - 128 - - - - - 0 - 0 - - - - - 200 - 100 - - - - - 424 - 180 - - - - background-color: rgb(215, 243, 255); - - - - - - 241 - 0 - 255 - 59 - - - - - 0 - 0 - - - - - 255 - 59 - - - - - 255 - 59 - - - - bottom - top - rightbuttons - leftbuttons - lcd + + + + + true + + + + 0 + 0 + + + + + 25 + 100 + + + + + 16777215 + 16777215 + + + + + + + + + + + + 0 + 0 + + + + + 25 + 100 + + + + + 16777215 + 16777215 + + + + + + + + + 0 + 0 + + + + + 128 + 64 + + + + + 16777215 + 16777215 + + + + background-color: rgb(215, 243, 255); + + + + diff --git a/companion/src/simulation/simulateduiwidgetJumperBumblebee.cpp b/companion/src/simulation/simulateduiwidgetJumperBumblebee.cpp deleted file mode 100644 index a24e0d698..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperBumblebee.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetJumperBumblebee.h" -#include "eeprominterface.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetJumperBumblebee::SimulatedUIWidgetJumperBumblebee(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetJumperBumblebee) -{ - RadioUiAction * act; - - ui->setupUi(this); - - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU_ICN); - addRadioWidget(ui->bottombuttons->addArea(QRect(55, 15, 50, 50), "JumperBumblebee/menu.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->bottombuttons->addArea(QRect(10, 25, 50, 50), "JumperBumblebee/page.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->bottombuttons->addArea(QRect(25, 80, 50, 50), "JumperBumblebee/exit.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->bottombuttons->addArea(QRect(145, 20, 100, 100), "JumperBumblebee/enter.png", m_mouseMidClickAction)); - - //addRadioWidget(ui->leftbuttons->addArea(QRect(10, 65, 70, 50), "JumperBumblebee/left_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - if (getCurrentBoard() == Board::BOARD_JUMPER_BUMBLEBEE) { - ui->lcd->setBgDefaultColor(QColor(0, 0, 0)); - ui->lcd->setFgDefaultColor(QColor(255, 255, 255)); - } - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: rgb(167, 167, 167);" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetJumperBumblebee::~SimulatedUIWidgetJumperBumblebee() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetJumperBumblebee.ui b/companion/src/simulation/simulateduiwidgetJumperBumblebee.ui deleted file mode 100644 index 1c35996cd..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperBumblebee.ui +++ /dev/null @@ -1,196 +0,0 @@ - - - SimulatedUIWidgetJumperBumblebee - - - - 0 - 0 - 726 - 368 - - - - - 0 - 0 - - - - - 726 - 368 - - - - - 726 - 368 - - - - Jumper Bumblebee Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 234 - 368 - - - - - 234 - 368 - - - - background:url(:/images/simulator/JumperBumblebee/left.png); - - - - - - - - 0 - 0 - - - - - 256 - 128 - - - - - 256 - 128 - - - - background-color: rgb(215, 243, 255); - - - - - - - - 0 - 0 - - - - - 236 - 368 - - - - - 236 - 368 - - - - background:url(:/images/simulator/JumperBumblebee/right.png) - - - - - - - - 0 - 0 - - - - - 256 - 97 - - - - - 256 - 97 - - - - background:url(:/images/simulator/JumperBumblebee/top.png) - - - - - - - - 0 - 0 - - - - - 256 - 143 - - - - - 256 - 143 - - - - background:url(:/images/simulator/JumperBumblebee/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetJumperT12.cpp b/companion/src/simulation/simulateduiwidgetJumperT12.cpp deleted file mode 100644 index 22bc9d1c7..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT12.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetJumperT12.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetJumperT12::SimulatedUIWidgetJumperT12(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetJumperT12) -{ - RadioUiAction * act; - - ui->setupUi(this); - - act = new RadioUiAction(KEY_UP, QList() << Qt::Key_Up << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_UP); - addRadioWidget(ui->rightbuttons->addArea(QRect(69, 11, 60, 25), "JumperT12/right_up.png", act)); - - act = new RadioUiAction(KEY_DOWN, QList() << Qt::Key_Down << Qt::Key_PageDown, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(61, 115, 60, 25), "JumperT12/right_down.png", act)); - - act = new RadioUiAction(KEY_RIGHT, QList() << Qt::Key_Right << Qt::Key_Plus, SIMU_STR_HLP_KEY_RGT % "|" % SIMU_STR_HLP_KEY_PLS, SIMU_STR_HLP_ACT_PLS); - addRadioWidget(ui->rightbuttons->addArea(QRect(109, 53, 30, 40), "JumperT12/right_right.png", act)); - - act = new RadioUiAction(KEY_LEFT, QList() << Qt::Key_Left << Qt::Key_Minus, SIMU_STR_HLP_KEY_LFT % "|" % SIMU_STR_HLP_KEY_MIN, SIMU_STR_HLP_ACT_MIN); - addRadioWidget(ui->rightbuttons->addArea(QRect(49, 62, 30, 40), "JumperT12/right_left.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ENT); - addRadioWidget(ui->leftbuttons->addArea(QRect(21, 30, 60, 25), "JumperT12/left_ent.png", m_mouseMidClickAction)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(21, 80, 60, 60), "JumperT12/left_exit.png", act)); - - addRadioWidget(ui->leftbuttons->addArea(QRect(9, 154, 30, 30), "JumperT12/left_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetJumperT12::~SimulatedUIWidgetJumperT12() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetJumperT12.ui b/companion/src/simulation/simulateduiwidgetJumperT12.ui deleted file mode 100644 index 3f7e1479a..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT12.ui +++ /dev/null @@ -1,258 +0,0 @@ - - - SimulatedUIWidgetJumperT12 - - - - 0 - 0 - 570 - 208 - - - - - 0 - 0 - - - - - 570 - 208 - - - - - 570 - 208 - - - - Jumper T12 Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 10 - - - - background-color: rgb(247, 245, 245); - - - - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 12 - - - - - 0 - 12 - - - - background-color: rgb(255, 255, 255); - - - - - - - - - - - 0 - 0 - - - - - 157 - 186 - - - - - 157 - 186 - - - - background:url(:/images/simulator/JumperT12/JumperT12-right.png) - - - - - - - - 0 - 0 - - - - - 157 - 186 - - - - - 157 - 186 - - - - background:url(:/images/simulator/JumperT12/JumperT12-left.png); - - - - - - - - 0 - 0 - - - - - 256 - 10 - - - - - 256 - 10 - - - - background:url(:/images/simulator/JumperT12/bottom.png) - - - - - - - - 0 - 0 - - - - - 256 - 48 - - - - - 256 - 48 - - - - background:url(:/images/simulator/JumperT12/JumperT12-top.png) - - - - - - - - 0 - 0 - - - - - 256 - 128 - - - - - 424 - 128 - - - - background-color: rgb(215, 243, 255); - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - \ No newline at end of file diff --git a/companion/src/simulation/simulateduiwidgetJumperT12max.cpp b/companion/src/simulation/simulateduiwidgetJumperT12max.cpp deleted file mode 100644 index 86d59ae6e..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT12max.cpp +++ /dev/null @@ -1,54 +0,0 @@ -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetJumperT12max.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetJumperT12max::SimulatedUIWidgetJumperT12max(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetJumperT12max) -{ - RadioUiAction * act; - - ui->setupUi(this); - - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU_ICN); - addRadioWidget(ui->leftbuttons->addArea(QRect(17, 45, 90, 30), "JumperT12max/menu.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(QRect(17, 107, 90, 30), "JumperT12max/page.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(17, 180, 90, 30), "JumperT12max/exit.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(130, 65, 70, 130), "JumperT12max/right-ent.png", m_mouseMidClickAction)); - - //addRadioWidget(ui->leftbuttons->addArea(QRect(10, 65, 70, 50), "JumperT12max/left_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetJumperT12max::~SimulatedUIWidgetJumperT12max() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetJumperT12max.ui b/companion/src/simulation/simulateduiwidgetJumperT12max.ui deleted file mode 100644 index 0e4805711..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT12max.ui +++ /dev/null @@ -1,211 +0,0 @@ - - - SimulatedUIWidgetJumperT12max - - - - 0 - 0 - 714 - 308 - - - - - 0 - 0 - - - - - 714 - 308 - - - - - 714 - 308 - - - - Jumper T12 MAX Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - - 0 - 0 - 229 - 308 - - - - - 0 - 0 - - - - - 229 - 308 - - - - - 229 - 308 - - - - background:url(:/images/simulator/JumperT12max/left.png); - - - - - - 229 - 90 - 256 - 128 - - - - - 0 - 0 - - - - - 256 - 128 - - - - - 256 - 128 - - - - background-color: rgb(215, 243, 255); - - - - - - 485 - 0 - 229 - 308 - - - - - 0 - 0 - - - - - 229 - 308 - - - - - 229 - 308 - - - - background:url(:/images/simulator/JumperT12max/right.png) - - - - - - 229 - 0 - 256 - 90 - - - - - 0 - 0 - - - - - 256 - 90 - - - - - 256 - 90 - - - - background:url(:/images/simulator/JumperT12max/top.png) - - - - - - 229 - 218 - 256 - 90 - - - - - 0 - 0 - - - - - 256 - 90 - - - - - 256 - 90 - - - - background:url(:/images/simulator/JumperT12max/bottom.png) - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - - - diff --git a/companion/src/simulation/simulateduiwidgetJumperT14.cpp b/companion/src/simulation/simulateduiwidgetJumperT14.cpp deleted file mode 100644 index 07d86029d..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT14.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetJumperT14.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetJumperT14::SimulatedUIWidgetJumperT14(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetJumperT14) -{ - RadioUiAction * act; - - ui->setupUi(this); - - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU_ICN); - addRadioWidget(ui->leftbuttons->addArea(QRect(130, 50, 50, 30), "JumperT14/left.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(QRect(130, 110, 50, 30), "JumperT14/left.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(130, 170, 50, 30), "JumperT14/left.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(100, 80, 70, 100), "JumperT14/right.png", m_mouseMidClickAction)); - - //addRadioWidget(ui->leftbuttons->addArea(QRect(10, 65, 70, 50), "JumperT14/left_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetJumperT14::~SimulatedUIWidgetJumperT14() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetJumperT14.ui b/companion/src/simulation/simulateduiwidgetJumperT14.ui deleted file mode 100644 index 8d67d20d3..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT14.ui +++ /dev/null @@ -1,211 +0,0 @@ - - - SimulatedUIWidgetJumperT14 - - - - 0 - 0 - 838 - 304 - - - - - 0 - 0 - - - - - 838 - 304 - - - - - 838 - 447 - - - - Jumper T14 Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - - 0 - 0 - 284 - 304 - - - - - 0 - 0 - - - - - 284 - 304 - - - - - 284 - 304 - - - - background:url(:/images/simulator/JumperT14/left.png); - - - - - - 284 - 50 - 256 - 128 - - - - - 0 - 0 - - - - - 256 - 128 - - - - - 256 - 128 - - - - background-color: rgb(215, 243, 255); - - - - - - 540 - 0 - 298 - 304 - - - - - 0 - 0 - - - - - 298 - 304 - - - - - 298 - 304 - - - - background:url(:/images/simulator/JumperT14/right.png) - - - - - - 284 - 0 - 256 - 50 - - - - - 0 - 0 - - - - - 256 - 50 - - - - - 256 - 50 - - - - background:url(:/images/simulator/JumperT14/top.png) - - - - - - 284 - 178 - 256 - 126 - - - - - 0 - 0 - - - - - 256 - 126 - - - - - 256 - 126 - - - - background:url(:/images/simulator/JumperT14/bottom.png) - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - - - diff --git a/companion/src/simulation/simulateduiwidgetJumperT15.cpp b/companion/src/simulation/simulateduiwidgetJumperT15.cpp deleted file mode 100644 index 86f8a0552..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT15.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetJumperT15.h" - -SimulatedUIWidgetJumperT15::SimulatedUIWidgetJumperT15(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetJumperT15) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->leftbuttons->addArea(QRect(80, 120, 100, 60), "JumperT15/model.png", act)); - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(40, 55, 140, 40), "JumperT15/left.png", act)); - - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->rightbuttons->addArea(QRect(75, 55, 140, 40), "JumperT15/right.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, - SIMU_STR_HLP_KEY_DN % "
" % SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_RTN); - addRadioWidget(ui->leftbuttons->addArea(QRect(80, 310, 100, 60), "JumperT15/exit.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(QRect(50, 210, 100, 60), "JumperT15/page.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(80, 160, 100, 170), "JumperT15/right.png", m_mouseMidClickAction)); - - //addRadioWidget(ui->leftbuttons->addArea(QRect(10, 252, 30, 30), "JumperT15/left_scrnsht.png", m_screenshotAction)); - - m_backlightColors << QColor(47, 123, 227); - - setLcd(ui->lcd); -} - -SimulatedUIWidgetJumperT15::~SimulatedUIWidgetJumperT15() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetJumperT15.ui b/companion/src/simulation/simulateduiwidgetJumperT15.ui deleted file mode 100644 index 01aa6f97c..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT15.ui +++ /dev/null @@ -1,206 +0,0 @@ - - - SimulatedUIWidgetJumperT15 - - - - 0 - 0 - 1000 - 520 - - - - - 0 - 0 - - - - - 1000 - 520 - - - - - 1000 - 520 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 260 - 520 - - - - - 260 - 520 - - - - background:url(:/images/simulator/JumperT15/right.png) - - - - - - - - 0 - 0 - - - - - 480 - 320 - - - - - 480 - 320 - - - - - 5 - - - - - - - - - 0 - 0 - - - - - 260 - 520 - - - - - 260 - 520 - - - - true - - - background:url(:/images/simulator/JumperT15/left.png); - - - - - - - - 0 - 0 - - - - - 480 - 100 - - - - - 480 - 100 - - - - - 5 - - - - background:url(:/images/simulator/JumperT15/top.png) - - - - - - - - 0 - 0 - - - - - 480 - 100 - - - - - 480 - 100 - - - - - 5 - false - - - - background:url(:/images/simulator/JumperT15/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetJumperT16.cpp b/companion/src/simulation/simulateduiwidgetJumperT16.cpp deleted file mode 100644 index 3b0c44d00..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT16.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetJumperT16.h" - -SimulatedUIWidgetJumperT16::SimulatedUIWidgetJumperT16(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetJumperT16) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->leftbuttons->addArea(QRect(50, 70, 80, 35), "JumperT16/left_mdl.png", act)); - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(25, 10, 95, 35), "JumperT16/left_sys.png", act)); - - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->leftbuttons->addArea(QRect(50, 190, 80, 35), "JumperT16/left_tele.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, - SIMU_STR_HLP_KEY_DN % "
" % SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_RTN); - addRadioWidget(ui->rightbuttons->addArea(QRect(50, 10, 95, 35), "JumperT16/right_rtn.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(QRect(50, 131, 80, 35), "JumperT16/left_page.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(55, 90, 56, 120), "JumperT16/right_ent.png", m_mouseMidClickAction)); - - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 252, 30, 30), "JumperT16/left_scrnsht.png", m_screenshotAction)); - - m_backlightColors << QColor(47, 123, 227); - - setLcd(ui->lcd); -} - -SimulatedUIWidgetJumperT16::~SimulatedUIWidgetJumperT16() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetJumperT16.ui b/companion/src/simulation/simulateduiwidgetJumperT16.ui deleted file mode 100644 index 02085d7e7..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT16.ui +++ /dev/null @@ -1,197 +0,0 @@ - - - SimulatedUIWidgetJumperT16 - - - - 0 - 0 - 825 - 292 - - - - - 0 - 0 - - - - - 825 - 292 - - - - - 825 - 292 - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 174 - 292 - - - - - 174 - 292 - - - - background:url(:/images/simulator/JumperT16/right.png) - - - - - - - - 0 - 0 - - - - - 480 - 272 - - - - - 480 - 272 - - - - - 5 - - - - - - - - - 0 - 0 - - - - - 174 - 292 - - - - - 174 - 292 - - - - true - - - background:url(:/images/simulator/JumperT16/left.png); - - - - - - - - 0 - 0 - - - - - 480 - 10 - - - - - 480 - 10 - - - - - 5 - - - - background:url(:/images/simulator/JumperT16/top.png) - - - - - - - - 0 - 0 - - - - - 480 - 10 - - - - - 480 - 10 - - - - - 5 - false - - - - background:url(:/images/simulator/JumperT16/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetJumperT18.cpp b/companion/src/simulation/simulateduiwidgetJumperT18.cpp deleted file mode 100644 index 983d0c347..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT18.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetJumperT18.h" - -SimulatedUIWidgetJumperT18::SimulatedUIWidgetJumperT18(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetJumperT18) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->leftbuttons->addArea(QRect(60, 90, 80, 35), "JumperT18/left_mdl.png", act)); - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(25, 5, 100, 40), "JumperT18/left_sys.png", act)); - - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->leftbuttons->addArea(QRect(60, 180, 80, 35), "JumperT18/left_tele.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, - SIMU_STR_HLP_KEY_DN % "
" % SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_RTN); - addRadioWidget(ui->rightbuttons->addArea(QRect(20, 5, 100, 40), "JumperT18/right_rtn.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(QRect(60, 140, 80, 35), "JumperT18/left.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(25, 90, 70, 130), "JumperT18/right_ent.png", m_mouseMidClickAction)); - - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 245, 30, 30), "JumperT18/left_scrnsht.png", m_screenshotAction)); - - m_backlightColors << QColor(47, 123, 227); - - setLcd(ui->lcd); -} - -SimulatedUIWidgetJumperT18::~SimulatedUIWidgetJumperT18() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetJumperT18.ui b/companion/src/simulation/simulateduiwidgetJumperT18.ui deleted file mode 100644 index 1c14df404..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT18.ui +++ /dev/null @@ -1,197 +0,0 @@ - - - SimulatedUIWidgetJumperT18 - - - - 0 - 0 - 825 - 292 - - - - - 0 - 0 - - - - - 825 - 292 - - - - - 825 - 292 - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 131 - 289 - - - - - 131 - 289 - - - - background:url(:/images/simulator/JumperT18/right.png) - - - - - - - - 0 - 0 - - - - - 480 - 272 - - - - - 480 - 272 - - - - - 5 - - - - - - - - - 0 - 0 - - - - - 131 - 289 - - - - - 131 - 289 - - - - true - - - background:url(:/images/simulator/JumperT18/left.png); - - - - - - - - 0 - 0 - - - - - 480 - 10 - - - - - 480 - 10 - - - - - 5 - - - - background:url(:/images/simulator/JumperT18/top.png) - - - - - - - - 0 - 0 - - - - - 480 - 10 - - - - - 480 - 10 - - - - - 5 - false - - - - background:url(:/images/simulator/JumperT18/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetJumperT20.cpp b/companion/src/simulation/simulateduiwidgetJumperT20.cpp deleted file mode 100644 index 4d327dcc0..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT20.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetJumperT20.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetJumperT20::SimulatedUIWidgetJumperT20(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetJumperT20) -{ - RadioUiAction * act; - - ui->setupUi(this); - - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU_ICN); - addRadioWidget(ui->leftbuttons->addArea(QRect(0, 30, 51, 28), "JumperT20/left.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(QRect(0, 70, 51, 28), "JumperT20/left.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 110, 51, 28), "JumperT20/left.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus << Qt::Key_Equal << Qt::Key_Left, SIMU_STR_HLP_KEYS_GO_LFT, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Right, SIMU_STR_HLP_KEYS_GO_RGT, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(130, 50, 50, 70), "JumperT20/right.png", m_mouseMidClickAction)); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - ui->lcd->setBgDefaultColor(QColor(0, 0, 0)); - ui->lcd->setFgDefaultColor(QColor(255, 255, 255)); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: rgb(200, 200, 200);" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetJumperT20::~SimulatedUIWidgetJumperT20() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetJumperT20.ui b/companion/src/simulation/simulateduiwidgetJumperT20.ui deleted file mode 100644 index 529f527c0..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperT20.ui +++ /dev/null @@ -1,211 +0,0 @@ - - - SimulatedUIWidgetJumperT20 - - - - 0 - 0 - 627 - 164 - - - - - 0 - 0 - - - - - 627 - 164 - - - - - 627 - 164 - - - - Jumper T20 Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - - 0 - 0 - 184 - 164 - - - - - 0 - 0 - - - - - 184 - 164 - - - - - 184 - 164 - - - - background:url(:/images/simulator/JumperT20/left.png); - - - - - - 184 - 19 - 256 - 128 - - - - - 0 - 0 - - - - - 256 - 128 - - - - - 256 - 128 - - - - background-color: rgb(215, 243, 255); - - - - - - 440 - 0 - 184 - 164 - - - - - 0 - 0 - - - - - 184 - 164 - - - - - 184 - 164 - - - - background:url(:/images/simulator/JumperT20/right.png) - - - - - - 184 - 0 - 256 - 19 - - - - - 0 - 0 - - - - - 256 - 19 - - - - - 256 - 19 - - - - background:url(:/images/simulator/JumperT20/top.png) - - - - - - 184 - 147 - 256 - 17 - - - - - 0 - 0 - - - - - 256 - 17 - - - - - 256 - 17 - - - - background:url(:/images/simulator/JumperT20/bottom.png) - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - - - diff --git a/companion/src/simulation/simulateduiwidgetJumperTLITE.cpp b/companion/src/simulation/simulateduiwidgetJumperTLITE.cpp deleted file mode 100644 index f6a5863a5..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperTLITE.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetJumperTLITE.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetJumperTLITE::SimulatedUIWidgetJumperTLITE(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetJumperTLITE) -{ - RadioUiAction * act; - - ui->setupUi(this); - - act = new RadioUiAction(KEY_UP, QList() << Qt::Key_Up << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_UP); - addRadioWidget(ui->rightbuttons->addArea(QRect(40, 15, 70, 50), "JumperTLITE/right_top.png", act)); - - act = new RadioUiAction(KEY_DOWN, QList() << Qt::Key_Down << Qt::Key_PageDown, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(47, 65, 70, 50), "JumperTLITE/right_bottom.png", act)); - - act = new RadioUiAction(KEY_RIGHT, QList() << Qt::Key_Right << Qt::Key_Plus, SIMU_STR_HLP_KEY_RGT % "|" % SIMU_STR_HLP_KEY_PLS, SIMU_STR_HLP_ACT_PLS); - addRadioWidget(ui->bottombuttons->addArea(QRect(150, 73, 80, 30), "JumperTLITE/bottom_right.png", act)); - - act = new RadioUiAction(KEY_LEFT, QList() << Qt::Key_Left << Qt::Key_Minus, SIMU_STR_HLP_KEY_LFT % "|" % SIMU_STR_HLP_KEY_MIN, SIMU_STR_HLP_ACT_MIN); - addRadioWidget(ui->bottombuttons->addArea(QRect(24, 73, 80, 30), "JumperTLITE/bottom_left.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ENT); - addRadioWidget(ui->leftbuttons->addArea(QRect(5, 15, 70, 50), "JumperTLITE/left_top.png", m_mouseMidClickAction)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 65, 70, 50), "JumperTLITE/left_bottom.png", act)); - - //addRadioWidget(ui->leftbuttons->addArea(QRect(10, 65, 70, 50), "JumperTLITE/left_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetJumperTLITE::~SimulatedUIWidgetJumperTLITE() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetJumperTLITE.ui b/companion/src/simulation/simulateduiwidgetJumperTLITE.ui deleted file mode 100644 index 407b3954d..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperTLITE.ui +++ /dev/null @@ -1,258 +0,0 @@ - - - SimulatedUIWidgetJumperTLITE - - - - 0 - 0 - 501 - 310 - - - - - 0 - 0 - - - - - 501 - 310 - - - - - 501 - 310 - - - - Jumper T-Lite Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 122 - 287 - - - - - 122 - 287 - - - - background:url(:/images/simulator/JumperTLITE/left.png); - - - - - - - - 0 - 0 - - - - - 800 - 155 - - - - - 800 - 155 - - - - background-color: rgb(215, 243, 255); - - - - - - - - 0 - 0 - - - - - 122 - 287 - - - - - 122 - 287 - - - - background:url(:/images/simulator/JumperTLITE/right.png) - - - - - - - - 0 - 0 - - - - - 258 - 26 - - - - - 258 - 26 - - - - background:url(:/images/simulator/JumperTLITE/top.png) - - - - - - - - 0 - 0 - - - - - 258 - 106 - - - - - 258 - 106 - - - - background:url(:/images/simulator/JumperTLITE/bottom.png) - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 12 - - - - - 0 - 12 - - - - background-color: rgb(255, 255, 255); - - - - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 10 - - - - background-color: rgb(247, 245, 245); - - - - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetJumperTPRO.cpp b/companion/src/simulation/simulateduiwidgetJumperTPRO.cpp deleted file mode 100644 index 61858575b..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperTPRO.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetJumperTPRO.h" -#include "eeprominterface.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetJumperTPRO::SimulatedUIWidgetJumperTPRO(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetJumperTPRO) -{ - RadioUiAction * act; - - ui->setupUi(this); - - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU_ICN); - addRadioWidget(ui->leftbuttons->addArea(QRect(70, 85, 110, 90), "JumperTPRO/left.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(QRect(53, 174, 110, 90), "JumperTPRO/left.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(11, 257, 110, 90), "JumperTPRO/left.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(10, 96, 200, 220), "JumperTPRO/right.png", m_mouseMidClickAction)); - - //addRadioWidget(ui->leftbuttons->addArea(QRect(10, 65, 70, 50), "JumperTPRO/left_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - if (getCurrentBoard() == Board::BOARD_JUMPER_TPROV2) { - ui->lcd->setBgDefaultColor(QColor(0, 0, 0)); - ui->lcd->setFgDefaultColor(QColor(255, 255, 255)); - } - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: rgb(167, 167, 167);" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetJumperTPRO::~SimulatedUIWidgetJumperTPRO() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetJumperTPRO.ui b/companion/src/simulation/simulateduiwidgetJumperTPRO.ui deleted file mode 100644 index 65e7c29c6..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperTPRO.ui +++ /dev/null @@ -1,196 +0,0 @@ - - - SimulatedUIWidgetJumperTPRO - - - - 0 - 0 - 726 - 368 - - - - - 0 - 0 - - - - - 726 - 368 - - - - - 726 - 368 - - - - Jumper T-Pro Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 234 - 368 - - - - - 234 - 368 - - - - background:url(:/images/simulator/JumperTPRO/left.png); - - - - - - - - 0 - 0 - - - - - 256 - 128 - - - - - 256 - 128 - - - - background-color: rgb(215, 243, 255); - - - - - - - - 0 - 0 - - - - - 236 - 368 - - - - - 236 - 368 - - - - background:url(:/images/simulator/JumperTPRO/right.png) - - - - - - - - 0 - 0 - - - - - 256 - 97 - - - - - 256 - 97 - - - - background:url(:/images/simulator/JumperTPRO/top.png) - - - - - - - - 0 - 0 - - - - - 256 - 143 - - - - - 256 - 143 - - - - background:url(:/images/simulator/JumperTPRO/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetJumperTPROS.cpp b/companion/src/simulation/simulateduiwidgetJumperTPROS.cpp deleted file mode 100644 index 5f034683f..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperTPROS.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetJumperTPROS.h" -#include "eeprominterface.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetJumperTPROS::SimulatedUIWidgetJumperTPROS(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetJumperTPROS) -{ - RadioUiAction * act; - - ui->setupUi(this); - - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU_ICN); - addRadioWidget(ui->leftbuttons->addArea(QRect(85, 85, 70, 70), "JumperTPROS/menu.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(QRect(53, 160, 70, 70), "JumperTPROS/page.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(20, 230, 70, 70), "JumperTPROS/exit.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(10, 96, 200, 220), "JumperTPROS/right-ent.png", m_mouseMidClickAction)); - - //addRadioWidget(ui->leftbuttons->addArea(QRect(10, 65, 70, 50), "JumperTPROS/left_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - if (getCurrentBoard() == Board::BOARD_JUMPER_TPROV2) { - ui->lcd->setBgDefaultColor(QColor(0, 0, 0)); - ui->lcd->setFgDefaultColor(QColor(255, 255, 255)); - } - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: rgb(167, 167, 167);" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetJumperTPROS::~SimulatedUIWidgetJumperTPROS() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetJumperTPROS.ui b/companion/src/simulation/simulateduiwidgetJumperTPROS.ui deleted file mode 100644 index 1822ef156..000000000 --- a/companion/src/simulation/simulateduiwidgetJumperTPROS.ui +++ /dev/null @@ -1,211 +0,0 @@ - - - SimulatedUIWidgetJumperTPROS - - - - 0 - 0 - 716 - 308 - - - - - 0 - 0 - - - - - 716 - 308 - - - - - 716 - 308 - - - - Jumper TPro S Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - - 0 - 0 - 230 - 308 - - - - - 0 - 0 - - - - - 230 - 308 - - - - - 230 - 308 - - - - background:url(:/images/simulator/JumperTPROS/left.png); - - - - - - 230 - 90 - 256 - 128 - - - - - 0 - 0 - - - - - 256 - 128 - - - - - 256 - 128 - - - - background-color: rgb(215, 243, 255); - - - - - - 485 - 0 - 230 - 308 - - - - - 0 - 0 - - - - - 230 - 308 - - - - - 230 - 308 - - - - background:url(:/images/simulator/JumperTPROS/right.png) - - - - - - 230 - 0 - 256 - 90 - - - - - 0 - 0 - - - - - 256 - 90 - - - - - 256 - 90 - - - - background:url(:/images/simulator/JumperTPROS/top.png) - - - - - - 230 - 218 - 256 - 90 - - - - - 0 - 0 - - - - - 256 - 90 - - - - - 256 - 90 - - - - background:url(:/images/simulator/JumperTPROS/bottom.png) - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - - - \ No newline at end of file diff --git a/companion/src/simulation/simulateduiwidgetLR3PRO.cpp b/companion/src/simulation/simulateduiwidgetLR3PRO.cpp deleted file mode 100644 index 092d1ba90..000000000 --- a/companion/src/simulation/simulateduiwidgetLR3PRO.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetLR3PRO.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetLR3PRO::SimulatedUIWidgetLR3PRO(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetLR3PRO) -{ - RadioUiAction * act; - - ui->setupUi(this); - - act = new RadioUiAction(KEY_UP, QList() << Qt::Key_Up << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_UP); - addRadioWidget(ui->rightbuttons->addArea(QRect(30, 56, 30, 20), "LR3PRO/right_up.png", act)); - - act = new RadioUiAction(KEY_DOWN, QList() << Qt::Key_Down << Qt::Key_PageDown, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(30, 120, 30, 20), "LR3PRO/right_down.png", act)); - - act = new RadioUiAction(KEY_RIGHT, QList() << Qt::Key_Right << Qt::Key_Plus, SIMU_STR_HLP_KEY_RGT % "|" % SIMU_STR_HLP_KEY_PLS, SIMU_STR_HLP_ACT_PLS); - addRadioWidget(ui->rightbuttons->addArea(QRect(70, 84, 20, 30), "LR3PRO/right_plus.png", act)); - - act = new RadioUiAction(KEY_LEFT, QList() << Qt::Key_Left << Qt::Key_Minus, SIMU_STR_HLP_KEY_LFT % "|" % SIMU_STR_HLP_KEY_MIN, SIMU_STR_HLP_ACT_MIN); - addRadioWidget(ui->rightbuttons->addArea(QRect(5, 84, 20, 30), "LR3PRO/right_minus.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ENT); - addRadioWidget(ui->rightbuttons->addArea(QRect(30, 83, 30, 30), "LR3PRO/right_enter.png", m_mouseMidClickAction)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(58, 98, 30, 30), "LR3PRO/left_escape.png", act)); - - //addRadioWidget(ui->leftbuttons->addArea(QRect(10, 65, 70, 50), "LR3PRO/left_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - ui->lcd->setBgDefaultColor(QColor(0, 0, 0)); - ui->lcd->setFgDefaultColor(QColor(255, 255, 255)); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetLR3PRO::~SimulatedUIWidgetLR3PRO() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetLR3PRO.ui b/companion/src/simulation/simulateduiwidgetLR3PRO.ui deleted file mode 100644 index 0582d8f18..000000000 --- a/companion/src/simulation/simulateduiwidgetLR3PRO.ui +++ /dev/null @@ -1,196 +0,0 @@ - - - SimulatedUIWidgetLR3PRO - - - - 0 - 0 - 500 - 287 - - - - - 0 - 0 - - - - - 500 - 287 - - - - - 500 - 287 - - - - Jumper T-Lite Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 256 - 128 - - - - - 256 - 128 - - - - background-color: rgb(215, 243, 255); - - - - - - - - 0 - 0 - - - - - 122 - 287 - - - - - 122 - 287 - - - - background:url(:/images/simulator/LR3PRO/right.png) - - - - - - - - 0 - 0 - - - - - 122 - 287 - - - - - 122 - 287 - - - - background:url(:/images/simulator/LR3PRO/left.png); - - - - - - - - 0 - 0 - - - - - 256 - 116 - - - - - 256 - 116 - - - - background:url(:/images/simulator/LR3PRO/bottom.png) - - - - - - - - 0 - 0 - - - - - 256 - 44 - - - - - 256 - 44 - - - - background:url(:/images/simulator/LR3PRO/top.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetMT12.cpp b/companion/src/simulation/simulateduiwidgetMT12.cpp deleted file mode 100644 index 7e715cc89..000000000 --- a/companion/src/simulation/simulateduiwidgetMT12.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidgetGeneric.h" - -SimulatedUIWidgetMT12::SimulatedUIWidgetMT12(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidgetGeneric(simulator, parent) -{ - // Perform any customisation such as loading lcd area background color lists -} - -SimulatedUIWidgetMT12::~SimulatedUIWidgetMT12() -{ - -} diff --git a/companion/src/simulation/simulateduiwidgetNV14.cpp b/companion/src/simulation/simulateduiwidgetNV14.cpp deleted file mode 100644 index c56fb20a1..000000000 --- a/companion/src/simulation/simulateduiwidgetNV14.cpp +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetNV14.h" - -SimulatedUIWidgetNV14::SimulatedUIWidgetNV14(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetNV14) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(QPoint(65, 15), QSize(40, 40)), "NV14/lhs_hat_up.png", act)); - - // unused - //act = new RadioUiAction(13, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_EXIT); - //addRadioWidget(ui->leftbuttons->addArea(QRect(QPoint(5, 75), QSize(40, 40)), "NV14/lhs_hat_left.png", act)); - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->leftbuttons->addArea(QRect(QPoint(130, 75), QSize(40, 40)), "NV14/lhs_hat_right.png", act)); - - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Down, SIMU_STR_HLP_KEY_DN, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->leftbuttons->addArea(QRect(QPoint(65, 140), QSize(40, 40)), "NV14/lhs_hat_down.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(QPoint(60, 70), QSize(50, 50)), "NV14/lhs_hat_press.png", act)); - - // non-functional - // act = new RadioUiAction(KEY_UP, QList() << Qt::Key_Plus, SIMU_STR_HLP_KEY_PLS, SIMU_STR_HLP_ACT_PREVINC); - // addRadioWidget(ui->rightbuttons->addArea(QRect(QPoint(95, 15), QSize(40, 40)), "NV14/rhs_hat_up.png", act)); - - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->rightbuttons->addArea(QRect(QPoint(35, 75), QSize(40, 40)), "NV14/rhs_hat_left.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->rightbuttons->addArea(QRect(QPoint(160, 75), QSize(40, 40)), "NV14/rhs_hat_right.png", act)); - - // non-functional - // act = new RadioUiAction(KEY_DOWN, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN, SIMU_STR_HLP_ACT_NEXTDEC); - // addRadioWidget(ui->rightbuttons->addArea(QRect(QPoint(95, 140), QSize(40, 40)), "NV14/rhs_hat_down.png", act)); - - act = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ENT); - addRadioWidget(ui->rightbuttons->addArea(QRect(QPoint(90, 70), QSize(50, 50)), "NV14/rhs_hat_press.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_backlightColors << QColor(47, 123, 227); - - setLcd(ui->lcd); -} - -SimulatedUIWidgetNV14::~SimulatedUIWidgetNV14() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetNV14.ui b/companion/src/simulation/simulateduiwidgetNV14.ui deleted file mode 100644 index 840cce663..000000000 --- a/companion/src/simulation/simulateduiwidgetNV14.ui +++ /dev/null @@ -1,206 +0,0 @@ - - - SimulatedUIWidgetNV14 - - - - 0 - 0 - 724 - 506 - - - - - 0 - 0 - - - - - 724 - 506 - - - - - 724 - 506 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 202 - 506 - - - - - 202 - 506 - - - - background:url(:/images/simulator/NV14/rhs.png) - - - - - - - - 0 - 0 - - - - - 320 - 480 - - - - - 320 - 480 - - - - - 5 - - - - - - - - - 0 - 0 - - - - - 202 - 506 - - - - - 202 - 506 - - - - true - - - background:url(:/images/simulator/NV14/lhs.png); - - - - - - - - 0 - 0 - - - - - 320 - 13 - - - - - 320 - 13 - - - - - 5 - - - - background:url(:/images/simulator/NV14/top.png) - - - - - - - - 0 - 0 - - - - - 320 - 13 - - - - - 320 - 13 - - - - - 5 - false - - - - background:url(:/images/simulator/NV14/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetPL18.cpp b/companion/src/simulation/simulateduiwidgetPL18.cpp deleted file mode 100644 index 5bcda7db3..000000000 --- a/companion/src/simulation/simulateduiwidgetPL18.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetPL18.h" - -SimulatedUIWidgetPL18::SimulatedUIWidgetPL18(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetPL18) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - // Note: the PL18 has no physical buttons though at some point the trim joystick is repurposed - // allow for colorlcd key events and see what works - // the mouse click areas do not map to visual buttons on the background images - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->rightbuttons->addArea(QRect(10, 1, 80, 35), "PL18/left.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(10, 40, 80, 35), "PL18/left.png", m_mouseMidClickAction)); - - act = new RadioUiAction(KEY_UP, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 80, 80, 35), "PL18/left.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 120, 80, 35), "PL18/left.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 160, 80, 35), "PL18/left.png", act)); - - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 200, 80, 35), "PL18/left.png", act)); - - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, - SIMU_STR_HLP_KEY_DN % "
" % SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_RTN); - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 240, 80, 35), "PL18/left.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 280, 30, 30), "PL18/left.png", m_screenshotAction)); - - m_backlightColors << QColor(47, 123, 227); - - setLcd(ui->lcd); -} - -SimulatedUIWidgetPL18::~SimulatedUIWidgetPL18() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetPL18.ui b/companion/src/simulation/simulateduiwidgetPL18.ui deleted file mode 100644 index d08039442..000000000 --- a/companion/src/simulation/simulateduiwidgetPL18.ui +++ /dev/null @@ -1,206 +0,0 @@ - - - SimulatedUIWidgetPL18 - - - - 0 - 0 - 580 - 420 - - - - - 0 - 0 - - - - - 580 - 420 - - - - - 580 - 420 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 50 - 420 - - - - - 50 - 420 - - - - background:url(:/images/simulator/PL18/right.png) - - - - - - - - 0 - 0 - - - - - 480 - 320 - - - - - 480 - 320 - - - - - 5 - - - - - - - - - 0 - 0 - - - - - 50 - 420 - - - - - 50 - 420 - - - - true - - - background:url(:/images/simulator/PL18/left.png); - - - - - - - - 0 - 0 - - - - - 480 - 50 - - - - - 480 - 50 - - - - - 5 - - - - background:url(:/images/simulator/PL18/top.png) - - - - - - - - 0 - 0 - - - - - 480 - 50 - - - - - 480 - 50 - - - - - 5 - false - - - - background:url(:/images/simulator/PL18/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetPocket.cpp b/companion/src/simulation/simulateduiwidgetPocket.cpp deleted file mode 100644 index f42a943fc..000000000 --- a/companion/src/simulation/simulateduiwidgetPocket.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetPocket.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetPocket::SimulatedUIWidgetPocket(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetPocket) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->rightbuttons->addArea(QRect(30, 95, 60, 60), "Pocket/right.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(130, 60, 60, 130), "Pocket/right.png", m_mouseMidClickAction)); - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(150, 95, 60, 60), "Pocket/left.png", act)); - - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->leftbuttons->addArea(QRect(40, 179, 60, 30), "Pocket/left.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(QRect(40, 90, 60, 30), "Pocket/left.png", act)); - - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->leftbuttons->addArea(QRect(40, 130, 60, 30), "Pocket/left.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(40, 40, 60, 30), "Pocket/left.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus << Qt::Key_Equal << Qt::Key_Left, SIMU_STR_HLP_KEYS_GO_LFT, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Right, SIMU_STR_HLP_KEYS_GO_RGT, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetPocket::~SimulatedUIWidgetPocket() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetPocket.ui b/companion/src/simulation/simulateduiwidgetPocket.ui deleted file mode 100644 index ef4c77de4..000000000 --- a/companion/src/simulation/simulateduiwidgetPocket.ui +++ /dev/null @@ -1,219 +0,0 @@ - - - SimulatedUIWidgetPocket - - - - 0 - 0 - 737 - 246 - - - - - 0 - 0 - - - - - 737 - 246 - - - - - 737 - 246 - - - - Radiomaster Pocket Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - true - - - - 0 - 0 - 241 - 246 - - - - - 0 - 0 - - - - - 241 - 246 - - - - - 241 - 246 - - - - background:url(:/images/simulator/Pocket/left.png); - - - - - - 496 - 0 - 241 - 246 - - - - - 0 - 0 - - - - - 241 - 246 - - - - - 241 - 246 - - - - background:url(:/images/simulator/Pocket/right.png) - - - - - - 241 - 188 - 255 - 58 - - - - - 0 - 0 - - - - - 255 - 58 - - - - - 255 - 58 - - - - background:url(:/images/simulator/Pocket/bottom.png) - - - - - - 240 - 59 - 256 - 128 - - - - - 0 - 0 - - - - - 200 - 100 - - - - - 424 - 180 - - - - background-color: rgb(215, 243, 255); - - - - - - 241 - 0 - 255 - 59 - - - - - 0 - 0 - - - - - 255 - 59 - - - - - 255 - 59 - - - - background:url(:/images/simulator/Pocket/top.png) - - - bottom - top - rightbuttons - leftbuttons - lcd - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - - - diff --git a/companion/src/simulation/simulateduiwidgetT8.cpp b/companion/src/simulation/simulateduiwidgetT8.cpp deleted file mode 100644 index 193ba8004..000000000 --- a/companion/src/simulation/simulateduiwidgetT8.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetT8.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetT8::SimulatedUIWidgetT8(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetT8) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->rightbuttons->addArea(QRect(25, 40, 35, 20), "T8/right-mdl.png", act)); - - act = new RadioUiAction(KEY_PLUS, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_UP); - addRadioWidget(ui->rightbuttons->addArea(QRect(25, 90, 35, 20), "T8/right-up.png", act)); - - act = new RadioUiAction(KEY_MINUS, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(25, 135, 35, 20), "T8/right-dn.png", act)); - - act = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ENT); - addRadioWidget(ui->rightbuttons->addArea(QRect(25, 180, 35, 20), "T8/right-ent.png", act)); - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(60, 45, 35, 20), "T8/left-sys.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(60, 85, 35, 20), "T8/left-rtn.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(QRect(60, 135, 35, 20), "T8/left-pagedn.png", act)); - - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->leftbuttons->addArea(QRect(60, 180, 35, 20), "T8/left-pageup.png", act)); - - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetT8::~SimulatedUIWidgetT8() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetT8.ui b/companion/src/simulation/simulateduiwidgetT8.ui deleted file mode 100644 index 6370888ea..000000000 --- a/companion/src/simulation/simulateduiwidgetT8.ui +++ /dev/null @@ -1,258 +0,0 @@ - - - SimulatedUIWidgetT8 - - - - 0 - 0 - 480 - 300 - - - - - 0 - 0 - - - - - 480 - 300 - - - - - 480 - 300 - - - - Radiomaster T8 Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 113 - 280 - - - - - 113 - 280 - - - - background:url(:/images/simulator/T8/left.png); - - - - - - - - 0 - 0 - - - - - 254 - 158 - - - - - 254 - 158 - - - - background-color: rgb(215, 243, 255); - - - - - - - - 0 - 0 - - - - - 113 - 280 - - - - - 113 - 280 - - - - background:url(:/images/simulator/T8/right.png) - - - - - - - - 0 - 0 - - - - - 254 - 35 - - - - - 254 - 35 - - - - background:url(:/images/simulator/T8/top.png) - - - - - - - - 0 - 0 - - - - - 254 - 113 - - - - - 254 - 113 - - - - background:url(:/images/simulator/T8/bottom.png) - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 12 - - - - - 0 - 12 - - - - background-color: rgb(255, 255, 255); - - - - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 10 - - - - background-color: rgb(247, 245, 245); - - - - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetTX12.cpp b/companion/src/simulation/simulateduiwidgetTX12.cpp deleted file mode 100644 index f89a8723b..000000000 --- a/companion/src/simulation/simulateduiwidgetTX12.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetTX12.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetTX12::SimulatedUIWidgetTX12(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetTX12) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->rightbuttons->addArea(QRect(60, 5, 90, 60), "TX12/right-mdl.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(45, 100, 70, 120), "TX12/right-ent.png", m_mouseMidClickAction)); - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(35, 5, 80, 50), "TX12/left-sys.png", act)); - - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->leftbuttons->addArea(QRect(90, 210, 80, 35), "TX12/left-tele.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(QRect(75, 125, 80, 35), "TX12/left-pagedn.png", act)); - - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->leftbuttons->addArea(QRect(80, 170, 80, 35), "TX12/left-pageup.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(70, 85, 80, 35), "TX12/left-rtn.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetTX12::~SimulatedUIWidgetTX12() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetTX12.ui b/companion/src/simulation/simulateduiwidgetTX12.ui deleted file mode 100644 index 8d51ba2e6..000000000 --- a/companion/src/simulation/simulateduiwidgetTX12.ui +++ /dev/null @@ -1,258 +0,0 @@ - - - SimulatedUIWidgetTX12 - - - - 0 - 0 - 641 - 272 - - - - - 0 - 0 - - - - - 641 - 272 - - - - - 641 - 272 - - - - Taranis TX12 Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 196 - 253 - - - - - 196 - 253 - - - - background:url(:/images/simulator/TX12/left.png); - - - - - - - - 0 - 0 - - - - - 256 - 128 - - - - - 424 - 128 - - - - background-color: rgb(215, 243, 255); - - - - - - - - 0 - 0 - - - - - 189 - 253 - - - - - 189 - 253 - - - - background:url(:/images/simulator/TX12/right.png) - - - - - - - - 0 - 0 - - - - - 261 - 101 - - - - - 261 - 101 - - - - background:url(:/images/simulator/TX12/top.png) - - - - - - - - 0 - 0 - - - - - 261 - 24 - - - - - 261 - 24 - - - - background:url(:/images/simulator/TX12/bottom.png) - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 12 - - - - - 0 - 12 - - - - background-color: rgb(255, 255, 255); - - - - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 10 - - - - background-color: rgb(247, 245, 245); - - - - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetTX16S.cpp b/companion/src/simulation/simulateduiwidgetTX16S.cpp deleted file mode 100644 index 6f83fd0bb..000000000 --- a/companion/src/simulation/simulateduiwidgetTX16S.cpp +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetTX16S.h" - -SimulatedUIWidgetTX16S::SimulatedUIWidgetTX16S(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetTX16S) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->rightbuttons->addArea(QRect(40, 0, 110, 35), "TX16S/right_mdl.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(45, 70, 100, 160), "TX16S/right_ent.png", m_mouseMidClickAction)); - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(32, 1, 80, 35), "TX16S/left_sys.png", act)); - - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->leftbuttons->addArea(QRect(55, 220, 80, 35), "TX16S/left_tele.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(QRect(55, 115, 80, 35), "TX16S/left_page.png", act)); - - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->leftbuttons->addArea(QRect(55, 160, 80, 35), "TX16S/left_page2.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, - SIMU_STR_HLP_KEY_DN % "
" % SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_RTN); - addRadioWidget(ui->leftbuttons->addArea(QRect(55, 55, 80, 35), "TX16S/left_rtn.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 245, 30, 30), "TX16S/left_scrnsht.png", m_screenshotAction)); - - m_backlightColors << QColor(47, 123, 227); - - setLcd(ui->lcd); -} - -SimulatedUIWidgetTX16S::~SimulatedUIWidgetTX16S() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetTX16S.ui b/companion/src/simulation/simulateduiwidgetTX16S.ui deleted file mode 100644 index e5137d992..000000000 --- a/companion/src/simulation/simulateduiwidgetTX16S.ui +++ /dev/null @@ -1,197 +0,0 @@ - - - SimulatedUIWidgetTX16S - - - - 0 - 0 - 825 - 292 - - - - - 0 - 0 - - - - - 825 - 292 - - - - - 825 - 292 - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 174 - 292 - - - - - 174 - 292 - - - - background:url(:/images/simulator/TX16S/right.png) - - - - - - - - 0 - 0 - - - - - 480 - 272 - - - - - 480 - 272 - - - - - 5 - - - - - - - - - 0 - 0 - - - - - 174 - 292 - - - - - 174 - 292 - - - - true - - - background:url(:/images/simulator/TX16S/left.png); - - - - - - - - 0 - 0 - - - - - 480 - 10 - - - - - 480 - 10 - - - - - 5 - - - - background:url(:/images/simulator/TX16S/top.png) - - - - - - - - 0 - 0 - - - - - 480 - 10 - - - - - 480 - 10 - - - - - 5 - false - - - - background:url(:/images/simulator/TX16S/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetV16.cpp b/companion/src/simulation/simulateduiwidgetV16.cpp deleted file mode 100644 index 042227974..000000000 --- a/companion/src/simulation/simulateduiwidgetV16.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetV16.h" - -SimulatedUIWidgetV16::SimulatedUIWidgetV16(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetV16) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->left->addArea(QRect(60, 10, 81, 51), "V16/left_sys.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, - SIMU_STR_HLP_KEY_DN % "
" % SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_RTN); - addRadioWidget(ui->left->addArea(QRect(75, 105, 60, 30), "V16/left_rtn.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->left->addArea(QRect(75, 160, 60, 30), "V16/left_pagedn.png", act)); - - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->left->addArea(QRect(75, 220, 60, 30), "V16/left_pageup.png", act)); - - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->left->addArea(QRect(75, 280, 80, 35), "V16/left_tele.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->right->addArea(QRect(40, 130, 51, 131), "V16/right_ent.png", m_mouseMidClickAction)); - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->right->addArea(QRect(30, 10, 81, 51), "V16/right_mdl.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_backlightColors << QColor(47, 123, 227); - - setLcd(ui->lcd); -} - -SimulatedUIWidgetV16::~SimulatedUIWidgetV16() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetV16.ui b/companion/src/simulation/simulateduiwidgetV16.ui deleted file mode 100644 index 8d276cf97..000000000 --- a/companion/src/simulation/simulateduiwidgetV16.ui +++ /dev/null @@ -1,151 +0,0 @@ - - - SimulatedUIWidgetV16 - - - true - - - - 0 - 0 - 829 - 320 - - - - - 0 - 0 - - - - - 829 - 320 - - - - - 829 - 355 - - - - - - 658 - 0 - 167 - 320 - - - - - 0 - 0 - - - - - 167 - 320 - - - - - 167 - 320 - - - - background:url(:/images/simulator/V16/right.png) - - - - - - 1 - 0 - 175 - 320 - - - - - 0 - 0 - - - - - 175 - 320 - - - - - 175 - 320 - - - - true - - - background:url(:/images/simulator/V16/left.png); - - - - - - 177 - 24 - 480 - 272 - - - - - 0 - 0 - - - - - 480 - 272 - - - - - 480 - 272 - - - - - 5 - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - - - diff --git a/companion/src/simulation/simulateduiwidgetX10.cpp b/companion/src/simulation/simulateduiwidgetX10.cpp deleted file mode 100644 index 01bb75bf9..000000000 --- a/companion/src/simulation/simulateduiwidgetX10.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetX10.h" - -SimulatedUIWidgetX10::SimulatedUIWidgetX10(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetX10) -{ - RadioUiAction * act; - QPolygon polygon; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - int x = 74, y = 148, oR = 63, iR = 40; - - polygon.clear(); - polygon << polyArc(x, y, oR, -45, 45) << polyArc(x, y, iR, -45, 45); - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X10/left_mdl.png", act)); - - polygon.clear(); - polygon << polyArc(x, y, oR, 225, 315) << polyArc(x, y, iR, 225, 315); - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X10/left_sys.png", act)); - - polygon.clear(); - polygon << polyArc(x, y, oR, 45, 135) << polyArc(x, y, iR, 45, 135); - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X10/left_tele.png", act)); - - polygon.clear(); - polygon << polyArc(x, y, oR, 135, 225) << polyArc(x, y, iR, 135, 225); - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, - SIMU_STR_HLP_KEY_DN % "
" % SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_RTN); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X10/left_rtn.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(polyArc(x, y, iR), "X10/left_page.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(polyArc(98, y, iR), "X10/right_ent.png", m_mouseMidClickAction)); - - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 252, 30, 30), "X10/left_scrnsht.png", m_screenshotAction)); - - m_backlightColors << QColor(47, 123, 227); - - setLcd(ui->lcd); -} - -SimulatedUIWidgetX10::~SimulatedUIWidgetX10() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetX10.ui b/companion/src/simulation/simulateduiwidgetX10.ui deleted file mode 100644 index f8120a434..000000000 --- a/companion/src/simulation/simulateduiwidgetX10.ui +++ /dev/null @@ -1,197 +0,0 @@ - - - SimulatedUIWidgetX10 - - - - 0 - 0 - 825 - 292 - - - - - 0 - 0 - - - - - 825 - 292 - - - - - 825 - 292 - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 174 - 292 - - - - - 174 - 292 - - - - background:url(:/images/simulator/X10/right.png) - - - - - - - - 0 - 0 - - - - - 480 - 272 - - - - - 480 - 272 - - - - - 5 - - - - - - - - - 0 - 0 - - - - - 174 - 292 - - - - - 174 - 292 - - - - true - - - background:url(:/images/simulator/X10/left.png); - - - - - - - - 0 - 0 - - - - - 480 - 10 - - - - - 480 - 10 - - - - - 5 - - - - background:url(:/images/simulator/X10/top.png) - - - - - - - - 0 - 0 - - - - - 480 - 10 - - - - - 480 - 10 - - - - - 5 - false - - - - background:url(:/images/simulator/X10/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetX12.cpp b/companion/src/simulation/simulateduiwidgetX12.cpp deleted file mode 100644 index 72d7862b8..000000000 --- a/companion/src/simulation/simulateduiwidgetX12.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetX12.h" - -SimulatedUIWidgetX12::SimulatedUIWidgetX12(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetX12) -{ - RadioUiAction * act; - QPolygon polygon; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - int x = 74, y = 190, oR = 63, iR = 40; - - polygon << polyArc(x, y, oR, 225, 315) << polyArc(x, y, iR, 225, 315); - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X12/left_btn1.png", act)); - - polygon.clear(); - polygon << polyArc(x, y, oR, 135, 225) << polyArc(x, y, iR, 135, 225); - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X12/left_btn2.png", act)); - - polygon.clear(); - polygon << polyArc(x, y, oR, -45, 45) << polyArc(x, y, iR, -45, 45); - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->rightbuttons->addArea(polygon, "X12/right_btnU.png", act)); - - polygon.clear(); - polygon << polyArc(x, y, oR, 225, 315) << polyArc(x, y, iR, 225, 315); - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->rightbuttons->addArea(polygon, "X12/right_btnL.png", act)); - - polygon.clear(); - polygon << polyArc(x, y, oR, 45, 135) << polyArc(x, y, iR, 45, 135); - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->rightbuttons->addArea(polygon, "X12/right_btnR.png", act)); - - polygon.clear(); - polygon << polyArc(x, y, oR, 135, 225) << polyArc(x, y, iR, 135, 225); - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, - SIMU_STR_HLP_KEY_DN % "
" % SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_RTN); - addRadioWidget(ui->rightbuttons->addArea(polygon, "X12/right_btnD.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(polyArc(x, y, iR), "X12/right_ent.png", m_mouseMidClickAction)); - - addRadioWidget(ui->leftbuttons->addArea(QRect(9, 259, 30, 30), "X12/left_scrnsht.png", m_screenshotAction)); - - m_backlightColors << QColor(47, 123, 227); - - setLcd(ui->lcd); -} - -SimulatedUIWidgetX12::~SimulatedUIWidgetX12() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetX12.ui b/companion/src/simulation/simulateduiwidgetX12.ui deleted file mode 100644 index 2f74fad31..000000000 --- a/companion/src/simulation/simulateduiwidgetX12.ui +++ /dev/null @@ -1,256 +0,0 @@ - - - SimulatedUIWidgetX12 - - - - 0 - 0 - 825 - 292 - - - - - 0 - 0 - - - - - 825 - 292 - - - - - 825 - 292 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 147 - 292 - - - - - 147 - 292 - - - - true - - - background:url(:/images/simulator/X12/left.png); - - - - - - - - 0 - 0 - - - - - 24 - 292 - - - - - 24 - 292 - - - - background:url(:/images/simulator/X12/led.png) - - - - - - - - 0 - 0 - - - - - 480 - 9 - - - - - 480 - 9 - - - - - 5 - - - - background:url(:/images/simulator/X12/top.png) - - - - - - - - 0 - 0 - - - - - 27 - 292 - - - - - 27 - 292 - - - - background:url(:/images/simulator/X12/border-right.png) - - - - - - - - 0 - 0 - - - - - 147 - 292 - - - - - 147 - 292 - - - - background:url(:/images/simulator/X12/right.png) - - - - - - - - 0 - 0 - - - - - 480 - 272 - - - - - 480 - 272 - - - - - 5 - - - - - - - - - 0 - 0 - - - - - 480 - 11 - - - - - 480 - 11 - - - - - 5 - false - - - - background:url(:/images/simulator/X12/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetX7.cpp b/companion/src/simulation/simulateduiwidgetX7.cpp deleted file mode 100644 index 99e06d831..000000000 --- a/companion/src/simulation/simulateduiwidgetX7.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetX7.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetX7::SimulatedUIWidgetX7(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetX7) -{ - RadioUiAction * act; - QPolygon polygon; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - QPoint ctr(70, 91); - polygon << polyArc(ctr.x(), ctr.y(), 50, -90, 90) << polyArc(ctr.x(), ctr.y(), 22, -90, 90); - - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU_ICN); - addRadioWidget(ui->leftbuttons->addArea(polyArc(ctr.x(), ctr.y(), 20), "X7/left_menu.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X7/left_page.png", act)); - - polygon.clear(); - polygon << polyArc(ctr.x(), ctr.y(), 50, 90, 270) << polyArc(ctr.x(), ctr.y(), 22, 90, 270); - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X7/left_exit.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus << Qt::Key_Equal << Qt::Key_Left, SIMU_STR_HLP_KEYS_GO_LFT, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Right, SIMU_STR_HLP_KEYS_GO_RGT, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(polyArc(88, 92, 33), "X7/right_ent.png", m_mouseMidClickAction)); - - addRadioWidget(ui->leftbuttons->addArea(QRect(9, 154, 30, 30), "X7/left_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetX7::~SimulatedUIWidgetX7() -{ - delete ui; -} - diff --git a/companion/src/simulation/simulateduiwidgetX7.ui b/companion/src/simulation/simulateduiwidgetX7.ui deleted file mode 100644 index 46d6092ea..000000000 --- a/companion/src/simulation/simulateduiwidgetX7.ui +++ /dev/null @@ -1,258 +0,0 @@ - - - SimulatedUIWidgetX7 - - - - 0 - 0 - 570 - 208 - - - - - 0 - 0 - - - - - 570 - 208 - - - - - 570 - 208 - - - - Taranis X7 Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 157 - 186 - - - - - 157 - 186 - - - - background:url(:/images/simulator/X7/left.png); - - - - - - - - 0 - 0 - - - - - 256 - 128 - - - - - 424 - 128 - - - - background-color: rgb(215, 243, 255); - - - - - - - - 0 - 0 - - - - - 157 - 186 - - - - - 157 - 186 - - - - background:url(:/images/simulator/X7/right.png) - - - - - - - - 0 - 0 - - - - - 256 - 48 - - - - - 256 - 48 - - - - background:url(:/images/simulator/X7/top.png) - - - - - - - - 0 - 0 - - - - - 256 - 10 - - - - - 256 - 10 - - - - background:url(:/images/simulator/X7/bottom.png) - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 12 - - - - - 0 - 12 - - - - background-color: rgb(255, 255, 255); - - - - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 10 - - - - background-color: rgb(247, 245, 245); - - - - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetX9.cpp b/companion/src/simulation/simulateduiwidgetX9.cpp deleted file mode 100644 index 2cfc5c5fa..000000000 --- a/companion/src/simulation/simulateduiwidgetX9.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetX9.h" - -SimulatedUIWidgetX9::SimulatedUIWidgetX9(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetX9) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - // button placement, size, spacing - const int btop = 45, vsp = 17; - QRect btn(16, btop, 46, 31); - - // left side - - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_Up << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU); - addRadioWidget(ui->leftbuttons->addArea(btn, "X9D/x9l1.png", act)); - btn.moveTop(btn.top() + btn.height() + vsp); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_Down << Qt::Key_PageDown, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(btn, "X9D/x9l2.png", act)); - btn.moveTop(btn.top() + btn.height() + vsp); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(btn, "X9D/x9l3.png", act)); - - m_scrollUpAction = new RadioUiAction(KEY_PLUS, QList() << Qt::Key_Plus << Qt::Key_Equal << Qt::Key_Left, - SIMU_STR_HLP_KEY_LFT % "|" % SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_PLS); - m_scrollDnAction = new RadioUiAction(KEY_MINUS, QList() << Qt::Key_Minus << Qt::Key_Right, - SIMU_STR_HLP_KEY_RGT % "|" % SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_MIN); - - // right side - btn.moveTopLeft(QPoint(58, btop)); - - addRadioWidget(ui->rightbuttons->addArea(btn, "X9D/x9r1.png", m_scrollUpAction)); - btn.moveTop(btn.top() + btn.height() + vsp); - - addRadioWidget(ui->rightbuttons->addArea(btn, "X9D/x9r2.png", m_scrollDnAction)); - btn.moveTop(btn.top() + btn.height() + vsp); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ENT); - addRadioWidget(ui->rightbuttons->addArea(btn, "X9D/x9r3.png", m_mouseMidClickAction)); - - addRadioWidget(ui->leftbuttons->addArea(QRect(89, 177, 30, 20), "X9D/x9l4.png", m_screenshotAction)); - - m_backlightColors << QColor(47, 123, 227); // Taranis Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); -} - -SimulatedUIWidgetX9::~SimulatedUIWidgetX9() -{ - delete ui; -} - diff --git a/companion/src/simulation/simulateduiwidgetX9.ui b/companion/src/simulation/simulateduiwidgetX9.ui deleted file mode 100644 index 31228c734..000000000 --- a/companion/src/simulation/simulateduiwidgetX9.ui +++ /dev/null @@ -1,166 +0,0 @@ - - - SimulatedUIWidgetX9 - - - - 0 - 0 - 664 - 208 - - - - - 0 - 0 - - - - - 664 - 208 - - - - - 664 - 208 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 120 - 208 - - - - true - - - background:url(:/images/simulator/X9D/x9l0.png); - - - - - - - - 0 - 0 - - - - - 424 - 38 - - - - background:url(:/images/simulator/X9D/x9t0.png) - - - - - - - - 0 - 0 - - - - - 120 - 208 - - - - background:url(:/images/simulator/X9D/x9r0.png) - - - - - - - - 0 - 0 - - - - - 424 - 128 - - - - - 424 - 128 - - - - - - - - - 0 - 0 - - - - - 424 - 42 - - - - background:url(:/images/simulator/X9D/x9b0.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetX9D2019.cpp b/companion/src/simulation/simulateduiwidgetX9D2019.cpp deleted file mode 100644 index eefed46e9..000000000 --- a/companion/src/simulation/simulateduiwidgetX9D2019.cpp +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetX9D2019.h" - -SimulatedUIWidgetX9D2019::SimulatedUIWidgetX9D2019(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetX9D2019) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_Up << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU); - addRadioWidget(ui->leftbuttons->addArea(QRect(25, 40, 80, 35), "X9D2019/left_menu.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_Down << Qt::Key_PageDown, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(QRect(25, 85, 80, 35), "X9D2019/left_page.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(25, 140, 80, 35), "X9D2019/left_exit.png", act)); - - m_scrollUpAction = addRadioAction(new RadioUiAction(-1, QList() << Qt::Key_Minus << Qt::Key_Left, SIMU_STR_HLP_KEYS_GO_LFT, SIMU_STR_HLP_ACT_ROT_LFT)); - m_scrollDnAction = addRadioAction(new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal << Qt::Key_Right, SIMU_STR_HLP_KEYS_GO_RGT, SIMU_STR_HLP_ACT_ROT_RGT)); - connectScrollActions(); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(40, 30, 80, 130), "X9D2019/right_enter.png", m_mouseMidClickAction)); - - addRadioWidget(ui->bottom->addArea(QRect(10, 5, 30, 30), "X9D2019/bottom_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(47, 123, 227); // Taranis Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:pad, x1:1, y1:0.9, x2:0, y2:0," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.35 rgba(250, 250, 250, 255), stop:0.5 rgba(242, 241, 241, 255)," - "stop:0.61 rgba(241, 241, 241, 255), stop:1.0 rgba(251, 251, 251, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetX9D2019::~SimulatedUIWidgetX9D2019() -{ - delete ui; -} - diff --git a/companion/src/simulation/simulateduiwidgetX9D2019.ui b/companion/src/simulation/simulateduiwidgetX9D2019.ui deleted file mode 100644 index 44a146b75..000000000 --- a/companion/src/simulation/simulateduiwidgetX9D2019.ui +++ /dev/null @@ -1,166 +0,0 @@ - - - SimulatedUIWidgetX9D2019 - - - - 0 - 0 - 756 - 258 - - - - - 0 - 0 - - - - - 756 - 258 - - - - - 756 - 258 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 166 - 258 - - - - true - - - background:url(:/images/simulator/X9D2019/left.png); - - - - - - - - 0 - 0 - - - - - 424 - 50 - - - - background:url(:/images/simulator/X9D2019/top.png) - - - - - - - - 0 - 0 - - - - - 166 - 258 - - - - background:url(:/images/simulator/X9D2019/right.png) - - - - - - - - 0 - 0 - - - - - 424 - 128 - - - - - 424 - 128 - - - - - - - - - 0 - 0 - - - - - 424 - 80 - - - - background:url(:/images/simulator/X9D2019/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetX9E.cpp b/companion/src/simulation/simulateduiwidgetX9E.cpp deleted file mode 100644 index 7dde108d9..000000000 --- a/companion/src/simulation/simulateduiwidgetX9E.cpp +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetX9E.h" - -SimulatedUIWidgetX9E::SimulatedUIWidgetX9E(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetX9E) -{ - RadioUiAction * act; - QPolygon polygon; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - QPoint ctr(70, 100); - - polygon << polyArc(ctr.x(), ctr.y(), 60, -90, 0) << ctr; - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_Up << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X9E/left_menu.png", act)); - - polygon.clear(); - polygon << polyArc(ctr.x(), ctr.y(), 45, 0, 180); - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_Down << Qt::Key_PageDown, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X9E/left_page.png", act)); - - polygon.clear(); - polygon << polyArc(ctr.x(), ctr.y(), 60, 180, 270) << ctr; - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X9E/left_exit.png", act)); - - m_scrollUpAction = addRadioAction(new RadioUiAction(-1, QList() << Qt::Key_Minus << Qt::Key_Left, SIMU_STR_HLP_KEYS_GO_LFT, SIMU_STR_HLP_ACT_ROT_LFT)); - m_scrollDnAction = addRadioAction(new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal << Qt::Key_Right, SIMU_STR_HLP_KEYS_GO_RGT, SIMU_STR_HLP_ACT_ROT_RGT)); - connectScrollActions(); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(polyArc(90, 100, 50), "X9E/right_enter.png", m_mouseMidClickAction)); - - addRadioWidget(ui->leftbuttons->addArea(QRect(10, 170, 30, 30), "X9E/left_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(47, 123, 227); // Taranis Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:pad, x1:1, y1:0.9, x2:0, y2:0," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.35 rgba(250, 250, 250, 255), stop:0.5 rgba(242, 241, 241, 255)," - "stop:0.61 rgba(241, 241, 241, 255), stop:1.0 rgba(251, 251, 251, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetX9E::~SimulatedUIWidgetX9E() -{ - delete ui; -} - diff --git a/companion/src/simulation/simulateduiwidgetX9E.ui b/companion/src/simulation/simulateduiwidgetX9E.ui deleted file mode 100644 index 87a23e552..000000000 --- a/companion/src/simulation/simulateduiwidgetX9E.ui +++ /dev/null @@ -1,166 +0,0 @@ - - - SimulatedUIWidgetX9E - - - - 0 - 0 - 724 - 210 - - - - - 0 - 0 - - - - - 724 - 210 - - - - - 724 - 210 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 150 - 208 - - - - true - - - background:url(:/images/simulator/X9E/left.png); - - - - - - - - 0 - 0 - - - - - 424 - 40 - - - - background:url(:/images/simulator/X9E/top.png) - - - - - - - - 0 - 0 - - - - - 150 - 208 - - - - background:url(:/images/simulator/X9E/right.png) - - - - - - - - 0 - 0 - - - - - 424 - 128 - - - - - 424 - 128 - - - - - - - - - 0 - 0 - - - - - 424 - 40 - - - - background:url(:/images/simulator/X9E/bottom.png) - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetX9LITE.cpp b/companion/src/simulation/simulateduiwidgetX9LITE.cpp deleted file mode 100644 index 7d889a6eb..000000000 --- a/companion/src/simulation/simulateduiwidgetX9LITE.cpp +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetX9LITE.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetX9LITE::SimulatedUIWidgetX9LITE(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetX9LITE) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_MENU, QList() << Qt::Key_PageUp << Qt::Key_Up, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_MENU_ICN); - addRadioWidget(ui->leftbuttons->addArea(QRect(80, 20, 40, 35), "X9LITE/left_menu.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(QRect(80, 65, 40, 35), "X9LITE/left_page.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(80, 130, 40, 35), "X9LITE/left_exit.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus << Qt::Key_Equal << Qt::Key_Left, SIMU_STR_HLP_KEYS_GO_LFT, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Right, SIMU_STR_HLP_KEYS_GO_RGT, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(polyArc(88, 92, 33), "X9LITE/right_ent.png", m_mouseMidClickAction)); - - addRadioWidget(ui->leftbuttons->addArea(QRect(30, 154, 30, 30), "X9LITE/left_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(215, 243, 255); // X9LITE Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetX9LITE::~SimulatedUIWidgetX9LITE() -{ - delete ui; -} - diff --git a/companion/src/simulation/simulateduiwidgetX9LITE.ui b/companion/src/simulation/simulateduiwidgetX9LITE.ui deleted file mode 100644 index 4432f8ae3..000000000 --- a/companion/src/simulation/simulateduiwidgetX9LITE.ui +++ /dev/null @@ -1,258 +0,0 @@ - - - SimulatedUIWidgetX9LITE - - - - 0 - 0 - 650 - 208 - - - - - 0 - 0 - - - - - 603 - 235 - - - - - 603 - 240 - - - - Taranis X9-Lite Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 173 - 210 - - - - - 173 - 210 - - - - background:url(:/images/simulator/X9LITE/left.png); - - - - - - - - 0 - 0 - - - - - 602 - 129 - - - - - 602 - 129 - - - - background-color: rgb(215, 243, 255); - - - - - - - - 0 - 0 - - - - - 174 - 210 - - - - - 174 - 210 - - - - background:url(:/images/simulator/X9LITE/right.png) - - - - - - - - 0 - 0 - - - - - 258 - 35 - - - - - 258 - 35 - - - - background:url(:/images/simulator/X9LITE/top.png) - - - - - - - - 0 - 0 - - - - - 258 - 46 - - - - - 258 - 46 - - - - background:url(:/images/simulator/X9LITE/bottom.png) - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 12 - - - - - 0 - 12 - - - - background-color: rgb(255, 255, 255); - - - - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 10 - - - - background-color: rgb(247, 245, 245); - - - - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetXLITE.cpp b/companion/src/simulation/simulateduiwidgetXLITE.cpp deleted file mode 100644 index 9c83bb5e7..000000000 --- a/companion/src/simulation/simulateduiwidgetXLITE.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetXLITE.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetXLITE::SimulatedUIWidgetXLITE(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetXLITE) -{ - RadioUiAction * act; - QPolygon polygon; - - ui->setupUi(this); - - int x = 49, y = 91, iR = 21, oR = 48; - polygon.clear(); - - polygon << polyArc(x, y, oR, -45, 45) << polyArc(x, y, iR, -45, 45); - act = new RadioUiAction(KEY_UP, QList() << Qt::Key_Up << Qt::Key_PageUp, SIMU_STR_HLP_KEYS_GO_UP, SIMU_STR_HLP_ACT_UP); - addRadioWidget(ui->rightbuttons->addArea(polygon, "XLITE/right_up.png", act)); - - polygon.clear(); - polygon << polyArc(x, y, oR, 135, 225) << polyArc(x, y, iR, 135, 225); - act = new RadioUiAction(KEY_DOWN, QList() << Qt::Key_Down << Qt::Key_PageDown, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_DN); - addRadioWidget(ui->rightbuttons->addArea(polygon, "XLITE/right_down.png", act)); - - polygon.clear(); - polygon << polyArc(x, y, oR, 45, 135) << polyArc(x, y, iR, 45, 135); - act = new RadioUiAction(KEY_RIGHT, QList() << Qt::Key_Right << Qt::Key_Plus, SIMU_STR_HLP_KEY_RGT % "|" % SIMU_STR_HLP_KEY_PLS, SIMU_STR_HLP_ACT_PLS); - addRadioWidget(ui->rightbuttons->addArea(polygon, "XLITE/right_right.png", act)); - - polygon.clear(); - polygon << polyArc(x, y, oR, 225, 315) << polyArc(x, y, iR, 225, 315); - act = new RadioUiAction(KEY_LEFT, QList() << Qt::Key_Left << Qt::Key_Minus, SIMU_STR_HLP_KEY_LFT % "|" % SIMU_STR_HLP_KEY_MIN, SIMU_STR_HLP_ACT_MIN); - addRadioWidget(ui->rightbuttons->addArea(polygon, "XLITE/right_left.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ENT); - addRadioWidget(ui->rightbuttons->addArea(QRect(37, 80, 25, 25), "XLITE/right_ent.png", m_mouseMidClickAction)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->rightbuttons->addArea(QRect(36, 147, 27, 27), "XLITE/right_exit.png", act)); - - act = new RadioUiAction(KEY_SHIFT, QList() << Qt::Key_S, SIMU_STR_HLP_KEY_SHIFT, SIMU_STR_HLP_ACT_SHIFT); - addRadioWidget(ui->rightbuttons->addArea(QRect(73, 129, 27, 27), "XLITE/right_shift.png", act)); - - addRadioWidget(ui->leftbuttons->addArea(QRect(9, 152, 25, 25), "XLITE/left_scrnshot.png", m_screenshotAction)); - - m_backlightColors << QColor(215, 243, 255); // XLITE Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetXLITE::~SimulatedUIWidgetXLITE() -{ - delete ui; -} - diff --git a/companion/src/simulation/simulateduiwidgetXLITE.ui b/companion/src/simulation/simulateduiwidgetXLITE.ui deleted file mode 100644 index 191626cc6..000000000 --- a/companion/src/simulation/simulateduiwidgetXLITE.ui +++ /dev/null @@ -1,249 +0,0 @@ - - - SimulatedUIWidgetXLITE - - - - 0 - 0 - 570 - 208 - - - - - 0 - 0 - - - - - 570 - 208 - - - - - 570 - 208 - - - - Taranis X-LITE Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 157 - 186 - - - - - 157 - 186 - - - - background:url(:/images/simulator/XLITE/left.png); - - - - - - - - 0 - 0 - - - - - 256 - 128 - - - - - 424 - 128 - - - - background-color: rgb(215, 243, 255); - - - - - - - - 0 - 0 - - - - - 157 - 186 - - - - - 157 - 186 - - - - background:url(:/images/simulator/XLITE/right.png) - - - - - - - - 0 - 0 - - - - - 256 - 48 - - - - - 256 - 48 - - - - background:url(:/images/simulator/XLITE/top.png) - - - - - - - - 0 - 0 - - - - - 256 - 10 - - - - - 256 - 10 - - - - background:url(:/images/simulator/XLITE/bottom.png) - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 12 - - - - - 0 - 12 - - - - background-color: rgb(255, 255, 255); - - - - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 10 - - - - background-color: rgb(247, 245, 245); - - - - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulateduiwidgetZorro.cpp b/companion/src/simulation/simulateduiwidgetZorro.cpp deleted file mode 100644 index c2d2fa140..000000000 --- a/companion/src/simulation/simulateduiwidgetZorro.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) EdgeTX - * - * Based on code named - * opentx - https://github.com/opentx/opentx - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "simulateduiwidget.h" -#include "ui_simulateduiwidgetZorro.h" - -// NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h - -SimulatedUIWidgetZorro::SimulatedUIWidgetZorro(SimulatorInterface *simulator, QWidget * parent): - SimulatedUIWidget(simulator, parent), - ui(new Ui::SimulatedUIWidgetZorro) -{ - RadioUiAction * act; - - ui->setupUi(this); - - // add actions in order of appearance on the help menu - - act = new RadioUiAction(KEY_MODEL, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->rightbuttons->addArea(QRect(65, 35, 90, 45), "Zorro/right-mdl.png", act)); - - m_mouseMidClickAction = new RadioUiAction(KEY_ENTER, QList() << Qt::Key_Enter << Qt::Key_Return, SIMU_STR_HLP_KEYS_ACTIVATE, SIMU_STR_HLP_ACT_ROT_DN); - addRadioWidget(ui->rightbuttons->addArea(QRect(7, 84, 110, 90), "Zorro/right-ent.png", m_mouseMidClickAction)); - - act = new RadioUiAction(KEY_SYS, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->leftbuttons->addArea(QRect(52, 39, 70, 50), "Zorro/left-sys.png", act)); - - act = new RadioUiAction(KEY_TELE, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->rightbuttons->addArea(QRect(75, 180, 80, 35), "Zorro/right-tele.png", act)); - - act = new RadioUiAction(KEY_PAGEDN, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(QRect(70, 145, 80, 35), "Zorro/left-pagedn.png", act)); - - act = new RadioUiAction(KEY_PAGEUP, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->leftbuttons->addArea(QRect(60, 185, 80, 35), "Zorro/left-pageup.png", act)); - - act = new RadioUiAction(KEY_EXIT, QList() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT); - addRadioWidget(ui->leftbuttons->addArea(QRect(85, 105, 80, 35), "Zorro/left-rtn.png", act)); - - m_scrollUpAction = new RadioUiAction(-1, QList() << Qt::Key_Minus, SIMU_STR_HLP_KEY_MIN % "|" % SIMU_STR_HLP_MOUSE_UP, SIMU_STR_HLP_ACT_ROT_LFT); - m_scrollDnAction = new RadioUiAction(-1, QList() << Qt::Key_Plus << Qt::Key_Equal, SIMU_STR_HLP_KEY_PLS % "|" % SIMU_STR_HLP_MOUSE_DN, SIMU_STR_HLP_ACT_ROT_RGT); - connectScrollActions(); - - m_backlightColors << QColor(215, 243, 255); // X7 Blue - m_backlightColors << QColor(166,247,159); - m_backlightColors << QColor(247,159,166); - m_backlightColors << QColor(255,195,151); - m_backlightColors << QColor(247,242,159); - - setLcd(ui->lcd); - - QString css = "#radioUiWidget {" - "background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1," - "stop:0 rgba(255, 255, 255, 255)," - "stop:0.757062 rgba(241, 238, 238, 255)," - "stop:1 rgba(247, 245, 245, 255));" - "}"; - - QTimer * tim = new QTimer(this); - tim->setSingleShot(true); - connect(tim, &QTimer::timeout, [this, css]() { - emit customStyleRequest(css); - }); - tim->start(100); -} - -SimulatedUIWidgetZorro::~SimulatedUIWidgetZorro() -{ - delete ui; -} diff --git a/companion/src/simulation/simulateduiwidgetZorro.ui b/companion/src/simulation/simulateduiwidgetZorro.ui deleted file mode 100644 index 329008deb..000000000 --- a/companion/src/simulation/simulateduiwidgetZorro.ui +++ /dev/null @@ -1,258 +0,0 @@ - - - SimulatedUIWidgetZorro - - - - 0 - 0 - 641 - 253 - - - - - 0 - 0 - - - - - 641 - 253 - - - - - 641 - 253 - - - - Taranis Zorro Simulator - - - background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:0.757062 rgba(241, 238, 238, 255), stop:1 rgba(247, 245, 245, 255)); - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 196 - 253 - - - - - 196 - 253 - - - - background:url(:/images/simulator/Zorro/left.png); - - - - - - - - 0 - 0 - - - - - 256 - 180 - - - - - 424 - 180 - - - - background-color: rgb(215, 243, 255); - - - - - - - - 0 - 0 - - - - - 189 - 253 - - - - - 189 - 253 - - - - background:url(:/images/simulator/Zorro/right.png) - - - - - - - - 0 - 0 - - - - - 256 - 48 - - - - - 256 - 48 - - - - background:url(:/images/simulator/Zorro/top.png) - - - - - - - - 0 - 0 - - - - - 261 - 55 - - - - - 261 - 55 - - - - background:url(:/images/simulator/Zorro/bottom.png) - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 12 - - - - - 0 - 12 - - - - background-color: rgb(255, 255, 255); - - - - - - - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 10 - - - - background-color: rgb(247, 245, 245); - - - - - - - - - - - LcdWidget - QWidget -
lcdwidget.h
- 1 - - - ButtonsWidget - QWidget -
buttonswidget.h
- 1 - - - - - diff --git a/companion/src/simulation/simulator_strings.h b/companion/src/simulation/simulator_strings.h index b75cf2736..07a80bbe8 100644 --- a/companion/src/simulation/simulator_strings.h +++ b/companion/src/simulation/simulator_strings.h @@ -23,16 +23,28 @@ #include -#define SIMU_STR_HLP_KEY_ENTER QCoreApplication::translate("SimulatedUIWidget", "ENTER") -#define SIMU_STR_HLP_KEY_SHIFT QCoreApplication::translate("SimulatedUIWidget", "S") -#define SIMU_STR_HLP_KEY_PGUP QCoreApplication::translate("SimulatedUIWidget", "PG-UP") -#define SIMU_STR_HLP_KEY_PGDN QCoreApplication::translate("SimulatedUIWidget", "PG-DN") -#define SIMU_STR_HLP_KEY_DEL QCoreApplication::translate("SimulatedUIWidget", "DEL") -#define SIMU_STR_HLP_KEY_BKSP QCoreApplication::translate("SimulatedUIWidget", "BKSP") -#define SIMU_STR_HLP_KEY_ESC QCoreApplication::translate("SimulatedUIWidget", "ESC") -#define SIMU_STR_HLP_KEY_INS QCoreApplication::translate("SimulatedUIWidget", "INS") +#define SIMU_STR_HLP_KEY_D QCoreApplication::translate("SimulatedUIWidget", "D") +#define SIMU_STR_HLP_KEY_F QCoreApplication::translate("SimulatedUIWidget", "F") +#define SIMU_STR_HLP_KEY_M QCoreApplication::translate("SimulatedUIWidget", "M") +#define SIMU_STR_HLP_KEY_N QCoreApplication::translate("SimulatedUIWidget", "N") +#define SIMU_STR_HLP_KEY_S QCoreApplication::translate("SimulatedUIWidget", "S") +#define SIMU_STR_HLP_KEY_T QCoreApplication::translate("SimulatedUIWidget", "T") + +#define SIMU_STR_HLP_KEY_ENTER QCoreApplication::translate("SimulatedUIWidget", "enter") +#define SIMU_STR_HLP_KEY_RETURN QCoreApplication::translate("SimulatedUIWidget", "return") +#define SIMU_STR_HLP_KEY_PGUP QCoreApplication::translate("SimulatedUIWidget", "page up") +#define SIMU_STR_HLP_KEY_PGDN QCoreApplication::translate("SimulatedUIWidget", "page down") +#define SIMU_STR_HLP_KEY_DEL QCoreApplication::translate("SimulatedUIWidget", "delete") +#define SIMU_STR_HLP_KEY_BKSP QCoreApplication::translate("SimulatedUIWidget", "backspace") +#define SIMU_STR_HLP_KEY_ESC QCoreApplication::translate("SimulatedUIWidget", "esc") +#define SIMU_STR_HLP_KEY_INS QCoreApplication::translate("SimulatedUIWidget", "insert") #define SIMU_STR_HLP_KEY_PLS QCoreApplication::translate("SimulatedUIWidget", "+") #define SIMU_STR_HLP_KEY_MIN QCoreApplication::translate("SimulatedUIWidget", "-") +#define SIMU_STR_HLP_KEY_EQL QCoreApplication::translate("SimulatedUIWidget", "=") +#define SIMU_STR_HLP_KEY_GT QCoreApplication::translate("SimulatedUIWidget", ">") +#define SIMU_STR_HLP_KEY_LT QCoreApplication::translate("SimulatedUIWidget", "<") +#define SIMU_STR_HLP_KEY_COMMA QCoreApplication::translate("SimulatedUIWidget", ",") +#define SIMU_STR_HLP_KEY_PERIOD QCoreApplication::translate("SimulatedUIWidget", ".") #define SIMU_STR_HLP_KEY_LFT QCoreApplication::translate("SimulatedUIWidget", "←") // ← #define SIMU_STR_HLP_KEY_RGT QCoreApplication::translate("SimulatedUIWidget", "→") // → @@ -59,10 +71,12 @@ #define SIMU_STR_HLP_ACT_MENU QCoreApplication::translate("SimulatedUIWidget", "
[ MENU ]
") #define SIMU_STR_HLP_ACT_PAGE QCoreApplication::translate("SimulatedUIWidget", "
[ PAGE ]
") #define SIMU_STR_HLP_ACT_EXIT QCoreApplication::translate("SimulatedUIWidget", "
[ EXIT ]
") -#define SIMU_STR_HLP_ACT_ENT QCoreApplication::translate("SimulatedUIWidget", "
[ ENT ]
") +#define SIMU_STR_HLP_ACT_ENTER QCoreApplication::translate("SimulatedUIWidget", "
[ ENT ]
") #define SIMU_STR_HLP_ACT_SHIFT QCoreApplication::translate("SimulatedUIWidget", "
[ SHIFT ]
") #define SIMU_STR_HLP_ACT_UP QCoreApplication::translate("SimulatedUIWidget", "
[ UP ]
") -#define SIMU_STR_HLP_ACT_DN QCoreApplication::translate("SimulatedUIWidget", "
[ DN ]
") +#define SIMU_STR_HLP_ACT_DOWN QCoreApplication::translate("SimulatedUIWidget", "
[ DN ]
") +#define SIMU_STR_HLP_ACT_LFT QCoreApplication::translate("SimulatedUIWidget", "
[ LEFT ]
") +#define SIMU_STR_HLP_ACT_RGT QCoreApplication::translate("SimulatedUIWidget", "
[ RIGHT ]
") #define SIMU_STR_HLP_ACT_PLS QCoreApplication::translate("SimulatedUIWidget", "
[ + ]
") #define SIMU_STR_HLP_ACT_MIN QCoreApplication::translate("SimulatedUIWidget", "
[ - ]
") #define SIMU_STR_HLP_ACT_PGUP QCoreApplication::translate("SimulatedUIWidget", "
[ PgUp ]
") @@ -76,8 +90,11 @@ #define SIMU_STR_HLP_ACT_PREVINC QCoreApplication::translate("SimulatedUIWidget", "
[ Prev/Inc ]
") #define SIMU_STR_HLP_ACT_NEXTDEC QCoreApplication::translate("SimulatedUIWidget", "
[ Next/Dec ]
") +#define SIMU_STR_HLP_KEYS_ENTER SIMU_STR_HLP_KEY_ENTER % " | " % SIMU_STR_HLP_KEY_RETURN +#define SIMU_STR_HLP_KEYS_EXIT SIMU_STR_HLP_KEY_ESC % " | " % SIMU_STR_HLP_KEY_BKSP +#define SIMU_STR_HLP_KEYS_SCRLUP SIMU_STR_HLP_KEY_COMMA % " | " % SIMU_STR_HLP_MOUSE_UP +#define SIMU_STR_HLP_KEYS_SCRLDN SIMU_STR_HLP_KEY_PERIOD % " | " % SIMU_STR_HLP_MOUSE_DN -#define SIMU_STR_HLP_KEYS_EXIT SIMU_STR_HLP_KEY_DEL % "|" % SIMU_STR_HLP_KEY_BKSP % "|" % SIMU_STR_HLP_KEY_ESC #define SIMU_STR_HLP_KEYS_ACTIVATE SIMU_STR_HLP_KEY_ENTER % "|" % SIMU_STR_HLP_MOUSE_MID #define SIMU_STR_HLP_KEYS_GO_UP SIMU_STR_HLP_KEY_UP % "|" % SIMU_STR_HLP_KEY_PGUP #define SIMU_STR_HLP_KEYS_GO_DN SIMU_STR_HLP_KEY_DN % "|" % SIMU_STR_HLP_KEY_PGDN diff --git a/companion/src/simulation/simulatormainwindow.cpp b/companion/src/simulation/simulatormainwindow.cpp index 99c3c7232..e9c6efff0 100644 --- a/companion/src/simulation/simulatormainwindow.cpp +++ b/companion/src/simulation/simulatormainwindow.cpp @@ -133,6 +133,7 @@ SimulatorMainWindow::SimulatorMainWindow(QWidget *parent, const QString & simula setStyleSheet(SimulatorStyle::styleSheet()); connect(ui->actionShowKeymap, &QAction::triggered, this, &SimulatorMainWindow::showHelp); + connect(ui->actionAbout, &QAction::triggered, this, &SimulatorMainWindow::showAbout); connect(ui->actionJoystickSettings, &QAction::triggered, this, &SimulatorMainWindow::openJoystickDialog); connect(ui->actionSerialPorts, &QAction::triggered, this, &SimulatorMainWindow::openSerialPortsDialog); connect(ui->actionToggleMenuBar, &QAction::toggled, this, &SimulatorMainWindow::showMenuBar); @@ -526,3 +527,31 @@ void SimulatorMainWindow::showHelp(bool show) msgBox->setModal(false); msgBox->show(); } + +void SimulatorMainWindow::showAbout(bool show) +{ + QString aboutStr = "

"; + aboutStr.append(tr("EdgeTX Home Page: %1").arg(EDGETX_HOME_PAGE_URL)); + aboutStr.append("

"); + aboutStr.append(tr("The EdgeTX project was originally forked from OpenTX").arg("https://github.com/opentx/opentx")); + aboutStr.append("

"); + aboutStr.append(tr("If you've found this program useful, please support by donating").arg(EDGETX_DONATE_URL)); + aboutStr.append("

"); +#if defined(VERSION_TAG) + aboutStr.append(QString("Version %1 \"%2\", %3").arg(VERSION_TAG).arg(CODENAME).arg(__DATE__)); +#else + aboutStr.append(QString("Version %1-%2, %3").arg(VERSION).arg(VERSION_SUFFIX).arg(__DATE__)); + aboutStr.append("
"); + aboutStr.append(QString("Commit %2").arg(EDGETX_COMMIT_URL % GIT_STR).arg(GIT_STR)); +#endif + aboutStr.append("

"); + aboutStr.append(tr("File new Issue or Request").arg(EDGETX_ISSUES_URL)); + aboutStr.append("

"); + aboutStr.append(tr("Copyright") + QString(" © 2021-%1 EdgeTX
").arg(BUILD_YEAR)); + + QMessageBox msgBox(this); + msgBox.setWindowIcon(CompanionIcon("information.png")); + msgBox.setWindowTitle(tr("About EdgeTX Simulator")); + msgBox.setText(aboutStr); + msgBox.exec(); +} diff --git a/companion/src/simulation/simulatormainwindow.h b/companion/src/simulation/simulatormainwindow.h index bec7507ce..cf4a426c1 100644 --- a/companion/src/simulation/simulatormainwindow.h +++ b/companion/src/simulation/simulatormainwindow.h @@ -83,6 +83,7 @@ class SimulatorMainWindow : public QMainWindow void openJoystickDialog(bool); void openSerialPortsDialog(bool); void showHelp(bool show); + void showAbout(bool show); protected: void createDockWidgets(); diff --git a/companion/src/simulation/simulatormainwindow.ui b/companion/src/simulation/simulatormainwindow.ui index aa6cc3ed6..faf956160 100644 --- a/companion/src/simulation/simulatormainwindow.ui +++ b/companion/src/simulation/simulatormainwindow.ui @@ -37,7 +37,7 @@ 0 0 644 - 22 + 20 @@ -71,12 +71,19 @@ - + + + Help + + + + + @@ -222,6 +229,11 @@ Serial Ports + + + About + + diff --git a/companion/src/simulation/simulatorwidget.cpp b/companion/src/simulation/simulatorwidget.cpp index 673b53c55..3aaeebb1e 100644 --- a/companion/src/simulation/simulatorwidget.cpp +++ b/companion/src/simulation/simulatorwidget.cpp @@ -37,6 +37,7 @@ #include "joystick.h" #include "joystickdialog.h" #endif +#include "simulateduiwidgetGeneric.h" #include #include @@ -59,122 +60,9 @@ SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface * simulato windowName = tr("Radio Simulator (%1)").arg(firmware->getName()); setWindowTitle(windowName); - switch(m_board) { - case Board::BOARD_TARANIS_X9LITE: - case Board::BOARD_TARANIS_X9LITES: - radioUiWidget = new SimulatedUIWidgetX9LITE(simulator, this); - break; - case Board::BOARD_TARANIS_X7: - case Board::BOARD_TARANIS_X7_ACCESS: - radioUiWidget = new SimulatedUIWidgetX7(simulator, this); - break; - case Board::BOARD_TARANIS_X9D: - case Board::BOARD_TARANIS_X9DP: - radioUiWidget = new SimulatedUIWidgetX9(simulator, this); - break; - case Board::BOARD_TARANIS_X9DP_2019: - radioUiWidget = new SimulatedUIWidgetX9D2019(simulator, this); - break; - case Board::BOARD_TARANIS_XLITE: - case Board::BOARD_TARANIS_XLITES: - radioUiWidget = new SimulatedUIWidgetXLITE(simulator, this); - break; - case Board::BOARD_TARANIS_X9E: - radioUiWidget = new SimulatedUIWidgetX9E(simulator, this); - break; - case Board::BOARD_HORUS_X12S: - radioUiWidget = new SimulatedUIWidgetX12(simulator, this); - break; - case Board::BOARD_X10: - case Board::BOARD_X10_EXPRESS: - radioUiWidget = new SimulatedUIWidgetX10(simulator, this); - break; - case Board::BOARD_BETAFPV_LR3PRO: - radioUiWidget = new SimulatedUIWidgetLR3PRO(simulator, this); - break; - case Board::BOARD_IFLIGHT_COMMANDO8: - radioUiWidget = new SimulatedUIWidgetCommando8(simulator, this); - break; - case Board::BOARD_JUMPER_T12: - radioUiWidget = new SimulatedUIWidgetJumperT12(simulator, this); - break; - case Board::BOARD_JUMPER_TLITE: - case Board::BOARD_JUMPER_TLITE_F4: - radioUiWidget = new SimulatedUIWidgetJumperTLITE(simulator, this); - break; - case Board::BOARD_JUMPER_TPRO: - case Board::BOARD_JUMPER_TPROV2: - radioUiWidget = new SimulatedUIWidgetJumperTPRO(simulator, this); - break; - case Board::BOARD_JUMPER_TPROS: - radioUiWidget = new SimulatedUIWidgetJumperTPROS(simulator, this); - break; - case Board::BOARD_JUMPER_BUMBLEBEE: - radioUiWidget = new SimulatedUIWidgetJumperBumblebee(simulator, this); - break; - case Board::BOARD_JUMPER_T12MAX: - radioUiWidget = new SimulatedUIWidgetJumperT12max(simulator, this); - break; - case Board::BOARD_JUMPER_T14: - radioUiWidget = new SimulatedUIWidgetJumperT14(simulator, this); - break; - case Board::BOARD_JUMPER_T15: - radioUiWidget = new SimulatedUIWidgetJumperT15(simulator, this); - break; - case Board::BOARD_JUMPER_T16: - radioUiWidget = new SimulatedUIWidgetJumperT16(simulator, this); - break; - case Board::BOARD_JUMPER_T18: - radioUiWidget = new SimulatedUIWidgetJumperT18(simulator, this); - break; - case Board::BOARD_JUMPER_T20: - case Board::BOARD_JUMPER_T20V2: - radioUiWidget = new SimulatedUIWidgetJumperT20(simulator, this); - break; - case Board::BOARD_RADIOMASTER_TX12: - case Board::BOARD_RADIOMASTER_TX12_MK2: - radioUiWidget = new SimulatedUIWidgetTX12(simulator, this); - break; - case Board::BOARD_RADIOMASTER_ZORRO: - radioUiWidget = new SimulatedUIWidgetZorro(simulator, this); - break; - case Board::BOARD_RADIOMASTER_BOXER: - radioUiWidget = new SimulatedUIWidgetBoxer(simulator, this); - break; - case Board::BOARD_RADIOMASTER_MT12: - radioUiWidget = new SimulatedUIWidgetMT12(simulator, this); - break; - case Board::BOARD_RADIOMASTER_GX12: - radioUiWidget = new SimulatedUIWidgetGeneric(simulator, this); - break; - case Board::BOARD_RADIOMASTER_T8: - radioUiWidget = new SimulatedUIWidgetT8(simulator, this); - break; - case Board::BOARD_RADIOMASTER_TX16S: - radioUiWidget = new SimulatedUIWidgetTX16S(simulator, this); - break; - case Board::BOARD_RADIOMASTER_POCKET: - radioUiWidget = new SimulatedUIWidgetPocket(simulator, this); - break; - case Board::BOARD_FATFISH_F16: - radioUiWidget = new SimulatedUIWidgetFatfishF16(simulator, this); - break; - case Board::BOARD_FLYSKY_NV14: - radioUiWidget = new SimulatedUIWidgetNV14(simulator, this); - break; - case Board::BOARD_FLYSKY_EL18: - radioUiWidget = new SimulatedUIWidgetEL18(simulator, this); - break; - case Board::BOARD_FLYSKY_PL18: - radioUiWidget = new SimulatedUIWidgetPL18(simulator, this); - break; - case Board::BOARD_HELLORADIOSKY_V16: - radioUiWidget = new SimulatedUIWidgetV16(simulator, this); - break; - default: - radioUiWidget = new SimulatedUIWidget9X(simulator, this); - break; - } + // add extra radio simulator uis here where the generic one does not satisfy + + radioUiWidget = new SimulatedUIWidgetGeneric(simulator, this); foreach (keymapHelp_t item, radioUiWidget->getKeymapHelp()) keymapHelp.append(item); @@ -187,11 +75,14 @@ SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface * simulato connect(radioUiWidget, &SimulatedUIWidget::controlValueChange, this, &SimulatorWidget::onRadioWidgetValueChange); connect(radioUiWidget, &SimulatedUIWidget::customStyleRequest, this, &SimulatorWidget::setUiAreaStyle); + connect(radioUiWidget, &SimulatedUIWidget::resizeRequest, radioUiWidget, &SimulatedUIWidget::shrink); - vJoyLeft = new VirtualJoystickWidget(this, 'L'); + vJoyLeft = new VirtualJoystickWidget(this, 'L', Boards::getCapability(m_board, Board::Surface) ? false : true); ui->leftStickLayout->addWidget(vJoyLeft); - vJoyRight = new VirtualJoystickWidget(this, 'R', (m_board == Board::BOARD_TARANIS_XLITE || m_board == Board::BOARD_TARANIS_XLITES ? false : true)); // TODO: maybe remove trims for both joysticks and add a cross in the middle? + vJoyRight = new VirtualJoystickWidget(this, 'R', (Boards::getCapability(m_board, Board::Surface) || + m_board == Board::BOARD_TARANIS_XLITE || + m_board == Board::BOARD_TARANIS_XLITES ? false : true)); // TODO: maybe remove trims for both joysticks and add a cross in the middle? ui->rightStickLayout->addWidget(vJoyRight); connect(vJoyLeft, &VirtualJoystickWidget::valueChange, this, &SimulatorWidget::onRadioWidgetValueChange); @@ -614,7 +505,8 @@ void SimulatorWidget::setupRadioWidgets() const int ttlSticks = Boards::getCapability(m_board, Board::Sticks); const int ttlSwitches = Boards::getCapability(m_board, Board::Switches); const int ttlInputs = Boards::getCapability(m_board, Board::Inputs); - const int extraTrims = Boards::getCapability(m_board, Board::NumTrims) - ttlSticks; + const int stickTrims = Boards::getCapability(m_board, Board::Air) ? ttlSticks : 0; + const int extraTrims = Boards::getCapability(m_board, Board::NumTrims) - stickTrims; // First clear out any existing widgets. foreach (RadioWidget * rw, m_radioWidgets) { @@ -683,17 +575,16 @@ void SimulatorWidget::setupRadioWidgets() // extra trims around faders int tc = 0; - int tridx = ttlSticks; + int tridx = stickTrims; for (i = 0; i < extraTrims; i += 1, tridx += 1) { - wname = RawSource(RawSourceType::SOURCE_TYPE_TRIM, tridx + 1).toString(nullptr, &radioSettings, Board::BOARD_UNKNOWN, false); - wname = wname.left(1) % wname.right(1); + wname = QString("T%1").arg(stickTrims + i + 1); RadioTrimWidget * tw = new RadioTrimWidget(Qt::Vertical, ui->radioWidgetsVC); tw->setIndices(tridx, tridx * 2, tridx * 2 + 1); tw->setLabelText(wname); if (i == extraTrims / 2) - tc += (fc + extraTrims / 2 - 1); + tc = (fc + i - 1); ui->VCGridLayout->addWidget(tw, 0, tc, 1, 1); - tc += (i >= extraTrims / 2) ? -1 : 1; + tc++; connect(simulator, &SimulatorInterface::trimValueChange, tw, &RadioTrimWidget::setTrimValue); connect(simulator, &SimulatorInterface::trimRangeChange, tw, &RadioTrimWidget::setTrimRangeQual); diff --git a/companion/src/simulation/widgets/buttonswidget.h b/companion/src/simulation/widgets/buttonswidget.h index 66ba4bbbb..7dd086522 100644 --- a/companion/src/simulation/widgets/buttonswidget.h +++ b/companion/src/simulation/widgets/buttonswidget.h @@ -62,11 +62,15 @@ class ButtonsWidget : public QWidget { RadioKeyWidget * rkw = new RadioKeyWidget(pushbtn, action, this); m_buttons.append(rkw); + // button still receives click event but does not take focus away from simulatoruiwidget + // which would stop arrow keys receiving key press events + // do not invoke pushbtn::setFocus as this would override focus policy + pushbtn->setFocusPolicy(Qt::NoFocus); connect(pushbtn, &QPushButton::pressed, rkw, &RadioKeyWidget::press); connect(pushbtn, &QPushButton::released, rkw, &RadioKeyWidget::release); if (action) { - // blink push button on click or matching key(s) press + // blink push button on click or matching key(s) press connect(action, static_cast(&RadioUiAction::pushed), [this, pushbtn] (void) { // TODO: use a palette colors // set to default -> blink -> default @@ -74,7 +78,6 @@ class ButtonsWidget : public QWidget QString blnkcol = "background-color: rgb(239, 41, 41)"; // pressing the same key in rapid seccession can affect the order of the events see TODO if (csssave != blnkcol) { - pushbtn->setFocus(); pushbtn->setStyleSheet(blnkcol); QTimer * tim = new QTimer(this); tim->setSingleShot(true); @@ -83,7 +86,7 @@ class ButtonsWidget : public QWidget } }); } - pushbtn->setFocusPolicy(Qt::ClickFocus); + return rkw; } diff --git a/companion/src/simulation/widgets/radiowidget.cpp b/companion/src/simulation/widgets/radiowidget.cpp index ed7d826e1..0b4ca05af 100644 --- a/companion/src/simulation/widgets/radiowidget.cpp +++ b/companion/src/simulation/widgets/radiowidget.cpp @@ -181,7 +181,7 @@ void RadioWidget::onActionToggled(int index, bool active) void RadioWidget::onActionTriggered(int index, bool active) { - // do nothing + // qDebug() << "Index:" << index << "Active:" << active; } void RadioWidget::addLayout() diff --git a/companion/src/storage/appdata.cpp b/companion/src/storage/appdata.cpp index 50bf57826..64887b870 100644 --- a/companion/src/storage/appdata.cpp +++ b/companion/src/storage/appdata.cpp @@ -429,6 +429,7 @@ AppData::AppData() : qRegisterMetaTypeStreamOperators("SimulatorOptions"); qRegisterMetaTypeStreamOperators("AppData::NewModelAction"); qRegisterMetaTypeStreamOperators("AppData::UpdateCheckFreq"); + qRegisterMetaTypeStreamOperators("AppData::SimuGenericKeysPos"); CompStoreObj::addObjectMapping(propertyGroup(), this); @@ -495,7 +496,7 @@ void AppData::saveNamedJS() return; } } - + unsigned int oldestTime = namedJS[0].jsLastUsed(); int oldestN = 0; for (int i = 1; i < MAX_NAMED_JOYSTICKS; i += 1) { diff --git a/companion/src/storage/appdata.h b/companion/src/storage/appdata.h index fd55cc43b..1b57c77f0 100644 --- a/companion/src/storage/appdata.h +++ b/companion/src/storage/appdata.h @@ -37,6 +37,7 @@ #include #include #include +#include //! CPN_SETTINGS_REVISION is used to track settings changes independently of EdgeTX version. It should be reset to zero whenever settings are migrated to new COMPANY or PRODUCT. //! \note !! Increment this value if properties are removed or refactored. It will trigger a conversion/cleanup of any stored settings. \sa AppData::convertSettings() @@ -502,6 +503,7 @@ class Profile: public CompStoreObj PROPERTY(bool, telemSimEnabled, false) PROPERTY(bool, telemSimPauseOnHide, true) PROPERTY(bool, telemSimResetRssiOnStop, false) + PROPERTY(QColor, radioSimCaseColor, QColor(Qt::black)) // Firmware Variables PROPERTYSTR2(beeper, "Beeper") @@ -653,10 +655,18 @@ class AppData: public CompStoreObj }; Q_ENUM(UpdateCheckFreq) + enum SimuGenericKeysPos { + SIMU_GENERIC_KEYS_DEFAULT, + SIMU_GENERIC_KEYS_LEFT, + SIMU_GENERIC_KEYS_RIGHT + }; + Q_ENUM(SimuGenericKeysPos) + static QStringList newModelActionsList() { return { tr("None"), tr("Wizard"), tr("Editor"), tr("Template"), tr("Prompt") } ; } static QStringList updateCheckFreqsList() { return { tr("Manual"), tr("Startup"), tr("Daily"), tr("Weekly"), tr("Monthly") } ; } // refer enum QtMsgType static QStringList updateLogLevelsList() { return { tr("Debug"), tr("Warning"), tr("Critical"), tr("Fatal"), tr("Information") } ; } + static QStringList simuGenericKeysPosList() { return { tr("Default"), tr("Left"), tr("Right") } ; } explicit AppData(); void init() override; @@ -819,6 +829,9 @@ class AppData: public CompStoreObj PROPERTY(bool, simuSW, true) PROPERTY(bool, disableJoystickWarning, false) + PROPERTY(SimuGenericKeysPos, simuGenericKeysPos, SIMU_GENERIC_KEYS_DEFAULT) + PROPERTY(bool, simuScrollButtons, false) + // Message box confirmations PROPERTY(bool, confirmWriteModelsAndSettings, true) @@ -827,6 +840,7 @@ class AppData: public CompStoreObj CREATE_ENUM_FRIEND_STREAM_OPS(AppData::NewModelAction) CREATE_ENUM_FRIEND_STREAM_OPS(AppData::UpdateCheckFreq) + CREATE_ENUM_FRIEND_STREAM_OPS(AppData::SimuGenericKeysPos) }; extern AppData g;