piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Xlite simu shift working, dirty hack to get mouse wheel to do the right thing

Browse Source
This commit is contained in:
Kilrah
2018-05-22 23:09:32 +02:00
parent 31073fc0a9
commit a1de19c105
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/simulation/simulateduiwidgetXLITE.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ SimulatedUIWidgetXLITE::SimulatedUIWidgetXLITE(SimulatorInterface *simulator, QW
act = new RadioUiAction(1, QList<int>() << 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(7, QList<int>() << Qt::Key_Shift, SIMU_STR_HLP_KEY_SHIFT, SIMU_STR_HLP_ACT_SHIFT);
act = new RadioUiAction(0, QList<int>() << 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));
companion/src/simulation/simulator_strings.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <QCoreApplication>
#define SIMU_STR_HLP_KEY_ENTER QCoreApplication::translate("SimulatedUIWidget", "ENTER")
#define SIMU_STR_HLP_KEY_SHIFT QCoreApplication::translate("SimulatedUIWidget", "SHIFT")
#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")
radio/src/targets/simu/opentxsimulator.cpp
+7
View File
@@ -280,10 +280,17 @@ void OpenTxSimulator::rotaryEncoderEvent(int steps)
#else
// TODO : this should probably be handled in the GUI
int key;
#if defined(PCBXLITE)
if (steps > 0)
key = KEY_DOWN;
else if (steps < 0)
key = KEY_UP;
#else
if (steps > 0)
key = KEY_MINUS;
else if (steps < 0)
key = KEY_PLUS;
#endif
else
// Should not happen but Clang complains that key is unset otherwise
return;