From 7f46c01dc06e2bc65dd3b26bd0f33683b53b2cd4 Mon Sep 17 00:00:00 2001
From: Christian Klinger
Date: Thu, 21 Apr 2016 17:33:18 +0200
Subject: first layout of a virtual keyboard, but no logic yet
---
gui/server_normal/numerickeyboard.ui | 107 +++++++++++++++++++++
gui/server_normal/sessionname.ui | 97 ++++++++-----------
pvs2.files | 5 +-
pvs2.includes | 4 +-
src/server/numerickeyboard/numerickeyboard.cpp | 14 +++
src/server/numerickeyboard/numerickeyboard.h | 22 +++++
src/server/sessionnamewindow/sessionnamewindow.cpp | 11 +++
src/server/sessionnamewindow/sessionnamewindow.h | 1 +
8 files changed, 201 insertions(+), 60 deletions(-)
create mode 100644 gui/server_normal/numerickeyboard.ui
create mode 100644 src/server/numerickeyboard/numerickeyboard.cpp
create mode 100644 src/server/numerickeyboard/numerickeyboard.h
diff --git a/gui/server_normal/numerickeyboard.ui b/gui/server_normal/numerickeyboard.ui
new file mode 100644
index 0000000..155821e
--- /dev/null
+++ b/gui/server_normal/numerickeyboard.ui
@@ -0,0 +1,107 @@
+
+
+ NumericKeyboard
+
+
+
+ 0
+ 0
+ 438
+ 300
+
+
+
+
+ 0
+ 300
+
+
+
+ GroupBox
+
+
+ Keyboard
+
+
+ -
+
+
+ 0
+
+
+
+ -
+
+
+ Del
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ 8
+
+
+
+ -
+
+
+ 4
+
+
+
+ -
+
+
+ 2
+
+
+
+ -
+
+
+ 5
+
+
+
+ -
+
+
+ 7
+
+
+
+ -
+
+
+ 3
+
+
+
+ -
+
+
+ 6
+
+
+
+ -
+
+
+ 9
+
+
+
+
+
+
+
+
diff --git a/gui/server_normal/sessionname.ui b/gui/server_normal/sessionname.ui
index 2083fef..299df3d 100644
--- a/gui/server_normal/sessionname.ui
+++ b/gui/server_normal/sessionname.ui
@@ -10,7 +10,7 @@
0
0
400
- 178
+ 226
@@ -22,63 +22,44 @@
Set session name
-
-
-
- 10
- 10
- 171
- 21
-
-
-
- New session name
-
-
-
-
-
- 210
- 80
- 181
- 27
-
-
-
- Random name
-
-
-
-
-
- 210
- 140
- 179
- 27
-
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
- 10
- 30
- 381
- 31
-
-
-
-
- 14
- 75
- true
- true
-
-
-
+
+ -
+
+
+ New session name
+
+
+
+ -
+
+
+
+ 14
+ 75
+ true
+ true
+
+
+
+
+ -
+
+
+ -
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+ -
+
+
+ Random name
+
+
+
+
diff --git a/pvs2.files b/pvs2.files
index 1c0e283..599b005 100644
--- a/pvs2.files
+++ b/pvs2.files
@@ -87,4 +87,7 @@ src/shared/networkmessage.cpp
src/shared/networkmessage.h
src/shared/settings.h
src/shared/util.cpp
-src/shared/util.h
\ No newline at end of file
+src/shared/util.h
+src/server/numerickeyboard/numerickeyboard.h
+src/server/numerickeyboard/numerickeyboard.cpp
+gui/numerickeyboard.ui
diff --git a/pvs2.includes b/pvs2.includes
index 1b64a2e..0d3fb41 100644
--- a/pvs2.includes
+++ b/pvs2.includes
@@ -13,4 +13,6 @@ src/server/net
src/server/reloadroomwindow
src/server/sessionnamewindow
src/server/util
-src/shared
\ No newline at end of file
+src/shared
+gui
+src/server/numerickeyboard
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
+
+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
#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);
--
cgit v1.2.3-55-g7522