diff options
| author | Björn Hagemeister | 2014-05-07 16:34:25 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-05-07 16:34:25 +0200 |
| commit | 0a078d600e9bc673a721ca7d169874a1a70934e5 (patch) | |
| tree | 24d7b348d16652fb26a6ad5c20f933f39acbdd9e /src/client/toolbar | |
| parent | New feature: Blinking red dot in toolbar, while vnc server is started on client. (diff) | |
| parent | Made cam32.svg look like cam_off32.svg (diff) | |
| download | pvs2-0a078d600e9bc673a721ca7d169874a1a70934e5.tar.gz pvs2-0a078d600e9bc673a721ca7d169874a1a70934e5.tar.xz pvs2-0a078d600e9bc673a721ca7d169874a1a70934e5.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'src/client/toolbar')
| -rw-r--r-- | src/client/toolbar/toolbar.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp index 74f89df..5083ef9 100644 --- a/src/client/toolbar/toolbar.cpp +++ b/src/client/toolbar/toolbar.cpp @@ -33,6 +33,9 @@ Toolbar::Toolbar(QWidget *parent) : /* Create the connect window */ _connectWindow = new ConnectWindow(NULL); + // Connect the signals + connect(_connectWindow, SIGNAL(disconnect()), this, SLOT(onDoDisconnect())); + connect(_connectWindow, SIGNAL(connected(ServerConnection*)), this, SLOT(onConnected(ServerConnection*))); /* Setup menu */ _menu = new QMenu(this); @@ -42,15 +45,15 @@ Toolbar::Toolbar(QWidget *parent) : _menu->addSeparator(); _menu->addAction(_acnQuit); _ui->cmdMenu->setMenu(_menu); + // Connect the signals + connect(_menu, SIGNAL(aboutToHide()), this, SLOT(hideBar())); + connect(_acnDisconnect, SIGNAL(triggered()), _connectWindow, SLOT(show())); + connect(_acnQuit, SIGNAL(triggered()), qApp, SLOT(quit())); - /* Connect the signals */ - connect(_connectWindow, SIGNAL(disconnect()), this, SLOT(onDoDisconnect())); - connect(_connectWindow, SIGNAL(connected(ServerConnection*)), this, SLOT(onConnected(ServerConnection*))); + /* Connect the signals from vnc server */ connect(VncServer::instance(), SIGNAL(started(int, QString&, QString&)), this, SLOT(onVncServerIsRunning(int, QString&, QString&))); - connect(_acnQuit, SIGNAL(triggered()), qApp, SLOT(quit())); - connect(_acnDisconnect, SIGNAL(triggered()), _connectWindow, SLOT(show())); - /* Set location */ + /* Set position */ const QDesktopWidget desktop; const QRect primaryScreen = desktop.screenGeometry(); move(primaryScreen.left() + (primaryScreen.width() - this->width())/2 , primaryScreen.top()); |