diff options
| author | Stefan Wildemann <gta04@metalstrolche.de> | 2017-04-05 23:28:33 +0200 |
|---|---|---|
| committer | Stefan Wildemann <gta04@metalstrolche.de> | 2017-04-05 23:28:33 +0200 |
| commit | 126578e0a283a12b0b9edef7c970354a29d23f6e (patch) | |
| tree | a967293f93a043ad544fecdc8ca8a814d3e79eae | |
| parent | f466ed624c282e30869fa1cc04f191812e0b4888 (diff) | |
| download | navit-126578e0a283a12b0b9edef7c970354a29d23f6e.tar.gz | |
Fix: Enable keyboard on graphics_qt5:QML
| -rw-r--r-- | navit/graphics/qt5/QNavitQuick.cpp | 64 | ||||
| -rw-r--r-- | navit/graphics/qt5/graphics_qt5.qml | 1 |
2 files changed, 64 insertions, 1 deletions
diff --git a/navit/graphics/qt5/QNavitQuick.cpp b/navit/graphics/qt5/QNavitQuick.cpp index 127ea2113..d2664be27 100644 --- a/navit/graphics/qt5/QNavitQuick.cpp +++ b/navit/graphics/qt5/QNavitQuick.cpp @@ -31,6 +31,7 @@ #include "debug.h" #include "window.h" #include "callback.h" +#include "keys.h" #if defined(WINDOWS) || defined(WIN32) || defined (HAVE_API_WIN32_CE) #include <windows.h> #endif @@ -95,7 +96,68 @@ void QNavitQuick::paint(QPainter *painter) void QNavitQuick::keyPressEvent(QKeyEvent *event) { - dbg(lvl_debug,"enter\n"); + dbg(lvl_debug,"enter\n"); + char key[2]; + int keycode; + char * text = NULL; + + keycode = event->key(); + key[0] = '\0'; + key[1] = '\0'; + switch (keycode) { + case Qt::Key_Up: + key[0]=NAVIT_KEY_UP; + break; + case Qt::Key_Down: + key[0]=NAVIT_KEY_DOWN; + break; + case Qt::Key_Left: + key[0]=NAVIT_KEY_LEFT; + break; + case Qt::Key_Right: + key[0]=NAVIT_KEY_RIGHT; + break; + case Qt::Key_Backspace: + key[0]=NAVIT_KEY_BACKSPACE; + break; + case Qt::Key_Tab: + key[0]=NAVIT_KEY_TAB; + break; + case Qt::Key_Delete: + key[0]=NAVIT_KEY_DELETE; + break; + case Qt::Key_Escape: + key[0]=NAVIT_KEY_BACK; + break; + case Qt::Key_Return: + case Qt::Key_Enter: + key[0]=NAVIT_KEY_RETURN; + break; + case Qt::Key_ZoomIn: + key[0]=NAVIT_KEY_ZOOM_IN; + break; + case Qt::Key_ZoomOut: + key[0]=NAVIT_KEY_ZOOM_OUT; + break; + case Qt::Key_PageUp: + key[0]=NAVIT_KEY_PAGE_UP; + break; + case Qt::Key_PageDown: + key[0]=NAVIT_KEY_PAGE_DOWN; + break; + default: + QString str=event->text(); + if((str != NULL) && (str.size() != 0)) + { + text=str.toUtf8().data(); + } + } + if(text != NULL) + callback_list_call_attr_1(graphics_priv->callbacks, attr_keypress, (void *)text); + else if (key[0]) + callback_list_call_attr_1(graphics_priv->callbacks, attr_keypress, (void *)key); + else + dbg(lvl_debug,"keyval 0x%x\n", keycode); } void QNavitQuick::keyReleaseEvent(QKeyEvent *event) diff --git a/navit/graphics/qt5/graphics_qt5.qml b/navit/graphics/qt5/graphics_qt5.qml index 3748fe520..a797c8eb9 100644 --- a/navit/graphics/qt5/graphics_qt5.qml +++ b/navit/graphics/qt5/graphics_qt5.qml @@ -7,6 +7,7 @@ Window { QNavitQuick { id: navit1 anchors.fill: parent + focus: true Component.onCompleted: { navit1.setGraphicContext(graphics_qt5_context) } |