From ec4ef549bb074583af01ae287e9f11e8ea0f1adc Mon Sep 17 00:00:00 2001
From: Xinyu Hou <xinyu@synergy-project.org>
Date: Thu, 20 Nov 2014 11:37:16 +0000
Subject: [PATCH] Added ignore auto connect clients check box in dialog

---
 src/gui/res/AddClientDialogBase.ui | 102 +++++++++++++++++++++--------
 src/gui/src/AddClientDialog.cpp    |  14 ++--
 src/gui/src/AddClientDialog.h      |   6 +-
 src/gui/src/ServerConfig.cpp       |   3 +-
 4 files changed, 91 insertions(+), 34 deletions(-)

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 @@
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <widget class="QDialogButtonBox" name="m_pDialogButtonBox">
-   <property name="geometry">
-    <rect>
-     <x>50</x>
-     <y>320</y>
-     <width>341</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Ignore</set>
-   </property>
-   <property name="centerButtons">
-    <bool>false</bool>
-   </property>
-  </widget>
   <widget class="QWidget" name="gridLayoutWidget">
    <property name="geometry">
     <rect>
@@ -53,7 +28,82 @@
      <height>301</height>
     </rect>
    </property>
-   <layout class="QGridLayout" name="gridLayout"/>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="1">
+     <widget class="QLabel" name="m_pLabelHead">
+      <property name="text">
+       <string>TextLabel</string>
+      </property>
+      <property name="wordWrap">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="2">
+     <spacer name="horizontalSpacer_2">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="0" column="0">
+     <spacer name="horizontalSpacer">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="horizontalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>320</y>
+     <width>381</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <item>
+     <widget class="QCheckBox" name="m_pCheckBoxIgnoreClient">
+      <property name="text">
+       <string>Ignore auto connect clients</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QDialogButtonBox" name="m_pDialogButtonBox">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="standardButtons">
+       <set>QDialogButtonBox::Ignore</set>
+      </property>
+      <property name="centerButtons">
+       <bool>false</bool>
+      </property>
+     </widget>
+    </item>
+   </layout>
   </widget>
  </widget>
  <resources/>
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;
 }