graphics Qt5 keyboard (#214)R7384

* Fix: Enable keyboard on graphics_qt5:QML

* Fix: Enable keyboard on graphics_qt5:QWidget

* Fix: register the QML RRC.

To not let the resources be optimized out if you compile navit without
modules, they need to be registered on module init.

5 files changed, 136 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/QNavitWidget.cpp b/navit/graphics/qt5/QNavitWidget.cpp
index ad32c2cb7..d58f835a6 100644
--- a/navit/graphics/qt5/QNavitWidget.cpp
+++ b/navit/graphics/qt5/QNavitWidget.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
@@ -136,6 +137,73 @@ void QNavitWidget::mouseEvent(int pressed, QMouseEvent *event)
 	}
 }
 
+void QNavitWidget::keyPressEvent(QKeyEvent *event)
+{
+   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 QNavitWidget::mousePressEvent(QMouseEvent *event)
 {
 //        dbg(lvl_debug,"enter\n");
diff --git a/navit/graphics/qt5/QNavitWidget.h b/navit/graphics/qt5/QNavitWidget.h
index 3b048ccf7..727e7e130 100644
--- a/navit/graphics/qt5/QNavitWidget.h
+++ b/navit/graphics/qt5/QNavitWidget.h
@@ -17,6 +17,7 @@ public:
                              Qt::WindowFlags flags);
 protected:
         virtual bool event(QEvent *event);
+        virtual void keyPressEvent(QKeyEvent *event);
         virtual void paintEvent(QPaintEvent * event);
         virtual void resizeEvent(QResizeEvent * event);
         virtual void mouseEvent(int pressed, QMouseEvent *event);
diff --git a/navit/graphics/qt5/graphics_qt5.cpp b/navit/graphics/qt5/graphics_qt5.cpp
index c7408690d..37fda3d66 100644
--- a/navit/graphics/qt5/graphics_qt5.cpp
+++ b/navit/graphics/qt5/graphics_qt5.cpp
@@ -1003,6 +1003,9 @@ graphics_qt5_new(struct navit *nav, struct graphics_methods *meth, struct attr *
 void
 plugin_init(void)
 {
+#if USE_QML
+	 Q_INIT_RESOURCE(graphics_qt5);
+#endif
 //        dbg(lvl_debug,"enter\n");
         plugin_register_category_graphics("qt5", graphics_qt5_new);
         qt5_event_init();
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)
        }