From d642714fe898cc78abebce32370bccd48ad3a588 Mon Sep 17 00:00:00 2001
From: XinyuHou <xinyu@synergy-project.org>
Date: Fri, 13 Feb 2015 10:14:11 +0000
Subject: [PATCH] add padlock icon when use secure connection #4313

---
 src/gui/res/MainWindowBase.ui       |  13 +++++++++++++
 src/gui/res/Synergy.qrc             |   1 +
 src/gui/res/icons/16x16/padlock.png | Bin 0 -> 450 bytes
 src/gui/src/MainWindow.cpp          |  11 +++++++++++
 4 files changed, 25 insertions(+)
 create mode 100644 src/gui/res/icons/16x16/padlock.png

diff --git a/src/gui/res/MainWindowBase.ui b/src/gui/res/MainWindowBase.ui
index cc5a9d0c..88f07b27 100644
--- a/src/gui/res/MainWindowBase.ui
+++ b/src/gui/res/MainWindowBase.ui
@@ -307,6 +307,19 @@
       <property name="sizeConstraint">
        <enum>QLayout::SetDefaultConstraint</enum>
       </property>
+      <item>
+       <widget class="QLabel" name="m_pLabelPadlock">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="pixmap">
+         <pixmap resource="Synergy.qrc">:/res/icons/16x16/padlock.png</pixmap>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QLabel" name="m_pStatusLabel">
         <property name="text">
diff --git a/src/gui/res/Synergy.qrc b/src/gui/res/Synergy.qrc
index c9054378..a7027617 100644
--- a/src/gui/res/Synergy.qrc
+++ b/src/gui/res/Synergy.qrc
@@ -52,5 +52,6 @@
         <file>lang/Languages.xml</file>
         <file>icons/16x16/money.png</file>
         <file>image/spinning-wheel.gif</file>
+        <file>icons/16x16/padlock.png</file>
     </qresource>
 </RCC>
diff --git a/src/gui/res/icons/16x16/padlock.png b/src/gui/res/icons/16x16/padlock.png
new file mode 100644
index 0000000000000000000000000000000000000000..e313e97e96215bfc299305c9976f269fc5f3561f
GIT binary patch
literal 450
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}LV!<*>-+cbFU}QxzR&CZ<-E^#
z8;%}5`ub$-<1H4y9!~u8_0r#;kN$qYeWZ!+#umlDzu#V2D*pQQ>ytf#$B!TX^<n3k
zNkYFrAHRC_>W#HhKi{mlvrXo3J@5DDlYZVRTf27ce=wL-w)8pBE`^dHzhH<6PLd%e
zM*1yKEn||myNg^Amx4Bs<B;JQ9KyiNz{J1`hAdE$1uVt{6lVlO1Pi2=je(Pan}Lgg
zhe4Xbn!%!VUP3?6Ea?*0h?3y^w370~qEv?T%rv8dymSQvJu?N3q|}l`%~f|ZCjpfe
zdb&7<RLp5TbCR#wfX6k^SyHHN+CpBI4WIwldwyP{(-l$}{%v9^m!YEsr?s-Dg3h^}
zD_aE04jmO?b&!cK_{o0c^MSqJ|B8z-p4gnZ_V1b1Cq-tJ-tTswdOdBA)A9>y7G|u~
m?A?|@T<hQ1md$4Sp*bf|RQ%7qr_(_J#o+1c=d#Wzp$Py$2)`l#

literal 0
HcmV?d00001

diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 8233eb1a..2f652a5c 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -129,6 +129,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
 	m_pComboServerList->hide();
 
 	updateEdition();
+
+	m_pLabelPadlock->hide();
 }
 
 MainWindow::~MainWindow()
@@ -726,13 +728,22 @@ void MainWindow::setSynergyState(qSynergyState state)
 	switch (state)
 	{
 	case synergyConnected: {
+		if (m_AppConfig.getCryptoEnabled()) {
+			m_pLabelPadlock->show();
+		}
+		else {
+			m_pLabelPadlock->hide();
+		}
+
 		setStatus(tr("Synergy is running."));
 		break;
 	}
 	case synergyConnecting:
+		m_pLabelPadlock->hide();
 		setStatus(tr("Synergy is starting."));
 		break;
 	case synergyDisconnected:
+		m_pLabelPadlock->hide();
 		setStatus(tr("Synergy is not running."));
 		break;
 	}