rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Shown client name in detect dialog

This commit is contained in:
Xinyu Hou 2014-11-18 15:34:50 +00:00
parent 2aec1223ae
commit 1a69f458b7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/src/AddClientDialog.cpp
View File

@ -21,7 +21,7 @@
#include <QPushButton> #include <QPushButton>
#include <QLabel> #include <QLabel>
AddClientDialog::AddClientDialog(QWidget *parent) : AddClientDialog::AddClientDialog(const QString& clientName, QWidget* parent) :
QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
Ui::AddClientDialog(), Ui::AddClientDialog(),
m_AddResult(kAddClientIgnore) m_AddResult(kAddClientIgnore)
@ -29,7 +29,7 @@ AddClientDialog::AddClientDialog(QWidget *parent) :
setupUi(this); setupUi(this);
m_pLabelHead = new QLabel(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); gridLayout->addWidget(m_pLabelHead, 0, 1, 1, 1, Qt::AlignCenter);
QIcon icon(":res/icons/64x64/video-display.png"); QIcon icon(":res/icons/64x64/video-display.png");

2
src/gui/src/AddClientDialog.h
View File

@ -38,7 +38,7 @@ class AddClientDialog : public QDialog, public Ui::AddClientDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
AddClientDialog(QWidget *parent = 0); AddClientDialog(const QString& clientName, QWidget* parent = 0);
~AddClientDialog(); ~AddClientDialog();
int getAddResult() { return m_AddResult; } int getAddResult() { return m_AddResult; }

2
src/gui/src/ServerConfig.cpp
View File

@ -372,7 +372,7 @@ bool ServerConfig::fixNoServer(const QString& name, int& index)
int ServerConfig::showAddClientDialog(const QString& clientName) int ServerConfig::showAddClientDialog(const QString& clientName)
{ {
AddClientDialog addClientDialog(m_pMainWindow); AddClientDialog addClientDialog(clientName, m_pMainWindow);
addClientDialog.exec(); addClientDialog.exec();
int result = addClientDialog.getAddResult(); int result = addClientDialog.getAddResult();