diff --git a/src/gui/res/AddClientDialogBase.ui b/src/gui/res/AddClientDialogBase.ui
index 9e01dc68..24397b4c 100644
--- a/src/gui/res/AddClientDialogBase.ui
+++ b/src/gui/res/AddClientDialogBase.ui
@@ -19,31 +19,6 @@
Dialog
-
-
-
- 50
- 320
- 341
- 20
-
-
-
-
- 0
- 0
-
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Ignore
-
-
- false
-
-
@@ -53,7 +28,82 @@
301
-
+
+ -
+
+
+ TextLabel
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+ 10
+ 320
+ 381
+ 31
+
+
+
+ -
+
+
+ Ignore auto connect clients
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Ignore
+
+
+ false
+
+
+
+
diff --git a/src/gui/src/AddClientDialog.cpp b/src/gui/src/AddClientDialog.cpp
index 6374f8da..dcfe479d 100644
--- a/src/gui/src/AddClientDialog.cpp
+++ b/src/gui/src/AddClientDialog.cpp
@@ -24,13 +24,13 @@
AddClientDialog::AddClientDialog(const QString& clientName, QWidget* parent) :
QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
Ui::AddClientDialog(),
- m_AddResult(kAddClientIgnore)
+ m_AddResult(kAddClientIgnore),
+ m_IgnoreAutoConnectClient(false)
{
setupUi(this);
- m_pLabelHead = new QLabel(this);
- m_pLabelHead->setText("Client " + clientName + " wants to connect...");
- gridLayout->addWidget(m_pLabelHead, 0, 1, 1, 1, Qt::AlignCenter);
+ m_pLabelHead->setText("A client wants to connect. "
+ "Please choose a location for " + clientName + ".");
QIcon icon(":res/icons/64x64/video-display.png");
QSize IconSize(32,32);
@@ -74,7 +74,6 @@ AddClientDialog::~AddClientDialog()
delete m_pButtonDown;
delete m_pButtonLeft;
delete m_pButtonRight;
- delete m_pLabelHead;
delete m_pLabelCenter;
}
@@ -119,3 +118,8 @@ void AddClientDialog::handleButtonAdvanced()
m_AddResult = kAddClientOther;
close();
}
+
+void AddClientDialog::on_m_pCheckBoxIgnoreClient_toggled(bool checked)
+{
+ m_IgnoreAutoConnectClient = checked;
+}
diff --git a/src/gui/src/AddClientDialog.h b/src/gui/src/AddClientDialog.h
index 3a6ba50e..2c46ad39 100644
--- a/src/gui/src/AddClientDialog.h
+++ b/src/gui/src/AddClientDialog.h
@@ -41,12 +41,14 @@ public:
AddClientDialog(const QString& clientName, QWidget* parent = 0);
~AddClientDialog();
- int getAddResult() { return m_AddResult; }
+ int addResult() { return m_AddResult; }
+ bool ignoreAutoConnectClient() { return m_IgnoreAutoConnectClient; }
protected:
void changeEvent(QEvent *e);
private slots:
+ void on_m_pCheckBoxIgnoreClient_toggled(bool checked);
void handleButtonLeft();
void handleButtonUp();
void handleButtonRight();
@@ -59,8 +61,8 @@ private:
QPushButton* m_pButtonRight;
QPushButton* m_pButtonDown;
QLabel* m_pLabelCenter;
- QLabel* m_pLabelHead;
int m_AddResult;
+ bool m_IgnoreAutoConnectClient;
};
#endif // ADDCLIENTDIALOG_H
diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp
index 26e1159d..77e27040 100644
--- a/src/gui/src/ServerConfig.cpp
+++ b/src/gui/src/ServerConfig.cpp
@@ -374,7 +374,8 @@ int ServerConfig::showAddClientDialog(const QString& clientName)
{
AddClientDialog addClientDialog(clientName, m_pMainWindow);
addClientDialog.exec();
- int result = addClientDialog.getAddResult();
+ int result = addClientDialog.addResult();
+ m_IgnoreAutoConnectClient = addClientDialog.ignoreAutoConnectClient();
return result;
}