diff --git a/companion/src/images/simulator/JumperTPRO/bottom.png b/companion/src/images/simulator/JumperTPRO/bottom.png index 185b5ac3606..e45c587c70e 100644 Binary files a/companion/src/images/simulator/JumperTPRO/bottom.png and b/companion/src/images/simulator/JumperTPRO/bottom.png differ diff --git a/companion/src/images/simulator/JumperTPRO/left.png b/companion/src/images/simulator/JumperTPRO/left.png index efcfb5e980d..ae0b10c72a7 100644 Binary files a/companion/src/images/simulator/JumperTPRO/left.png and b/companion/src/images/simulator/JumperTPRO/left.png differ diff --git a/companion/src/images/simulator/JumperTPRO/right.png b/companion/src/images/simulator/JumperTPRO/right.png index e30e90a9102..d26f7eea1b3 100644 Binary files a/companion/src/images/simulator/JumperTPRO/right.png and b/companion/src/images/simulator/JumperTPRO/right.png differ diff --git a/companion/src/images/simulator/JumperTPRO/top.png b/companion/src/images/simulator/JumperTPRO/top.png index 7cf5226ff5b..8b562ea19ca 100644 Binary files a/companion/src/images/simulator/JumperTPRO/top.png and b/companion/src/images/simulator/JumperTPRO/top.png differ diff --git a/companion/src/images/simulator/LR3PRO/bottom.png b/companion/src/images/simulator/LR3PRO/bottom.png index 6cf9d650de4..0835af9a1a9 100644 Binary files a/companion/src/images/simulator/LR3PRO/bottom.png and b/companion/src/images/simulator/LR3PRO/bottom.png differ diff --git a/companion/src/images/simulator/LR3PRO/top.png b/companion/src/images/simulator/LR3PRO/top.png index fad848bdf3a..a10a1fa63f5 100644 Binary files a/companion/src/images/simulator/LR3PRO/top.png and b/companion/src/images/simulator/LR3PRO/top.png differ diff --git a/companion/src/simulation/simulateduiwidgetJumperT20.cpp b/companion/src/simulation/simulateduiwidgetJumperT20.cpp index a58fcdf63a4..807b3548743 100644 --- a/companion/src/simulation/simulateduiwidgetJumperT20.cpp +++ b/companion/src/simulation/simulateduiwidgetJumperT20.cpp @@ -29,13 +29,13 @@ SimulatedUIWidgetJumperT20::SimulatedUIWidgetJumperT20(SimulatorInterface *simul 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));" + "background-color: rgb(200, 200, 200);" "}"; QTimer * tim = new QTimer(this); diff --git a/companion/src/simulation/simulateduiwidgetJumperTPRO.cpp b/companion/src/simulation/simulateduiwidgetJumperTPRO.cpp index e46c7fbada3..d61a155092f 100644 --- a/companion/src/simulation/simulateduiwidgetJumperTPRO.cpp +++ b/companion/src/simulation/simulateduiwidgetJumperTPRO.cpp @@ -1,5 +1,6 @@ #include "simulateduiwidget.h" #include "ui_simulateduiwidgetJumperTPRO.h" +#include "eeprominterface.h" // NOTE: RadioUiAction(NUMBER,...): NUMBER relates to enum EnumKeys in the specific board.h @@ -31,13 +32,15 @@ SimulatedUIWidgetJumperTPRO::SimulatedUIWidgetJumperTPRO(SimulatorInterface *sim 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: 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));" + "background-color: rgb(167, 167, 167);" "}"; QTimer * tim = new QTimer(this); diff --git a/companion/src/simulation/simulateduiwidgetJumperTPRO.ui b/companion/src/simulation/simulateduiwidgetJumperTPRO.ui index 5a77f11ffae..65e7c29c639 100644 --- a/companion/src/simulation/simulateduiwidgetJumperTPRO.ui +++ b/companion/src/simulation/simulateduiwidgetJumperTPRO.ui @@ -6,8 +6,8 @@ 0 0 - 725 - 389 + 726 + 368 @@ -18,14 +18,14 @@ - 725 - 389 + 726 + 368 - 501 - 310 + 726 + 368 @@ -50,7 +50,7 @@ 0 - + @@ -75,7 +75,7 @@ - + @@ -86,13 +86,13 @@ 256 - 231 + 128 256 - 231 + 128 @@ -100,7 +100,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -135,14 +135,14 @@ - 255 - 85 + 256 + 97 - 255 - 85 + 256 + 97 @@ -150,7 +150,7 @@ - + @@ -160,14 +160,14 @@ - 255 - 131 + 256 + 143 - 255 - 131 + 256 + 143 @@ -175,68 +175,6 @@ - - - - - 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); - - - - - - diff --git a/companion/src/simulation/simulateduiwidgetLR3PRO.cpp b/companion/src/simulation/simulateduiwidgetLR3PRO.cpp index 13030f3d3ec..9b6f162621f 100644 --- a/companion/src/simulation/simulateduiwidgetLR3PRO.cpp +++ b/companion/src/simulation/simulateduiwidgetLR3PRO.cpp @@ -37,6 +37,9 @@ SimulatedUIWidgetLR3PRO::SimulatedUIWidgetLR3PRO(SimulatorInterface *simulator, 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 {" diff --git a/companion/src/simulation/simulateduiwidgetLR3PRO.ui b/companion/src/simulation/simulateduiwidgetLR3PRO.ui index 8b0c7f64b20..0582d8f1864 100644 --- a/companion/src/simulation/simulateduiwidgetLR3PRO.ui +++ b/companion/src/simulation/simulateduiwidgetLR3PRO.ui @@ -6,8 +6,8 @@ 0 0 - 501 - 310 + 500 + 287 @@ -18,14 +18,14 @@ - 501 - 310 + 500 + 287 - 501 - 310 + 500 + 287 @@ -50,32 +50,7 @@ 0 - - - - - 0 - 0 - - - - - 122 - 287 - - - - - 122 - 287 - - - - background:url(:/images/simulator/LR3PRO/left.png); - - - - + @@ -85,14 +60,14 @@ - 800 - 150 + 256 + 128 - 800 - 150 + 256 + 128 @@ -100,7 +75,7 @@ - + @@ -125,8 +100,8 @@ - - + + 0 @@ -135,22 +110,22 @@ - 258 - 46 + 122 + 287 - 258 - 46 + 122 + 287 - background:url(:/images/simulator/LR3PRO/top.png) + background:url(:/images/simulator/LR3PRO/left.png); - + @@ -160,14 +135,14 @@ - 258 - 117 + 256 + 116 - 258 - 117 + 256 + 116 @@ -175,65 +150,28 @@ - - - - - 0 - 0 - - - - - 0 - 10 - - - - - 16777215 - 12 - - - - - 0 - 12 - - - - background-color: rgb(255, 255, 255); - - - - - - - - + + - + 0 0 - 0 - 10 + 256 + 44 - 16777215 - 10 + 256 + 44 - background-color: rgb(247, 245, 245); - - - + background:url(:/images/simulator/LR3PRO/top.png) diff --git a/companion/src/simulation/widgets/lcdwidget.cpp b/companion/src/simulation/widgets/lcdwidget.cpp index b21b03a60b3..bfbf4929035 100644 --- a/companion/src/simulation/widgets/lcdwidget.cpp +++ b/companion/src/simulation/widgets/lcdwidget.cpp @@ -40,6 +40,11 @@ void LcdWidget::setBgDefaultColor(const QColor &color) bgDefaultColor = color; } +void LcdWidget::setFgDefaultColor(const QColor &color) +{ + fgDefaultColor = color; +} + void LcdWidget::setBackgroundColor(const QColor &color) { bgColor = color; } void LcdWidget::makeScreenshot(const QString &fileName) @@ -118,7 +123,7 @@ void LcdWidget::doPaint(QPainter &p) p.eraseRect(0, 0, 2 * lcdWidth, 2 * lcdHeight); if (lcdDepth == 1) { - rgb = qRgb(0, 0, 0); + rgb = fgDefaultColor.rgb(); p.setPen(rgb); p.setBrush(QBrush(rgb)); } diff --git a/companion/src/simulation/widgets/lcdwidget.h b/companion/src/simulation/widgets/lcdwidget.h index 66cd3789d0b..249056889c0 100644 --- a/companion/src/simulation/widgets/lcdwidget.h +++ b/companion/src/simulation/widgets/lcdwidget.h @@ -46,7 +46,8 @@ class LcdWidget : public QWidget QWidget(parent), localBuf(NULL), lightEnable(false), - bgDefaultColor(QColor(198, 208, 199)) + bgDefaultColor(QColor(198, 208, 199)), + fgDefaultColor(QColor(0, 0, 0)) { } @@ -59,6 +60,7 @@ class LcdWidget : public QWidget void setData(int width, int height, int depth = 1); void setBgDefaultColor(const QColor &color); + void setFgDefaultColor(const QColor &color); void setBackgroundColor(const QColor &color); void makeScreenshot(const QString &fileName); @@ -79,6 +81,7 @@ class LcdWidget : public QWidget bool lightEnable; QColor bgColor; QColor bgDefaultColor; + QColor fgDefaultColor; QMutex lcdMtx; QElapsedTimer redrawTimer;