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

4 files changed, 21 insertions, 2 deletions

diff --git a/src/client/connectwindow/connectwindow.cpp b/src/client/connectwindow/connectwindow.cpp
index 6fd92e6..818cbd2 100644
--- a/src/client/connectwindow/connectwindow.cpp
+++ b/src/client/connectwindow/connectwindow.cpp
@@ -40,6 +40,7 @@ ConnectWindow::ConnectWindow(QWidget *parent) :	QWidget(parent)
 	// Set actions of buttons
 	connect(_ui->btn_connection, SIGNAL(clicked()), this, SLOT(onBtnConnection()));
 	connect(_ui->btn_hide, SIGNAL(clicked()), this, SLOT(onBtnHide()));
+    connect(_ui->btn_advanced, SIGNAL(clicked()), this, SLOT(onBtnAdvanced()));
 
 	// React on discovery signal
 	connect(&_serverDiscovery, SIGNAL(serverDetected(QString,quint16,QByteArray,QByteArray,bool)),
@@ -291,3 +292,10 @@ void ConnectWindow::onConnectionDisconnected()
 		connectToSession(_currentSession, _currentIp);
 	}
 }
+void ConnectWindow::onBtnAdvanced() {
+    if (_ui->stackedWidget->currentIndex()== 1) {
+	    _ui->stackedWidget->setCurrentIndex(0);
+    } else {
+	    _ui->stackedWidget->setCurrentIndex(1);
+    }
+}
diff --git a/src/client/connectwindow/connectwindow.h b/src/client/connectwindow/connectwindow.h
index bc8a4ba..9daa420 100644
--- a/src/client/connectwindow/connectwindow.h
+++ b/src/client/connectwindow/connectwindow.h
@@ -78,6 +78,7 @@ protected:
 protected slots:
 	void doShow();
 	void onBtnConnection();
+	void onBtnAdvanced();
 	void onBtnHide();
 
 	void onConnectionStateChange(ConnectWindow::ConnectionState state);
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);
 }
 
 /***************************************************************************//**
diff --git a/src/client/toolbar/toolbar.h b/src/client/toolbar/toolbar.h
index 27849cf..c3c727c 100644
--- a/src/client/toolbar/toolbar.h
+++ b/src/client/toolbar/toolbar.h
@@ -39,6 +39,7 @@ private:
 	Ui::Toolbar *_ui;
 	QMenu *_menu;
 	QAction *_acnDisconnect;
+	QAction *_acnConnect;
 	QAction *_acnAbout;
 	QAction *_acnQuit;
 	ConnectWindow *_connectWindow;