Fixed client detected dialog not shown when Synergy is minimized #4307

Update locked-to-screen messages

CMakeLists.txt

@@ -17,7 +17,7 @@
 # Version number for Synergy
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 6)
-set(VERSION_REV 2)
+set(VERSION_REV 3)
 set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}")
 
 cmake_minimum_required(VERSION 2.6)

README

@@ -1,25 +1,16 @@
-About
-=====
+Synergy
+=======
 
-Synergy brings your computers together in one cohesive experience; its
-software for sharing one mouse and keyboard between multiple computers
-on your desk. It works on Windows, Mac OS X and Linux allowing you to
-seamlessly move your mouse cursor between all computers on your desk.
+Share one mouse and keyboard between multiple computers.
 
-Users
-=====
+Synergy is free and open source (free as in free speech),
+meaning you are free to run it and redistribute it with
+or without changes.
 
-Synergy is easy to download and configure.
-Get it here: http://synergy-project.org/
+Just use "hm conf" and "hm build" to compile (./hm.sh on
+Linux and Mac).
 
-Developers
-==========
+For detailed compile instructions:
+http://synergy-project.org/wiki/Compiling
 
-Synergy is free and open source, so you are free to run the program,
-change the program, and redistribute the program with or without changes.
-
-Once you've got the source code, just use "hm conf" and "hm build" to
-compile (./hm.sh on Linux and Mac).
-
-For detailed compile instructions and a list of dependencies, check
-out our wiki: http://synergy-project.org/wiki/Compiling
+Happy hacking!

src/gui/src/ServerConfig.cpp

@@ -374,13 +374,16 @@ int ServerConfig::showAddClientDialog(const QString& clientName)
 {
 	int result = kAddClientIgnore;
 
-	if (m_pMainWindow->isActiveWindow()) {
-		AddClientDialog addClientDialog(clientName, m_pMainWindow);
-		addClientDialog.exec();
-		result = addClientDialog.addResult();
-		m_IgnoreAutoConfigClient = addClientDialog.ignoreAutoConfigClient();
+	if (!m_pMainWindow->isActiveWindow()) {
+		m_pMainWindow->showNormal();
+		m_pMainWindow->activateWindow();
 	}
 
+	AddClientDialog addClientDialog(clientName, m_pMainWindow);
+	addClientDialog.exec();
+	result = addClientDialog.addResult();
+	m_IgnoreAutoConfigClient = addClientDialog.ignoreAutoConfigClient();
+
 	return result;
 }
 

src/lib/client/Client.cpp

@@ -659,7 +659,7 @@ Client::handleHello(const Event&, void*)
 {
 	SInt16 major, minor;
 	if (!ProtocolUtil::readf(m_stream, kMsgHello, &major, &minor)) {
-		sendConnectionFailedEvent("Protocol error from server");
+		sendConnectionFailedEvent("Protocol error from server, check encryption settings");
 		cleanupTimer();
 		cleanupConnection();
 		return;

src/lib/server/Server.cpp

@@ -201,7 +201,7 @@ Server::Server(
 
 	// Determine if scroll lock is already set. If so, lock the cursor to the primary screen
 	if (m_primaryClient->getToggleMask() & KeyModifierScrollLock) {
-		LOG((CLOG_DEBUG "scroll lock on initially. locked to screen"));
+		LOG((CLOG_NOTE "Scroll Lock is on, locking cursor to screen"));
 		m_lockedToScreen = true;
 	}
 
@@ -416,7 +416,7 @@ Server::isLockedToScreen() const
 {
 	// locked if we say we're locked
 	if (isLockedToScreenServer()) {
-		LOG((CLOG_NOTE "cursor is locked to screen"));
+		LOG((CLOG_NOTE "Cursor is locked to screen, check Scroll Lock key"));
 		return true;
 	}
 

src/lib/synergy/App.h

@@ -156,13 +156,15 @@ private:
 #define HELP_COMMON_INFO_1 \
 	"  -d, --debug <level>      filter out log messages with priority below level.\n" \
 	"                             level may be: FATAL, ERROR, WARNING, NOTE, INFO,\n" \
-	"                             DEBUG, DEBUGn (1-5).\n" \
+	"                             DEBUG, DEBUG1, DEBUG2.\n" \
 	"  -n, --name <screen-name> use screen-name instead the hostname to identify\n" \
 	"                             this screen in the configuration.\n" \
 	"  -1, --no-restart         do not try to restart on failure.\n" \
 	"*     --restart            restart the server automatically if it fails.\n" \
 	"  -l  --log <file>         write log messages to file.\n" \
-	"      --no-tray            disable the system tray icon.\n"
+	"      --no-tray            disable the system tray icon.\n" \
+	"      --crypto-pass <pass> enable encryption, using the given password.\n" \
+	"      --enable-drag-drop   enable file drag & drop.\n"
 
 #define HELP_COMMON_INFO_2 \
 	"  -h, --help               display this help and exit.\n" \