diff options
-rw-r--r-- | gui/server_normal/numerickeyboard.ui | 107 | ||||
-rw-r--r-- | gui/server_normal/sessionname.ui | 97 | ||||
-rw-r--r-- | pvs2.files | 5 | ||||
-rw-r--r-- | pvs2.includes | 4 | ||||
-rw-r--r-- | src/server/numerickeyboard/numerickeyboard.cpp | 14 | ||||
-rw-r--r-- | src/server/numerickeyboard/numerickeyboard.h | 22 | ||||
-rw-r--r-- | src/server/sessionnamewindow/sessionnamewindow.cpp | 11 | ||||
-rw-r--r-- | src/server/sessionnamewindow/sessionnamewindow.h | 1 |
8 files changed, 201 insertions, 60 deletions
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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>NumericKeyboard</class> + <widget class="QGroupBox" name="NumericKeyboard"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>438</width> + <height>300</height> + </rect> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>300</height> + </size> + </property> + <property name="windowTitle"> + <string>GroupBox</string> + </property> + <property name="title"> + <string>Keyboard</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="3" column="0"> + <widget class="QPushButton" name="pushButton_7"> + <property name="text"> + <string>0</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QPushButton" name="pushButton_8"> + <property name="text"> + <string>Del</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>1</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QPushButton" name="pushButton_6"> + <property name="text"> + <string>8</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QPushButton" name="pushButton_4"> + <property name="text"> + <string>4</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QPushButton" name="pushButton_5"> + <property name="text"> + <string>2</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QPushButton" name="pushButton_3"> + <property name="text"> + <string>5</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QPushButton" name="pushButton_2"> + <property name="text"> + <string>7</string> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QPushButton" name="pushButton_9"> + <property name="text"> + <string>3</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="pushButton_10"> + <property name="text"> + <string>6</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QPushButton" name="pushButton_11"> + <property name="text"> + <string>9</string> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> 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 @@ <x>0</x> <y>0</y> <width>400</width> - <height>178</height> + <height>226</height> </rect> </property> <property name="sizePolicy"> @@ -22,63 +22,44 @@ <property name="windowTitle"> <string>Set session name</string> </property> - <widget class="QLabel" name="label"> - <property name="geometry"> - <rect> - <x>10</x> - <y>10</y> - <width>171</width> - <height>21</height> - </rect> - </property> - <property name="text"> - <string>New session name</string> - </property> - </widget> - <widget class="QPushButton" name="cmdRandom"> - <property name="geometry"> - <rect> - <x>210</x> - <y>80</y> - <width>181</width> - <height>27</height> - </rect> - </property> - <property name="text"> - <string>Random name</string> - </property> - </widget> - <widget class="QDialogButtonBox" name="bboxOkCancel"> - <property name="geometry"> - <rect> - <x>210</x> - <y>140</y> - <width>179</width> - <height>27</height> - </rect> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - <widget class="QLineEdit" name="lineEditName"> - <property name="geometry"> - <rect> - <x>10</x> - <y>30</y> - <width>381</width> - <height>31</height> - </rect> - </property> - <property name="font"> - <font> - <pointsize>14</pointsize> - <weight>75</weight> - <italic>true</italic> - <bold>true</bold> - </font> - </property> - </widget> + <layout class="QGridLayout" name="gridLayout"> + <item row="2" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>New session name</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="lineEditName"> + <property name="font"> + <font> + <pointsize>14</pointsize> + <weight>75</weight> + <italic>true</italic> + <bold>true</bold> + </font> + </property> + </widget> + </item> + <item row="3" column="0" rowspan="2" colspan="2"> + <layout class="QVBoxLayout" name="keyboard_placeholder"/> + </item> + <item row="5" column="1"> + <widget class="QDialogButtonBox" name="bboxOkCancel"> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QPushButton" name="cmdRandom"> + <property name="text"> + <string>Random name</string> + </property> + </widget> + </item> + </layout> </widget> <resources/> <connections/> @@ -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 <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); |