diff options
author | Björn Hagemeister | 2014-05-19 17:30:48 +0200 |
---|---|---|
committer | Björn Hagemeister | 2014-05-19 17:30:48 +0200 |
commit | 5471fa5ac6178695b7917e44c76c0fc0f285e41a (patch) | |
tree | e2bb67b277033e5643c0b1908b9fe175d1ad49fb /src | |
parent | Commiting forgotten icon, plus first changes on help - Button implementation,... (diff) | |
download | pvs2-5471fa5ac6178695b7917e44c76c0fc0f285e41a.tar.gz pvs2-5471fa5ac6178695b7917e44c76c0fc0f285e41a.tar.xz pvs2-5471fa5ac6178695b7917e44c76c0fc0f285e41a.zip |
Help window
Diffstat (limited to 'src')
-rw-r--r-- | src/server/helpwindow/helpwindow.cpp | 29 | ||||
-rw-r--r-- | src/server/helpwindow/helpwindow.h | 28 | ||||
-rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 11 | ||||
-rw-r--r-- | src/server/mainwindow/mainwindow.h | 3 |
4 files changed, 71 insertions, 0 deletions
diff --git a/src/server/helpwindow/helpwindow.cpp b/src/server/helpwindow/helpwindow.cpp new file mode 100644 index 0000000..b209080 --- /dev/null +++ b/src/server/helpwindow/helpwindow.cpp @@ -0,0 +1,29 @@ +#include "helpwindow.h" +#include "ui_help.h" + +HelpWindow::HelpWindow(QWidget *parent) : + QDialog(parent), ui(new Ui::Help) +{ + ui->setupUi(this); + connect(ui->pushButton, SIGNAL(clicked()), this, SLOT(onButtonCancel())); +} + +HelpWindow::~HelpWindow() +{ + delete ui; +} + +/*void HelpWindow::show() +{ + this->showNormal(); +} +*/ + +/* + * Slots + */ + +void HelpWindow::onButtonCancel() +{ + this->hide(); +} diff --git a/src/server/helpwindow/helpwindow.h b/src/server/helpwindow/helpwindow.h new file mode 100644 index 0000000..9a40299 --- /dev/null +++ b/src/server/helpwindow/helpwindow.h @@ -0,0 +1,28 @@ +#ifndef HELPWINDOW_H +#define HELPWINDOW_H + +#include <QDialog> + +namespace Ui { +class Help; +} + +class HelpWindow : public QDialog +{ + Q_OBJECT + +public: + explicit HelpWindow(QWidget *parent = 0); + ~HelpWindow(); + + // void show(); + +private: + Ui::Help *ui; + + +private slots: + void onButtonCancel(); + +}; +#endif diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index ca9ecca..ce24227 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -23,6 +23,7 @@ #include "../clicklabel/clicklabel.h" #include "../sessionnamewindow/sessionnamewindow.h" #include "../connectionframe/connectionframe.h" +#include "../helpwindow/helpwindow.h" // Network #include "../net/listenserver.h" #include "../net/client.h" @@ -57,6 +58,7 @@ MainWindow::MainWindow(QString ipListUrl, QWidget* parent) : _selectedFrame = NULL; _sessionNameWindow = new SessionNameWindow(this); + _helpWindow = new HelpWindow(this); ui->setupUi(this); Global::setSessionName(); @@ -94,6 +96,7 @@ MainWindow::MainWindow(QString ipListUrl, QWidget* parent) : connect(ui->action_SetAsTutor, SIGNAL(triggered()), this, SLOT(onButtonSetAsTutor())); connect(ui->action_SetAsTutor, SIGNAL(triggered()), this, SLOT(onButtonStopProjection())); connect(ui->action_Lock, SIGNAL(toggled(bool)), this, SLOT(onButtonLock(bool))); + connect(ui->action_Help, SIGNAL(triggered()), this, SLOT(onButtonHelp())); /* Stuff for the button lock */ _buttonLockTimer = new QTimer(this); @@ -678,6 +681,14 @@ void MainWindow::prepareForProjection(Client * const from, Client * const to) } /***************************************************************************//** + * Display popup which explains possible actions about the buttons. + */ +void MainWindow::onButtonHelp() +{ + _helpWindow->show(); +} + +/***************************************************************************//** * Handle projection from tutor to all. * Get the client who is tutor and set the projectionSource of all * clients, except the tutor ones, to false. diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 5dd177d..02e9bac 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -10,6 +10,7 @@ class SessionNameWindow; class ConnectionFrame; class ListenServer; class DiscoveryListener; +class HelpWindow; namespace Ui{ class MainWindow; @@ -32,6 +33,7 @@ private: // Ui stuff Ui::MainWindow *ui; SessionNameWindow *_sessionNameWindow; + HelpWindow *_helpWindow; QLabel *_sessionNameLabel; int _tbIconSize; Qt::ToolBarArea _tbArea; @@ -91,6 +93,7 @@ protected slots: void onButtonLock(bool checked); void onButtonExit(); void onButtonSetAsTutor(); + void onButtonHelp(); void DisableButtons(); void EnableButtons(); // connection frame |