added "Disconnect"-Button (closes #2764).

1 files changed, 11 insertions, 2 deletions

diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp
index 964561e..64fc5dc 100644
--- a/src/client/toolbar/toolbar.cpp
+++ b/src/client/toolbar/toolbar.cpp
@@ -104,9 +104,13 @@ void Toolbar::init()
 
 	/* Setup menu */
 	_menu = new QMenu(this);
-	_acnDisconnect = new QAction(tr("Set &session ID"), this);
+	_acnConnect = new QAction(tr("&Connect..."), this);
+    _acnDisconnect = new QAction(tr("&Disconnect"), this);
+    _acnDisconnect->setEnabled(false);
 	_acnAbout= new QAction(tr("&What's this?"), this);
 	_acnQuit = new QAction(tr("&Quit"), this);
+
+    _menu->addAction(_acnConnect);
 	_menu->addAction(_acnDisconnect);
 	_menu->addSeparator();
 	_menu->addAction(_acnAbout);
@@ -116,7 +120,7 @@ void Toolbar::init()
 
 	// Connect the signals
 	connect(_menu, SIGNAL(aboutToHide()), this, SLOT(hideBar()));
-	connect(_acnDisconnect, SIGNAL(triggered()), _connectWindow, SLOT(doShow()));
+	connect(_acnConnect, SIGNAL(triggered()), _connectWindow, SLOT(doShow()));
 	connect(_acnAbout, SIGNAL(triggered()), this, SLOT(showAboutDialog()));
 	connect(_acnQuit, SIGNAL(triggered()), this, SLOT(exit()));
 
@@ -298,6 +302,8 @@ void Toolbar::onDisconnected()
  */
 void Toolbar::onConnected(ServerConnection* connection)
 {
+
+    this->_acnConnect->setEnabled(false);
 	_ui->lblStatus->setStyleSheet("color:green");
 	_ui->lblStatus->setText(tr("Online"));
 	//
@@ -322,6 +328,9 @@ void Toolbar::onDoDisconnect()
 {
 	if (_connection != NULL)
 		_connection->disconnectFromServer();
+
+    this->_acnConnect->setEnabled(true);
+    this->_acnDisconnect->setEnabled(false);
 }
 
 /***************************************************************************//**