add a label to the UI

diff --git a/qt/main.cpp b/qt/main.cpp
index f9ddee2eb3aa3fa9adedbdb2983c78dffcb80aab..de96e688983d15205f80e029ce81428086fa36da 100644 (file)
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -1,12 +1,8 @@
 #include "multypo.h"
 #include "multypo.h"

-#include <QApplication>

 
 

+#include <QApplication>

 #include <QDebug>
 
 #include <QDebug>
 

-#include <X11/Xlib.h>
-#include <X11/extensions/XInput2.h>
-#include <X11/Xutil.h>
-

 MultypoWindow *window;
 
 class MultypoApplication : public QApplication
 MultypoWindow *window;
 
 class MultypoApplication : public QApplication

diff --git a/qt/multypo.cpp b/qt/multypo.cpp
index 6e461e3abb35d461027bcdf3ac3e0be4897aff99..a5d81375048e331c225eeb45add07f89dfc4fab7 100644 (file)
--- a/qt/multypo.cpp
+++ b/qt/multypo.cpp
@@ -2,6 +2,8 @@
 
 #include <QX11Info>
 #include <QDebug>
 
 #include <QX11Info>
 #include <QDebug>

+#include <QHBoxLayout>
+#include <QLabel>

 
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>


@@ -11,7 +13,13 @@ MultypoWindow::MultypoWindow(QWidget *parent) :
        QWidget(parent),
        xiInited(false)
 {
        QWidget(parent),
        xiInited(false)
 {

-       
+       QHBoxLayout *layout = new QHBoxLayout(this);
+       setLayout(layout);
+
+       mainLabel = new QLabel(this);
+       layout->addWidget(mainLabel);
+
+       setMinimumSize(300, 300);

 }
 
 MultypoWindow::~MultypoWindow()
 }
 
 MultypoWindow::~MultypoWindow()


@@ -50,15 +58,12 @@ void MultypoWindow::showEvent ( QShowEvent * )
        XISelectEvents (dpy, winId(), &eventmask, 1);
 
        xiInited = true;
        XISelectEvents (dpy, winId(), &eventmask, 1);
 
        xiInited = true;

-
-       /*activateWindow();
-       raise();
-       setFocus(Qt::OtherFocusReason);*/

 }
 
 void MultypoWindow::handleKeyPress(int device, QString string)
 {
        qDebug() << "Device" << device << "String" << string;
 }
 
 void MultypoWindow::handleKeyPress(int device, QString string)
 {
        qDebug() << "Device" << device << "String" << string;

+       mainLabel->setText(QString("%1 pressed on %2").arg(string).arg(device));

 }
 
 bool MultypoWindow::handleX11Event(XEvent *event)
 }
 
 bool MultypoWindow::handleX11Event(XEvent *event)

diff --git a/qt/multypo.h b/qt/multypo.h
index 400d4c995eb848d19bbfeebf13d75d4bbbad6481..f10a5d40e947d17b2a205a2340857529eef82815 100644 (file)
--- a/qt/multypo.h
+++ b/qt/multypo.h
@@ -3,6 +3,8 @@
 
 #include <QWidget>
 
 
 #include <QWidget>
 

+class QLabel;
+

 class MultypoWindow : public QWidget
 {
        Q_OBJECT
 class MultypoWindow : public QWidget
 {
        Q_OBJECT


@@ -22,6 +24,7 @@ private:
 private:
        bool xiInited;
        int xiOpcode;
 private:
        bool xiInited;
        int xiOpcode;

+       QLabel *mainLabel;

 };
 
 #endif // MULTIKBD_H
 };
 
 #endif // MULTIKBD_H