Add GUI resource files on Windows

Update icons
Update macOS icon
brahma-dev · epakai · Apr 25, 2017 · epakai · Apr 25, 2017 · Apr 25, 2017
Unified Split

Showing 1,312 changed files with 301,480 additions and 233,223 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,16 +1,25 @@
-### Operating Systems ###
+### Read before raising an issue ###
+Please only raise issue for *actual* bugs on synergy-core. For developer support topics, such as designs, compiling issues etc, please see the Core Developers forum: https://symless.com/forums/forum/19-core-developers/
 
-Client: Applesoft Windy OS 10
+### Operating Systems ###
 
 Server: microOS Tiara
+Client: Applesoft Windy OS 10
 
 **READ ME, DELETE ME**: On Windows, hold the Windows key and press 'r', type 'winver' and hit return to get your OS version. On Mac, hit the Apple menu (top left of the screen) and check 'About this Mac'. Linux users... you know what you're using ;)
 
 ### Synergy Version ###
 
 1.8.π
 
-**READ ME, DELETE ME**: Go to the 'Help' (on Windows) or 'Synergy' (on macOS) menu and then 'About Synergy' to check your version. Verify that you are using the same version across all of your machines, and that your issue still occurs with the latest release available at https://symless.com/account/login
+**READ ME, DELETE ME**: Synergy 2.x run `synergy-core --server --version` and Synergy 1.x run `synergys --version` (please do not rely on package manager versioning)
+
+**READ ME, DELETE ME**: If you are running Synergy 2.x, have a issue and are *not* running the core manually, please raise an issue with Syngery Support
+
+### Command Line ###
+
+**READ ME, DELETE ME**: How are you running Synergy? Please include all command line arguments.
+
 
 ### Steps to reproduce bug ###
 
@@ -28,4 +37,6 @@ Server: microOS Tiara
 * Is there a way to work around it? No/Yes, you can...
 * Does this bug prevent you from using Synergy entirely? Yes/No
 
+Please follow the link below to send us logs from both your server and client sides if it's appropriate. https://github.com/symless/synergy-core/wiki/Sending-logs
+
 Put anything else you can think of here.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ config.h
 .DS_Store
 *.pyc
 *.o
+*.a
 *~
 \.*.swp
 *build-gui-Desktop_Qt*
@@ -10,9 +11,6 @@ config.h
 /build
 /CMakeFiles
 /ext/cryptopp562
-/ext/gmock-1.6.0
-/ext/gtest-1.6.0
-/ext/openssl
 /src/gui/Makefile*
 /src/gui/object_script*
 /src/gui/tmp
@@ -21,3 +19,10 @@ src/gui/gui.pro.user*
 src/gui/.qmake.stash
 src/gui/.rnd
 src/setup/win32/synergy.suo
+CMakeCache.txt
+CMakeLists.txt.user
+Makefile
+cmake_install.cmake
+CMakeFiles/
+.idea
+/cmake-build-debug
diff --git a/.lvimrc b/.lvimrc
@@ -1,13 +0,0 @@
-"Instructions
-"Download vim script 411
-"http://www.vim.org/scripts/script.php?script_id=441
-"Install localvimrc.vim to .vim/plugin
-"
-" Hint: You can disable it asking before sourcing a file by adding this to
-" your .vimrc: let g:localvimrc_ask=0
-
-set nosmarttab
-set noexpandtab
-set shiftwidth=8
-set softtabstop=0
-set tabstop=4
diff --git a/Build.properties b/Build.properties
@@ -0,0 +1,7 @@
+#
+# Synergy build parameters
+#
+SYNERGY_VERSION_MAJOR = 2
+SYNERGY_VERSION_MINOR = 0
+SYNERGY_VERSION_PATCH = 10
+SYNERGY_VERSION_STAGE = snapshot