diff options
| author | Johann Latocha | 2011-09-28 23:02:23 +0200 |
|---|---|---|
| committer | Johann Latocha | 2011-09-28 23:02:23 +0200 |
| commit | 65d9d15130d2d6798f16af011d9fefd39d36b9ce (patch) | |
| tree | d554a6ad18ee92085ba9360d0a8c20a461e4b278 /src | |
| parent | Enhancement #842 (diff) | |
| download | pvs-65d9d15130d2d6798f16af011d9fefd39d36b9ce.tar.gz pvs-65d9d15130d2d6798f16af011d9fefd39d36b9ce.tar.xz pvs-65d9d15130d2d6798f16af011d9fefd39d36b9ce.zip | |
Enhancement #843
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/mainWindow.cpp | 21 | ||||
| -rw-r--r-- | src/gui/mainWindow.h | 1 | ||||
| -rw-r--r-- | src/gui/ui/mainwindowtouch.ui | 6 |
3 files changed, 27 insertions, 1 deletions
diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp index 7e2efc3..8604bc2 100644 --- a/src/gui/mainWindow.cpp +++ b/src/gui/mainWindow.cpp @@ -18,6 +18,7 @@ #include <QFileDialog> #include <QBuffer> #include <QDataStream> +#include <QWebView> #include <src/gui/mainWindow.h> #include <src/net/mcast/McastConfiguration.h> using namespace std; @@ -204,7 +205,7 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags) : ui->actionView->setStatusTip(tr("Show the selected client in the whole window")); connect(ui->actionFoto, SIGNAL(triggered()), this, SLOT(foto())); connect(ui->actionLock, SIGNAL(triggered()), this, SLOT(lockalltoolbar())); - connect(ui->actionChat, SIGNAL(triggered()), this, SLOT(startChatDialog())); + connect(ui->actionChat, SIGNAL(triggered()),this, SLOT(startChatDialog())); ui->actionFoto->setStatusTip(tr("Make a screenshot for the selected client(s)")); ui->actionLock->setStatusTip(tr("Lock or Unlock all Clients")); connect(ui->actionCreate_profile, SIGNAL(triggered()), this, SLOT(createProfile())); @@ -243,6 +244,24 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags) : _serverSocket->listen(QHostAddress::Any, 29481); connect(_serverSocket, SIGNAL(newConnection()), this, SLOT(incomingFile())); +#ifdef MAINWINDOW_USE_TOUCHGUI + // Setup Help Dialog + QWidget *_helpDialog = new QWidget; + + QWebView *helpView = new QWebView; + helpView->load(QUrl("qrc:/help/pvsmgr_de_DE.html")); + + QPushButton *exitButton = new QPushButton("Exit"); + + QVBoxLayout *layout = new QVBoxLayout; + layout->addWidget(helpView); + layout->addWidget(exitButton); + + _helpDialog->setLayout(layout); + + connect(ui->action_Howto, SIGNAL(triggered()), _helpDialog, SLOT(show())); + connect(exitButton, SIGNAL(clicked()), _helpDialog, SLOT(close())); +#endif } MainWindow::~MainWindow() diff --git a/src/gui/mainWindow.h b/src/gui/mainWindow.h index cf618f0..f3e9f18 100644 --- a/src/gui/mainWindow.h +++ b/src/gui/mainWindow.h @@ -136,6 +136,7 @@ private: ConnectionDialog* messageDiag;*/ AboutDialog *_aboutDialog; + QWidget *_helpDialog; profileDialog *_profileDialog; QString msgDialog; diff --git a/src/gui/ui/mainwindowtouch.ui b/src/gui/ui/mainwindowtouch.ui index 5b6498d..94baeb3 100644 --- a/src/gui/ui/mainwindowtouch.ui +++ b/src/gui/ui/mainwindowtouch.ui @@ -64,6 +64,7 @@ <string>&Help</string> </property> <addaction name="action_About"/> + <addaction name="action_Howto"/> </widget> <widget class="QMenu" name="menu_View"> <property name="title"> @@ -497,6 +498,11 @@ <string>&Info</string> </property> </action> + <action name="action_Howto"> + <property name="text"> + <string>Howto</string> + </property> + </action> </widget> <resources> <include location="../../../pvsmgr.qrc"/> |