summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Klinger2016-04-21 17:33:18 +0200
committerChristian Klinger2016-04-21 17:33:18 +0200
commit7f46c01dc06e2bc65dd3b26bd0f33683b53b2cd4 (patch)
tree4efc40cd7110ad97207d92688a8aefe4d2d913a9 /src
parent[*] Use thumbnail on vnc viewer window until connection is up (diff)
downloadpvs2-7f46c01dc06e2bc65dd3b26bd0f33683b53b2cd4.tar.gz
pvs2-7f46c01dc06e2bc65dd3b26bd0f33683b53b2cd4.tar.xz
pvs2-7f46c01dc06e2bc65dd3b26bd0f33683b53b2cd4.zip
first layout of a virtual keyboard, but no logic yet
Diffstat (limited to 'src')
-rw-r--r--src/server/numerickeyboard/numerickeyboard.cpp14
-rw-r--r--src/server/numerickeyboard/numerickeyboard.h22
-rw-r--r--src/server/sessionnamewindow/sessionnamewindow.cpp11
-rw-r--r--src/server/sessionnamewindow/sessionnamewindow.h1
4 files changed, 48 insertions, 0 deletions
diff --git a/src/server/numerickeyboard/numerickeyboard.cpp b/src/server/numerickeyboard/numerickeyboard.cpp
new file mode 100644
index 0000000..4ecf317
--- /dev/null
+++ b/src/server/numerickeyboard/numerickeyboard.cpp
@@ -0,0 +1,14 @@
+#include "src/server/numerickeyboard/numerickeyboard.h"
+#include "ui_numerickeyboard.h"
+
+NumericKeyboard::NumericKeyboard(QWidget *parent) :
+ QGroupBox(parent),
+ ui(new Ui::NumericKeyboard)
+{
+ ui->setupUi(this);
+}
+
+NumericKeyboard::~NumericKeyboard()
+{
+ delete ui;
+}
diff --git a/src/server/numerickeyboard/numerickeyboard.h b/src/server/numerickeyboard/numerickeyboard.h
new file mode 100644
index 0000000..c95c354
--- /dev/null
+++ b/src/server/numerickeyboard/numerickeyboard.h
@@ -0,0 +1,22 @@
+#ifndef NUMERICKEYBOARD_H
+#define NUMERICKEYBOARD_H
+
+#include <QGroupBox>
+
+namespace Ui {
+class NumericKeyboard;
+}
+
+class NumericKeyboard : public QGroupBox
+{
+ Q_OBJECT
+
+public:
+ explicit NumericKeyboard(QWidget *parent = 0);
+ ~NumericKeyboard();
+
+private:
+ Ui::NumericKeyboard *ui;
+};
+
+#endif // NUMERICKEYBOARD_H
diff --git a/src/server/sessionnamewindow/sessionnamewindow.cpp b/src/server/sessionnamewindow/sessionnamewindow.cpp
index f0ca532..da67c91 100644
--- a/src/server/sessionnamewindow/sessionnamewindow.cpp
+++ b/src/server/sessionnamewindow/sessionnamewindow.cpp
@@ -16,6 +16,7 @@
#include <QtGui>
#include "sessionnamewindow.h"
+#include "../numerickeyboard/numerickeyboard.h"
#include "../util/global.h"
#include "ui_sessionname.h"
@@ -29,6 +30,9 @@ SessionNameWindow::SessionNameWindow(QWidget *parent) :
connect(ui->bboxOkCancel, SIGNAL(rejected()), this, SLOT(close()));
connect(ui->cmdRandom, SIGNAL(clicked(bool)), this, SLOT(onGenerateRandomName()));
ui->lineEditName->setFocus();
+
+ initVirtualKeyboard();
+
}
SessionNameWindow::~SessionNameWindow()
@@ -67,3 +71,10 @@ void SessionNameWindow::onGenerateRandomName()
{
ui->lineEditName->setText(QString::number(qrand() % 9000 + 1000));
}
+
+void SessionNameWindow::initVirtualKeyboard() {
+ /* Just playing around here */
+ QLabel *label = new QLabel("hello world");
+ NumericKeyboard *keyboard = new NumericKeyboard();
+ ui->keyboard_placeholder->addWidget(keyboard);
+}
diff --git a/src/server/sessionnamewindow/sessionnamewindow.h b/src/server/sessionnamewindow/sessionnamewindow.h
index 761f596..077c903 100644
--- a/src/server/sessionnamewindow/sessionnamewindow.h
+++ b/src/server/sessionnamewindow/sessionnamewindow.h
@@ -14,6 +14,7 @@ class SessionNameWindow : public QDialog
private:
Ui::SessionName *ui;
+ void initVirtualKeyboard();
public:
SessionNameWindow(QWidget *parent = 0);