diff --git a/companion/src/images/simulator/X9LITE/Readme.md b/companion/src/images/simulator/X9LITE/Readme.md new file mode 100644 index 000000000..46b4f4f4b --- /dev/null +++ b/companion/src/images/simulator/X9LITE/Readme.md @@ -0,0 +1,29 @@ + +# 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/bottom.png b/companion/src/images/simulator/X9LITE/bottom.png index 3f709a449..43f26ab49 100644 Binary files a/companion/src/images/simulator/X9LITE/bottom.png and b/companion/src/images/simulator/X9LITE/bottom.png differ diff --git a/companion/src/images/simulator/X9LITE/left.png b/companion/src/images/simulator/X9LITE/left.png index 4d3376c48..5d784b68c 100644 Binary files a/companion/src/images/simulator/X9LITE/left.png and b/companion/src/images/simulator/X9LITE/left.png differ diff --git a/companion/src/images/simulator/X9LITE/left_exit.png b/companion/src/images/simulator/X9LITE/left_exit.png index 0d7cd5b5b..16a7dfda9 100644 Binary files a/companion/src/images/simulator/X9LITE/left_exit.png and b/companion/src/images/simulator/X9LITE/left_exit.png differ diff --git a/companion/src/images/simulator/X9LITE/left_menu.png b/companion/src/images/simulator/X9LITE/left_menu.png index b97ba1da4..db1cbd768 100644 Binary files a/companion/src/images/simulator/X9LITE/left_menu.png and b/companion/src/images/simulator/X9LITE/left_menu.png differ diff --git a/companion/src/images/simulator/X9LITE/left_page.png b/companion/src/images/simulator/X9LITE/left_page.png index 9fd9d5b8e..bf5b3ce36 100644 Binary files a/companion/src/images/simulator/X9LITE/left_page.png and b/companion/src/images/simulator/X9LITE/left_page.png differ diff --git a/companion/src/images/simulator/X9LITE/left_scrnshot.png b/companion/src/images/simulator/X9LITE/left_scrnshot.png index c01e802de..afd46507e 100644 Binary files a/companion/src/images/simulator/X9LITE/left_scrnshot.png and b/companion/src/images/simulator/X9LITE/left_scrnshot.png differ diff --git a/companion/src/images/simulator/X9LITE/right.png b/companion/src/images/simulator/X9LITE/right.png index 73a2a1e30..fcb8efd75 100644 Binary files a/companion/src/images/simulator/X9LITE/right.png and b/companion/src/images/simulator/X9LITE/right.png differ diff --git a/companion/src/images/simulator/X9LITE/right_ent.png b/companion/src/images/simulator/X9LITE/right_ent.png index 3292fb0e5..1640129f8 100644 Binary files a/companion/src/images/simulator/X9LITE/right_ent.png and b/companion/src/images/simulator/X9LITE/right_ent.png differ diff --git a/companion/src/images/simulator/X9LITE/top.png b/companion/src/images/simulator/X9LITE/top.png index 427ee0911..bd15db2b7 100644 Binary files a/companion/src/images/simulator/X9LITE/top.png and b/companion/src/images/simulator/X9LITE/top.png differ diff --git a/companion/src/simulation/simulateduiwidgetX9LITE.cpp b/companion/src/simulation/simulateduiwidgetX9LITE.cpp index 640945bcf..6941a308d 100644 --- a/companion/src/simulation/simulateduiwidgetX9LITE.cpp +++ b/companion/src/simulation/simulateduiwidgetX9LITE.cpp @@ -8,24 +8,21 @@ SimulatedUIWidgetX9LITE::SimulatedUIWidgetX9LITE(SimulatorInterface *simulator, ui(new Ui::SimulatedUIWidgetX9LITE) { 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(0, 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), "X9LITE/left_menu.png", act)); + addRadioWidget(ui->leftbuttons->addArea(QRect(80, 20, 40, 35), "X9LITE/left_menu.png", act)); act = new RadioUiAction(3, QList() << Qt::Key_PageDown << Qt::Key_Down, SIMU_STR_HLP_KEYS_GO_DN, SIMU_STR_HLP_ACT_PAGE); - addRadioWidget(ui->leftbuttons->addArea(polygon, "X9LITE/left_page.png", act)); + addRadioWidget(ui->leftbuttons->addArea(QRect(80, 65, 40, 35), "X9LITE/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(1, 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, "X9LITE/left_exit.png", act)); + 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); @@ -34,7 +31,7 @@ SimulatedUIWidgetX9LITE::SimulatedUIWidgetX9LITE(SimulatorInterface *simulator, 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(88, 92, 33), "X9LITE/right_ent.png", m_mouseMidClickAction)); - addRadioWidget(ui->leftbuttons->addArea(QRect(9, 154, 30, 30), "X9LITE/left_scrnshot.png", m_screenshotAction)); + 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); @@ -45,10 +42,10 @@ SimulatedUIWidgetX9LITE::SimulatedUIWidgetX9LITE(SimulatorInterface *simulator, 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: 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); diff --git a/companion/src/simulation/simulateduiwidgetX9LITE.ui b/companion/src/simulation/simulateduiwidgetX9LITE.ui index 94dbaa08b..4432f8ae3 100644 --- a/companion/src/simulation/simulateduiwidgetX9LITE.ui +++ b/companion/src/simulation/simulateduiwidgetX9LITE.ui @@ -6,7 +6,7 @@ 0 0 - 570 + 650 208 @@ -18,14 +18,14 @@ - 570 - 208 + 603 + 235 - 570 - 208 + 603 + 240 @@ -60,14 +60,14 @@ - 157 - 186 + 173 + 210 - 157 - 186 + 173 + 210 @@ -85,14 +85,14 @@ - 256 - 128 + 602 + 129 - 424 - 128 + 602 + 129 @@ -110,14 +110,14 @@ - 157 - 186 + 174 + 210 - 157 - 186 + 174 + 210 @@ -135,14 +135,14 @@ - 256 - 48 + 258 + 35 - 256 - 48 + 258 + 35 @@ -160,14 +160,14 @@ - 256 - 10 + 258 + 46 - 256 - 10 + 258 + 46