diff options
| author | Manuel Schneider | 2014-05-06 14:37:44 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-05-06 15:16:20 +0200 |
| commit | 35c3facc81cf10a2070cc5091e4e447ecc7416e3 (patch) | |
| tree | 0a29051637a37d419407fa266cb1d8234666f9d6 /src/client/toolbar/toolbar.cpp | |
| parent | Reduces button block time (diff) | |
| download | pvs2-35c3facc81cf10a2070cc5091e4e447ecc7416e3.tar.gz pvs2-35c3facc81cf10a2070cc5091e4e447ecc7416e3.tar.xz pvs2-35c3facc81cf10a2070cc5091e4e447ecc7416e3.zip | |
Changes the approach of Qt Gui initialization to the member pointer approach. This means multiple inheritance is avoided and the form is now a member pointer of the class. Immlicitely renamed some ui elements for clearification. Again changed unnecessary use of QDialog to QWidget.
Diffstat (limited to 'src/client/toolbar/toolbar.cpp')
| -rw-r--r-- | src/client/toolbar/toolbar.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp index 34dafd5..bce6b6e 100644 --- a/src/client/toolbar/toolbar.cpp +++ b/src/client/toolbar/toolbar.cpp @@ -5,20 +5,26 @@ * Author: sr */ -#include "toolbar.h" #include "../../shared/settings.h" #include "../net/serverconnection.h" #include "../vnc/vncwindow.h" #include "../vnc/vncserver.h" +#include "toolbar.h" +#include "ui_toolbar.h" + Toolbar::Toolbar(QWidget *parent) : - QWidget(parent), _location(POSITION_TOP_CENTER), _hideTimer(0), _connection(NULL) + QWidget(parent), _ui(new Ui::Toolbar), _location(POSITION_TOP_CENTER), + _hideTimer(0), _connection(NULL) { - setupUi(this); + // Initialize the GUI + _ui->setupUi(this); + setWindowFlags(Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint | Qt::FramelessWindowHint); setAttribute(Qt::WA_AlwaysShowToolTips); setAttribute(Qt::WA_QuitOnClose); setVisible(true); + // VNC Window _vnc = new VncWindow(NULL); // Connect window @@ -44,7 +50,7 @@ void Toolbar::setupMenu() _menu->addSeparator(); _menu->addAction(_acnQuit); - cmdMenu->setMenu(_menu); + _ui->cmdMenu->setMenu(_menu); connect(_acnQuit, SIGNAL(triggered()), this, SLOT(onQuit())); connect(_acnDisconnect, SIGNAL(triggered()), _connectWindow, SLOT(show())); @@ -55,6 +61,7 @@ Toolbar::~Toolbar() VncServer::instance()->stop(); _vnc->deleteLater(); _connectWindow->deleteLater(); + delete _ui; } //###########\\/\/ @@ -164,14 +171,14 @@ void Toolbar::onDisconnected() if (_connection != NULL) _connection->blockSignals(true); _connection = NULL; - lblStatus->setStyleSheet("color:red"); - lblStatus->setText(tr("Offline")); + _ui->lblStatus->setStyleSheet("color:red"); + _ui->lblStatus->setText(tr("Offline")); } void Toolbar::onConnected(ServerConnection* connection) { - lblStatus->setStyleSheet("color:green"); - lblStatus->setText(tr("Online")); + _ui->lblStatus->setStyleSheet("color:green"); + _ui->lblStatus->setText(tr("Online")); // if (_connection != NULL) { |