From 1a69f458b774671099cb91cd7b2fd33fda0a0a25 Mon Sep 17 00:00:00 2001 From: Xinyu Hou Date: Tue, 18 Nov 2014 15:34:50 +0000 Subject: [PATCH] Shown client name in detect dialog --- src/gui/src/AddClientDialog.cpp | 4 ++-- src/gui/src/AddClientDialog.h | 2 +- src/gui/src/ServerConfig.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/src/AddClientDialog.cpp b/src/gui/src/AddClientDialog.cpp index 661c801a..6374f8da 100644 --- a/src/gui/src/AddClientDialog.cpp +++ b/src/gui/src/AddClientDialog.cpp @@ -21,7 +21,7 @@ #include #include -AddClientDialog::AddClientDialog(QWidget *parent) : +AddClientDialog::AddClientDialog(const QString& clientName, QWidget* parent) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), Ui::AddClientDialog(), m_AddResult(kAddClientIgnore) @@ -29,7 +29,7 @@ AddClientDialog::AddClientDialog(QWidget *parent) : setupUi(this); m_pLabelHead = new QLabel(this); - m_pLabelHead->setText("Client wants to connect..."); + m_pLabelHead->setText("Client " + clientName + " wants to connect..."); gridLayout->addWidget(m_pLabelHead, 0, 1, 1, 1, Qt::AlignCenter); QIcon icon(":res/icons/64x64/video-display.png"); diff --git a/src/gui/src/AddClientDialog.h b/src/gui/src/AddClientDialog.h index a0fba00f..3a6ba50e 100644 --- a/src/gui/src/AddClientDialog.h +++ b/src/gui/src/AddClientDialog.h @@ -38,7 +38,7 @@ class AddClientDialog : public QDialog, public Ui::AddClientDialog { Q_OBJECT public: - AddClientDialog(QWidget *parent = 0); + AddClientDialog(const QString& clientName, QWidget* parent = 0); ~AddClientDialog(); int getAddResult() { return m_AddResult; } diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp index a53a1a21..26e1159d 100644 --- a/src/gui/src/ServerConfig.cpp +++ b/src/gui/src/ServerConfig.cpp @@ -372,7 +372,7 @@ bool ServerConfig::fixNoServer(const QString& name, int& index) int ServerConfig::showAddClientDialog(const QString& clientName) { - AddClientDialog addClientDialog(m_pMainWindow); + AddClientDialog addClientDialog(clientName, m_pMainWindow); addClientDialog.exec(); int result = addClientDialog.getAddResult();