From 24d67c44ea5b02c7319cde39d5b1f096ec097762 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Mon, 9 Mar 2015 23:56:36 +0400 Subject: [PATCH] MENU key shortcut was broken on Taranis since approximately forever --- companion/src/simulation/simulatordialog.cpp | 6 +++--- companion/src/simulation/xcursorwidget.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/companion/src/simulation/simulatordialog.cpp b/companion/src/simulation/simulatordialog.cpp index 158a3dc32..a3a7bdc04 100644 --- a/companion/src/simulation/simulatordialog.cpp +++ b/companion/src/simulation/simulatordialog.cpp @@ -329,7 +329,7 @@ void SimulatorDialog::keyPressEvent (QKeyEvent *event) case Qt::Key_Minus: case Qt::Key_Plus: case Qt::Key_PageDown: - case Qt::Key_Menu: + case Qt::Key_PageUp: buttonPressed = event->key(); break; } @@ -349,7 +349,7 @@ void SimulatorDialog::keyReleaseEvent(QKeyEvent * event) case Qt::Key_Plus: case Qt::Key_Minus: case Qt::Key_PageDown: - case Qt::Key_Menu: + case Qt::Key_PageUp: buttonPressed = 0; break; } @@ -837,7 +837,7 @@ void SimulatorDialogTaranis::getValues() }, { - buttonPressed == Qt::Key_Menu, + buttonPressed == Qt::Key_PageUp, buttonPressed == Qt::Key_Escape, buttonPressed == Qt::Key_Enter, buttonPressed == Qt::Key_PageDown, diff --git a/companion/src/simulation/xcursorwidget.h b/companion/src/simulation/xcursorwidget.h index 649ca035c..36c024149 100644 --- a/companion/src/simulation/xcursorwidget.h +++ b/companion/src/simulation/xcursorwidget.h @@ -47,7 +47,7 @@ class xcursorWidget : public QWidget { if (event->button()==Qt::LeftButton) { if (pnpoly(6,p1x,p1y,(float)x,(float)y)==1) { setStyleSheet("background:url(:/images/x9l1.png);"); - emit buttonPressed(Qt::Key_Menu); + emit buttonPressed(Qt::Key_PageUp); } else if (pnpoly(6,p2x,p2y,(float)x,(float)y)==1) { setStyleSheet("background:url(:/images/x9l2.png);");