diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index 5e96a88cbe..c3088a53ed 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -47,21 +47,32 @@ images/simulator/icons/svg/trainer-active.svg images/simulator/icons/svg/word_wrap.svg images/simulator/icons/svg/word_wrap-on.svg - images/simulator/Horus/middle.png - images/simulator/Horus/left.png - images/simulator/Horus/right.png - images/simulator/Horus/top.png - images/simulator/Horus/bottom.png - images/simulator/Horus/led.png - images/simulator/Horus/border-right.png - images/simulator/Horus/left_btn1.png - images/simulator/Horus/left_btn2.png - images/simulator/Horus/left_scrnsht.png - images/simulator/Horus/right_btnU.png - images/simulator/Horus/right_btnL.png - images/simulator/Horus/right_btnD.png - images/simulator/Horus/right_btnR.png - images/simulator/Horus/right_ent.png + 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 diff --git a/companion/src/images/simulator/X10/bottom.png b/companion/src/images/simulator/X10/bottom.png new file mode 100644 index 0000000000..887a816d9e Binary files /dev/null and b/companion/src/images/simulator/X10/bottom.png differ diff --git a/companion/src/images/simulator/X10/left.png b/companion/src/images/simulator/X10/left.png new file mode 100644 index 0000000000..6a91c0d056 Binary files /dev/null and b/companion/src/images/simulator/X10/left.png differ diff --git a/companion/src/images/simulator/X10/left_mdl.png b/companion/src/images/simulator/X10/left_mdl.png new file mode 100644 index 0000000000..7cfb21a2a6 Binary files /dev/null and b/companion/src/images/simulator/X10/left_mdl.png differ diff --git a/companion/src/images/simulator/X10/left_page.png b/companion/src/images/simulator/X10/left_page.png new file mode 100644 index 0000000000..ad0062ccf9 Binary files /dev/null and b/companion/src/images/simulator/X10/left_page.png differ diff --git a/companion/src/images/simulator/X10/left_rtn.png b/companion/src/images/simulator/X10/left_rtn.png new file mode 100644 index 0000000000..dfd42bcbb5 Binary files /dev/null and b/companion/src/images/simulator/X10/left_rtn.png differ diff --git a/companion/src/images/simulator/X10/left_scrnsht.png b/companion/src/images/simulator/X10/left_scrnsht.png new file mode 100644 index 0000000000..2930d3cb73 Binary files /dev/null and b/companion/src/images/simulator/X10/left_scrnsht.png differ diff --git a/companion/src/images/simulator/X10/left_sys.png b/companion/src/images/simulator/X10/left_sys.png new file mode 100644 index 0000000000..64e3ab4cfa Binary files /dev/null and b/companion/src/images/simulator/X10/left_sys.png differ diff --git a/companion/src/images/simulator/X10/left_tele.png b/companion/src/images/simulator/X10/left_tele.png new file mode 100644 index 0000000000..9575321c7f Binary files /dev/null and b/companion/src/images/simulator/X10/left_tele.png differ diff --git a/companion/src/images/simulator/X10/right.png b/companion/src/images/simulator/X10/right.png new file mode 100644 index 0000000000..1ca47e9413 Binary files /dev/null and b/companion/src/images/simulator/X10/right.png differ diff --git a/companion/src/images/simulator/X10/right_ent.png b/companion/src/images/simulator/X10/right_ent.png new file mode 100644 index 0000000000..480aad8df2 Binary files /dev/null and b/companion/src/images/simulator/X10/right_ent.png differ diff --git a/companion/src/images/simulator/X10/top.png b/companion/src/images/simulator/X10/top.png new file mode 100644 index 0000000000..c3b893ac11 Binary files /dev/null and b/companion/src/images/simulator/X10/top.png differ diff --git a/companion/src/images/simulator/Horus/border-right.png b/companion/src/images/simulator/X12/border-right.png similarity index 100% rename from companion/src/images/simulator/Horus/border-right.png rename to companion/src/images/simulator/X12/border-right.png diff --git a/companion/src/images/simulator/Horus/bottom.png b/companion/src/images/simulator/X12/bottom.png similarity index 100% rename from companion/src/images/simulator/Horus/bottom.png rename to companion/src/images/simulator/X12/bottom.png diff --git a/companion/src/images/simulator/Horus/led.png b/companion/src/images/simulator/X12/led.png similarity index 100% rename from companion/src/images/simulator/Horus/led.png rename to companion/src/images/simulator/X12/led.png diff --git a/companion/src/images/simulator/Horus/left.png b/companion/src/images/simulator/X12/left.png similarity index 100% rename from companion/src/images/simulator/Horus/left.png rename to companion/src/images/simulator/X12/left.png diff --git a/companion/src/images/simulator/Horus/left_btn1.png b/companion/src/images/simulator/X12/left_btn1.png similarity index 100% rename from companion/src/images/simulator/Horus/left_btn1.png rename to companion/src/images/simulator/X12/left_btn1.png diff --git a/companion/src/images/simulator/Horus/left_btn2.png b/companion/src/images/simulator/X12/left_btn2.png similarity index 100% rename from companion/src/images/simulator/Horus/left_btn2.png rename to companion/src/images/simulator/X12/left_btn2.png diff --git a/companion/src/images/simulator/Horus/left_scrnsht.png b/companion/src/images/simulator/X12/left_scrnsht.png similarity index 100% rename from companion/src/images/simulator/Horus/left_scrnsht.png rename to companion/src/images/simulator/X12/left_scrnsht.png diff --git a/companion/src/images/simulator/Horus/middle.png b/companion/src/images/simulator/X12/middle.png similarity index 100% rename from companion/src/images/simulator/Horus/middle.png rename to companion/src/images/simulator/X12/middle.png diff --git a/companion/src/images/simulator/Horus/right.png b/companion/src/images/simulator/X12/right.png similarity index 100% rename from companion/src/images/simulator/Horus/right.png rename to companion/src/images/simulator/X12/right.png diff --git a/companion/src/images/simulator/Horus/right_btnD.png b/companion/src/images/simulator/X12/right_btnD.png similarity index 100% rename from companion/src/images/simulator/Horus/right_btnD.png rename to companion/src/images/simulator/X12/right_btnD.png diff --git a/companion/src/images/simulator/Horus/right_btnL.png b/companion/src/images/simulator/X12/right_btnL.png similarity index 100% rename from companion/src/images/simulator/Horus/right_btnL.png rename to companion/src/images/simulator/X12/right_btnL.png diff --git a/companion/src/images/simulator/Horus/right_btnR.png b/companion/src/images/simulator/X12/right_btnR.png similarity index 100% rename from companion/src/images/simulator/Horus/right_btnR.png rename to companion/src/images/simulator/X12/right_btnR.png diff --git a/companion/src/images/simulator/Horus/right_btnU.png b/companion/src/images/simulator/X12/right_btnU.png similarity index 100% rename from companion/src/images/simulator/Horus/right_btnU.png rename to companion/src/images/simulator/X12/right_btnU.png diff --git a/companion/src/images/simulator/Horus/right_ent.png b/companion/src/images/simulator/X12/right_ent.png similarity index 100% rename from companion/src/images/simulator/Horus/right_ent.png rename to companion/src/images/simulator/X12/right_ent.png diff --git a/companion/src/images/simulator/Horus/top.png b/companion/src/images/simulator/X12/top.png similarity index 100% rename from companion/src/images/simulator/Horus/top.png rename to companion/src/images/simulator/X12/top.png diff --git a/companion/src/simulation/CMakeLists.txt b/companion/src/simulation/CMakeLists.txt index 210f6a44fe..48a594c40b 100644 --- a/companion/src/simulation/CMakeLists.txt +++ b/companion/src/simulation/CMakeLists.txt @@ -7,6 +7,7 @@ set(simulation_SRCS simulateduiwidgetX7.cpp simulateduiwidgetX9.cpp simulateduiwidgetX9E.cpp + simulateduiwidgetX10.cpp simulateduiwidgetX12.cpp simulatorinterface.cpp simulatormainwindow.cpp @@ -25,6 +26,7 @@ set(simulation_UIS simulateduiwidgetX7.ui simulateduiwidgetX9.ui simulateduiwidgetX9E.ui + simulateduiwidgetX10.ui simulateduiwidgetX12.ui simulatormainwindow.ui simulatorstartupdialog.ui diff --git a/companion/src/simulation/simulateduiwidget.h b/companion/src/simulation/simulateduiwidget.h index 225fb65feb..11ed5b39b4 100644 --- a/companion/src/simulation/simulateduiwidget.h +++ b/companion/src/simulation/simulateduiwidget.h @@ -107,6 +107,7 @@ namespace Ui { class SimulatedUIWidgetX7; class SimulatedUIWidgetX9; class SimulatedUIWidgetX9E; + class SimulatedUIWidgetX10; class SimulatedUIWidgetX12; } @@ -162,6 +163,18 @@ class SimulatedUIWidgetX9E: public SimulatedUIWidget Ui::SimulatedUIWidgetX9E * ui; }; +class SimulatedUIWidgetX10: public SimulatedUIWidget +{ + Q_OBJECT + + public: + explicit SimulatedUIWidgetX10(SimulatorInterface * simulator, QWidget * parent = NULL); + virtual ~SimulatedUIWidgetX10(); + + private: + Ui::SimulatedUIWidgetX10 * ui; +}; + class SimulatedUIWidgetX12: public SimulatedUIWidget { Q_OBJECT diff --git a/companion/src/simulation/simulateduiwidgetX10.cpp b/companion/src/simulation/simulateduiwidgetX10.cpp new file mode 100644 index 0000000000..838e83e2c0 --- /dev/null +++ b/companion/src/simulation/simulateduiwidgetX10.cpp @@ -0,0 +1,78 @@ +/* + * Copyright (C) OpenTX + * + * Based on code named + * 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_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(3, 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(6, 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(5, 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(4, 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(1, 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(2, 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), "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 new file mode 100644 index 0000000000..7181019757 --- /dev/null +++ b/companion/src/simulation/simulateduiwidgetX10.ui @@ -0,0 +1,197 @@ + + + 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 + 9 + + + + + 480 + 9 + + + + + 5 + + + + background:url(:/images/simulator/X10/top.png) + + + + + + + + 0 + 0 + + + + + 480 + 11 + + + + + 480 + 11 + + + + + 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 index 6511e43936..c2e0f34419 100644 --- a/companion/src/simulation/simulateduiwidgetX12.cpp +++ b/companion/src/simulation/simulateduiwidgetX12.cpp @@ -36,42 +36,42 @@ SimulatedUIWidgetX12::SimulatedUIWidgetX12(SimulatorInterface *simulator, QWidge polygon << polyArc(x, y, oR, 225, 315) << polyArc(x, y, iR, 225, 315); act = new RadioUiAction(0, QList() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP); - addRadioWidget(ui->leftbuttons->addArea(polygon, "Horus/left_btn1.png", act)); + 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(1, QList() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN); - addRadioWidget(ui->leftbuttons->addArea(polygon, "Horus/left_btn2.png", act)); + 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(3, QList() << Qt::Key_Up, SIMU_STR_HLP_KEY_UP, SIMU_STR_HLP_ACT_MDL); - addRadioWidget(ui->rightbuttons->addArea(polygon, "Horus/right_btnU.png", act)); + 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(6, QList() << Qt::Key_Left, SIMU_STR_HLP_KEY_LFT, SIMU_STR_HLP_ACT_SYS); - addRadioWidget(ui->rightbuttons->addArea(polygon, "Horus/right_btnL.png", act)); + 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(5, QList() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE); - addRadioWidget(ui->rightbuttons->addArea(polygon, "Horus/right_btnR.png", act)); + 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(4, 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, "Horus/right_btnD.png", act)); + 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(2, 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), "Horus/right_ent.png", m_mouseMidClickAction)); + addRadioWidget(ui->rightbuttons->addArea(polyArc(x, y, iR), "X12/right_ent.png", m_mouseMidClickAction)); - addRadioWidget(ui->leftbuttons->addArea(QRect(9, 259, 30, 30), "Horus/left_scrnsht.png", m_screenshotAction)); + addRadioWidget(ui->leftbuttons->addArea(QRect(9, 259, 30, 30), "X12/left_scrnsht.png", m_screenshotAction)); m_backlightColors << QColor(47, 123, 227); diff --git a/companion/src/simulation/simulateduiwidgetX12.ui b/companion/src/simulation/simulateduiwidgetX12.ui index 693f8c9bc4..2f74fad312 100644 --- a/companion/src/simulation/simulateduiwidgetX12.ui +++ b/companion/src/simulation/simulateduiwidgetX12.ui @@ -68,7 +68,7 @@ true - background:url(:/images/simulator/Horus/left.png); + background:url(:/images/simulator/X12/left.png); @@ -93,7 +93,7 @@ - background:url(:/images/simulator/Horus/led.png) + background:url(:/images/simulator/X12/led.png) @@ -123,7 +123,7 @@ - background:url(:/images/simulator/Horus/top.png) + background:url(:/images/simulator/X12/top.png) @@ -148,7 +148,7 @@ - background:url(:/images/simulator/Horus/border-right.png) + background:url(:/images/simulator/X12/border-right.png) @@ -173,7 +173,7 @@ - background:url(:/images/simulator/Horus/right.png) + background:url(:/images/simulator/X12/right.png) @@ -231,7 +231,7 @@ - background:url(:/images/simulator/Horus/bottom.png) + background:url(:/images/simulator/X12/bottom.png) diff --git a/companion/src/simulation/simulatorwidget.cpp b/companion/src/simulation/simulatorwidget.cpp index 00a481028b..0590c041ab 100644 --- a/companion/src/simulation/simulatorwidget.cpp +++ b/companion/src/simulation/simulatorwidget.cpp @@ -80,9 +80,11 @@ SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface * simulato radioUiWidget = new SimulatedUIWidgetX9E(simulator, this); break; case Board::BOARD_X12S : - case Board::BOARD_X10 : radioUiWidget = new SimulatedUIWidgetX12(simulator, this); break; + case Board::BOARD_X10 : + radioUiWidget = new SimulatedUIWidgetX10(simulator, this); + break; default: radioUiWidget = new SimulatedUIWidget9X(simulator, this); break;