diff options
author | Simon Rettberg | 2015-02-02 17:00:48 +0100 |
---|---|---|
committer | Simon Rettberg | 2015-02-02 17:00:48 +0100 |
commit | 137413339f8c6e6fe18a78abedccb799e8bf5a5c (patch) | |
tree | 656537183b1e6b801b3ca1b6efe44493229f8c25 /src/client/toolbar/toolbar.cpp | |
parent | Reset debug timeouts, fix autoconnect, remove magic numbers (diff) | |
download | pvs2-137413339f8c6e6fe18a78abedccb799e8bf5a5c.tar.gz pvs2-137413339f8c6e6fe18a78abedccb799e8bf5a5c.tar.xz pvs2-137413339f8c6e6fe18a78abedccb799e8bf5a5c.zip |
Try to bring connect window to top more agressively; require c++0x instead of c++11 so it compiles on gcc 4.6
Diffstat (limited to 'src/client/toolbar/toolbar.cpp')
-rw-r--r-- | src/client/toolbar/toolbar.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp index e3859fd..9b2b668 100644 --- a/src/client/toolbar/toolbar.cpp +++ b/src/client/toolbar/toolbar.cpp @@ -27,7 +27,7 @@ * widget is deleted when its parent is deleted. */ Toolbar::Toolbar(const QByteArray sessionName, QWidget *parent) - : Toolbar(parent) + : QWidget(parent) { qDebug() << "sessionName - constructor"; _connectWindow->connectToSession(sessionName, ""); @@ -43,7 +43,7 @@ Toolbar::Toolbar(const QByteArray sessionName, QWidget *parent) * another widget, this widget becomes a child window inside parent. The new * widget is deleted when its parent is deleted. */ -Toolbar::Toolbar(const bool autoConnect, QWidget *parent) : Toolbar(parent) +Toolbar::Toolbar(const bool autoConnect, QWidget *parent) : QWidget(parent) { qDebug() << "auto - constructor!"; @@ -101,7 +101,7 @@ Toolbar::Toolbar(QWidget *parent) : // Connect the signals connect(_menu, SIGNAL(aboutToHide()), this, SLOT(hideBar())); - connect(_acnDisconnect, SIGNAL(triggered()), _connectWindow, SLOT(show())); + connect(_acnDisconnect, SIGNAL(triggered()), _connectWindow, SLOT(doShow())); connect(_acnAbout, SIGNAL(triggered()), this, SLOT(showAboutDialog())); connect(_acnQuit, SIGNAL(triggered()), qApp, SLOT(quit())); @@ -119,6 +119,7 @@ Toolbar::Toolbar(QWidget *parent) : _hideTimer.setSingleShot(true); connect(&_hideTimer, SIGNAL(timeout()), this, SLOT(hideBar())); setVisible(true); + activateWindow(); _hideTimer.start(); // initially show PVS and hide later /* Setup blink timer */ |