diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 1825d146..1411b057 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -10,7 +10,7 @@ Client: Applesoft Windy OS 10 1.9.π -**READ ME, DELETE ME**: Go to the 'Help' (on Windows) or 'Barrier' (on macOS) menu and then 'About Barrier' 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**: Go to the 'Help' (on Windows) or 'Barrier' (on macOS) menu and then 'About Barrier' 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://github.com/debauchee/barrier/ ### Steps to reproduce bug ### diff --git a/.gitignore b/.gitignore index 43a768cd..6bd220e4 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,4 @@ config.h src/gui/gui.pro.user* src/gui/.qmake.stash src/gui/.rnd -src/setup/win32/synergy.suo +src/setup/win32/barrier.suo diff --git a/Build.properties b/Build.properties index 75a143ab..b8b83fdb 100644 --- a/Build.properties +++ b/Build.properties @@ -1,7 +1,7 @@ # -# Synergy build parameters +# Barrier build parameters # -SYNERGY_VERSION_MAJOR = 1 -SYNERGY_VERSION_MINOR = 9 -SYNERGY_VERSION_PATCH = 0 -SYNERGY_VERSION_STAGE = snapshot +BARRIER_VERSION_MAJOR = 1 +BARRIER_VERSION_MINOR = 9 +BARRIER_VERSION_PATCH = 0 +BARRIER_VERSION_STAGE = snapshot diff --git a/CMakeLists.txt b/CMakeLists.txt index 61cb4648..05c8f22d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ -# Synergy -- mouse and keyboard sharing utility +# Barrier -- mouse and keyboard sharing utility +# Copyright (C) 2018 Debauchee Open Source Group # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -15,11 +16,11 @@ # along with this program. If not, see . cmake_minimum_required (VERSION 3.4) -project (synergy C CXX) +project (barrier C CXX) -option (SYNERGY_BUILD_LEGACY_GUI "Build the legacy GUI" ON) -option (SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON) -option (SYNERGY_BUILD_LEGACY_INSTALLER "Build the legacy installer" ON) +option (BARRIER_BUILD_LEGACY_GUI "Build the legacy GUI" ON) +option (BARRIER_BUILD_LEGACY_SERVICE "Build the legacy service (barrierd)" ON) +option (BARRIER_BUILD_LEGACY_INSTALLER "Build the legacy installer" ON) set (CMAKE_CXX_STANDARD 14) set (CMAKE_CXX_EXTENSIONS OFF) @@ -32,7 +33,7 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") endif() # -# Synergy version +# Barrier version # include (cmake/Version.cmake) @@ -44,9 +45,9 @@ endif() # Add headers to source list if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles") - set (SYNERGY_ADD_HEADERS FALSE) + set (BARRIER_ADD_HEADERS FALSE) else() - set (SYNERGY_ADD_HEADERS TRUE) + set (BARRIER_ADD_HEADERS TRUE) endif() set (libs) @@ -272,7 +273,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") /DWIN32 /D_WINDOWS /D_CRT_SECURE_NO_WARNINGS - /DSYNERGY_VERSION=\"${SYNERGY_VERSION}\" + /DBARRIER_VERSION=\"${BARRIER_VERSION}\" /D_XKEYCHECK_H ) endif() @@ -337,18 +338,18 @@ macro (configure_files srcDir destDir) endforeach (templateFile) endmacro (configure_files) -if (${SYNERGY_BUILD_LEGACY_INSTALLER}) +if (${BARRIER_BUILD_LEGACY_INSTALLER}) # # macOS app Bundle # if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set (CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks") - set (SYNERGY_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle) - set (SYNERGY_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle) - set (SYNERGY_BUNDLE_APP_DIR ${SYNERGY_BUNDLE_DIR}/Synergy.app) - set (SYNERGY_BUNDLE_BINARY_DIR ${SYNERGY_BUNDLE_APP_DIR}/Contents/MacOS) + set (BARRIER_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle) + set (BARRIER_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle) + set (BARRIER_BUNDLE_APP_DIR ${BARRIER_BUNDLE_DIR}/Barrier.app) + set (BARRIER_BUNDLE_BINARY_DIR ${BARRIER_BUNDLE_APP_DIR}/Contents/MacOS) - configure_files (${SYNERGY_BUNDLE_SOURCE_DIR} ${SYNERGY_BUNDLE_DIR}) + configure_files (${BARRIER_BUNDLE_SOURCE_DIR} ${BARRIER_BUNDLE_DIR}) endif() # @@ -364,11 +365,11 @@ endif() # if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/rpm ${CMAKE_BINARY_DIR}/rpm) - install(FILES res/synergy.svg DESTINATION share/icons/hicolor/scalable/apps) + install(FILES res/barrier.svg DESTINATION share/icons/hicolor/scalable/apps) if("${VERSION_MAJOR}" STREQUAL "2") - install(FILES res/synergy2.desktop DESTINATION share/applications) + install(FILES res/barrier2.desktop DESTINATION share/applications) else() - install(FILES res/synergy.desktop DESTINATION share/applications) + install(FILES res/barrier.desktop DESTINATION share/applications) endif() endif() diff --git a/LICENSE b/LICENSE index a96e4816..acfef1bb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,4 @@ +Copyright (C) 2018 Debauchee Open Source Group Copyright (C) 2012-2016 Symless Ltd. Copyright (C) 2008-2014 Nick Bolton Copyright (C) 2002-2014 Chris Schoeneman diff --git a/README.md b/README.md index a92eee0d..e2ecb14f 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,15 @@ Eliminate the barrier between your machines. ### What is it? -Barrier is KVM software forked from Symless's synergy 1.9 codebase. Synergy was a commercialized reimplementation of the original CosmoSynergy written by Chris Schoeneman. +Barrier is KVM software forked from Symless's barrier 1.9 codebase. Barrier was a commercialized reimplementation of the original CosmoBarrier written by Chris Schoeneman. ### What's different? -Whereas synergy has moved beyond its goals from the 1.x era, barrier aims to maintain that simplicity. Barrier will let you use your keyboard and mouse from machine A to control machine B (or more). That's it. +Whereas barrier has moved beyond its goals from the 1.x era, barrier aims to maintain that simplicity. Barrier will let you use your keyboard and mouse from machine A to control machine B (or more). That's it. ### Project goals -Hassle-free reliability. We are users, too. Barrier was created so that we could solve the issues we had with synergy and then share these fixes with other users. +Hassle-free reliability. We are users, too. Barrier was created so that we could solve the issues we had with barrier and then share these fixes with other users. Compatibility. We use more than one operating system and you probably do, too. Windows, OSX, Linux, FreeBSD... Barrier should "just work". We will also have our eye on Wayland when the time comes. diff --git a/clean_build b/clean_build new file mode 100755 index 00000000..7f5fc58e --- /dev/null +++ b/clean_build @@ -0,0 +1,8 @@ +#!/bin/sh +cd "$(dirname $0)" || exit 1 +rm -rf build +mkdir build || exit 1 +cd build || exit 1 +cmake -D CMAKE_BUILD_TYPE=Debug .. || exit 1 +make || exit 1 +echo "Build completed successfully" diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 266744e6..7deda472 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -1,90 +1,90 @@ cmake_minimum_required (VERSION 3.4) # -# Synergy Version +# Barrier Version # -if (NOT DEFINED SYNERGY_VERSION_MAJOR) - if (DEFINED ENV{SYNERGY_VERSION_MAJOR}) - set (SYNERGY_VERSION_MAJOR $ENV{SYNERGY_VERSION_MAJOR}) +if (NOT DEFINED BARRIER_VERSION_MAJOR) + if (DEFINED ENV{BARRIER_VERSION_MAJOR}) + set (BARRIER_VERSION_MAJOR $ENV{BARRIER_VERSION_MAJOR}) else() - set (SYNERGY_VERSION_MAJOR 1) + set (BARRIER_VERSION_MAJOR 1) endif() endif() -if (NOT DEFINED SYNERGY_VERSION_MINOR) - if (DEFINED ENV{SYNERGY_VERSION_MINOR}) - set (SYNERGY_VERSION_MINOR $ENV{SYNERGY_VERSION_MINOR}) +if (NOT DEFINED BARRIER_VERSION_MINOR) + if (DEFINED ENV{BARRIER_VERSION_MINOR}) + set (BARRIER_VERSION_MINOR $ENV{BARRIER_VERSION_MINOR}) else() - set (SYNERGY_VERSION_MINOR 9) + set (BARRIER_VERSION_MINOR 9) endif() endif() -if (NOT DEFINED SYNERGY_VERSION_PATCH) - if (DEFINED ENV{SYNERGY_VERSION_PATCH}) - set (SYNERGY_VERSION_PATCH $ENV{SYNERGY_VERSION_PATCH}) +if (NOT DEFINED BARRIER_VERSION_PATCH) + if (DEFINED ENV{BARRIER_VERSION_PATCH}) + set (BARRIER_VERSION_PATCH $ENV{BARRIER_VERSION_PATCH}) else() - set (SYNERGY_VERSION_PATCH 0) - message (WARNING "Synergy version wasn't set. Set to ${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}") + set (BARRIER_VERSION_PATCH 0) + message (WARNING "Barrier version wasn't set. Set to ${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}") endif() endif() -if (NOT DEFINED SYNERGY_VERSION_STAGE) - if (DEFINED ENV{SYNERGY_VERSION_STAGE}) - set (SYNERGY_VERSION_STAGE $ENV{SYNERGY_VERSION_STAGE}) +if (NOT DEFINED BARRIER_VERSION_STAGE) + if (DEFINED ENV{BARRIER_VERSION_STAGE}) + set (BARRIER_VERSION_STAGE $ENV{BARRIER_VERSION_STAGE}) else() - set (SYNERGY_VERSION_STAGE "snapshot") + set (BARRIER_VERSION_STAGE "snapshot") endif() endif() -if (NOT DEFINED SYNERGY_REVISION) +if (NOT DEFINED BARRIER_REVISION) if (DEFINED ENV{GIT_COMMIT}) - string (SUBSTRING $ENV{GIT_COMMIT} 0 8 SYNERGY_REVISION) - elseif (SYNERGY_VERSION_STAGE STREQUAL "snapshot") + string (SUBSTRING $ENV{GIT_COMMIT} 0 8 BARRIER_REVISION) + elseif (BARRIER_VERSION_STAGE STREQUAL "snapshot") execute_process ( COMMAND git rev-parse --short=8 HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE SYNERGY_REVISION + OUTPUT_VARIABLE BARRIER_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE ) endif() endif() -if (DEFINED SYNERGY_REVISION) - string(LENGTH ${SYNERGY_REVISION} SYNERGY_REVISION_LENGTH) - if (NOT ((SYNERGY_REVISION MATCHES "^[a-f0-9]+") AND (SYNERGY_REVISION_LENGTH EQUAL "8"))) - message (FATAL_ERROR "SYNERGY_REVISION ('${SYNERGY_REVISION}') should be a short commit hash") +if (DEFINED BARRIER_REVISION) + string(LENGTH ${BARRIER_REVISION} BARRIER_REVISION_LENGTH) + if (NOT ((BARRIER_REVISION MATCHES "^[a-f0-9]+") AND (BARRIER_REVISION_LENGTH EQUAL "8"))) + message (FATAL_ERROR "BARRIER_REVISION ('${BARRIER_REVISION}') should be a short commit hash") endif() - unset (SYNERGY_REVISION_LENGTH) + unset (BARRIER_REVISION_LENGTH) else() - set (SYNERGY_REVISION "0badc0de") + set (BARRIER_REVISION "0badc0de") endif() if (DEFINED ENV{BUILD_NUMBER}) - set (SYNERGY_BUILD_NUMBER $ENV{BUILD_NUMBER}) + set (BARRIER_BUILD_NUMBER $ENV{BUILD_NUMBER}) else() - set (SYNERGY_BUILD_NUMBER 1) + set (BARRIER_BUILD_NUMBER 1) endif() -string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) -set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}") +string (TIMESTAMP BARRIER_BUILD_DATE "%Y%m%d" UTC) +set (BARRIER_SNAPSHOT_INFO ".${BARRIER_VERSION_STAGE}.${BARRIER_REVISION}") -if (SYNERGY_VERSION_STAGE STREQUAL "snapshot") - set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}") +if (BARRIER_VERSION_STAGE STREQUAL "snapshot") + set (BARRIER_VERSION_TAG "${BARRIER_VERSION_STAGE}.b${BARRIER_BUILD_NUMBER}-${BARRIER_REVISION}") else() - set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}") + set (BARRIER_VERSION_TAG "${BARRIER_VERSION_STAGE}") endif() -set (SYNERGY_VERSION "${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}") -set (SYNERGY_VERSION_STRING "${SYNERGY_VERSION}-${SYNERGY_VERSION_TAG}") -message (STATUS "Full Synergy version string is '" ${SYNERGY_VERSION_STRING} "'") +set (BARRIER_VERSION "${BARRIER_VERSION_MAJOR}.${BARRIER_VERSION_MINOR}.${BARRIER_VERSION_PATCH}") +set (BARRIER_VERSION_STRING "${BARRIER_VERSION}-${BARRIER_VERSION_TAG}") +message (STATUS "Full Barrier version string is '" ${BARRIER_VERSION_STRING} "'") -add_definitions (-DSYNERGY_VERSION="${SYNERGY_VERSION}") -add_definitions (-DSYNERGY_VERSION_STRING="${SYNERGY_VERSION_STRING}") -add_definitions (-DSYNERGY_REVISION="${SYNERGY_REVISION}") -add_definitions (-DSYNERGY_BUILD_DATE="${SYNERGY_BUILD_DATE}") -add_definitions (-DSYNERGY_BUILD_NUMBER=${SYNERGY_BUILD_NUMBER}) +add_definitions (-DBARRIER_VERSION="${BARRIER_VERSION}") +add_definitions (-DBARRIER_VERSION_STRING="${BARRIER_VERSION_STRING}") +add_definitions (-DBARRIER_REVISION="${BARRIER_REVISION}") +add_definitions (-DBARRIER_BUILD_DATE="${BARRIER_BUILD_DATE}") +add_definitions (-DBARRIER_BUILD_NUMBER=${BARRIER_BUILD_NUMBER}) -if (SYNERGY_DEVELOPER_MODE) - add_definitions (-DSYNERGY_DEVELOPER_MODE=1) +if (BARRIER_DEVELOPER_MODE) + add_definitions (-DBARRIER_DEVELOPER_MODE=1) endif() diff --git a/debian/control b/debian/control index a1a79b2b..192dff01 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,17 @@ -Source: synergy +Source: barrier Section: utils Priority: optional Standards-Version: 3.9.7 -Homepage: https://www.symless.com/ -Maintainer: Symless +Homepage: https://github.com/debauchee/barrier/ +Maintainer: Debauchee Open Source Group -Package: synergy +Package: barrier Architecture: amd64 Section: utils Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} Description: Keyboard and mouse sharing solution - Synergy allows you to share one mouse and keyboard between multiple computers. + Barrier allows you to share one mouse and keyboard between multiple computers. Work seamlessly across Windows, macOS and Linux. -Homepage: https://symless.com/synergy +Homepage: https://github.com/debauchee/barrier/ diff --git a/debian/copyright b/debian/copyright index f9a5f521..d4481299 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Synergy -Source: https://www.symless.com/synergy +Upstream-Name: Barrier +Source: https://github.com/debauchee/barrier/ Disclaimer: This package is not part of the Debian project as it contains closed source proprietary components -Copyright: Copyright (C) 2012-2017 Symless Ltd +Copyright: Copyright (C) 2018 Debauchee Open Source Group diff --git a/dist/macos/bundle/Synergy.app/Contents/Info.plist.in b/dist/macos/bundle/Barrier.app/Contents/Info.plist.in similarity index 73% rename from dist/macos/bundle/Synergy.app/Contents/Info.plist.in rename to dist/macos/bundle/Barrier.app/Contents/Info.plist.in index e681046f..277963ae 100644 --- a/dist/macos/bundle/Synergy.app/Contents/Info.plist.in +++ b/dist/macos/bundle/Barrier.app/Contents/Info.plist.in @@ -4,28 +4,28 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - Synergy + Barrier CFBundleExecutable - synergy + barrier CFBundleIconFile - Synergy.icns + Barrier.icns CFBundleIdentifier - synergy + barrier CFBundleInfoDictionaryVersion 6.0 CFBundleName - Synergy + Barrier CFBundlePackageType APPL CFBundleSignature SYN1 CFBundleShortVersionString - @SYNERGY_VERSION@ + @BARRIER_VERSION@ CFBundleVersion - @SYNERGY_VERSION@ + @BARRIER_VERSION@ NSHumanReadableCopyright - © 2012-2016, Symless Ltd + © 2018 Debauchee Open Source Group LSMinimumSystemVersion 10.9.0 diff --git a/dist/macos/bundle/Synergy.app/Contents/PkgInfo b/dist/macos/bundle/Barrier.app/Contents/PkgInfo similarity index 100% rename from dist/macos/bundle/Synergy.app/Contents/PkgInfo rename to dist/macos/bundle/Barrier.app/Contents/PkgInfo diff --git a/dist/macos/bundle/Synergy.app/Contents/Resources/Synergy.icns b/dist/macos/bundle/Barrier.app/Contents/Resources/Barrier.icns similarity index 100% rename from dist/macos/bundle/Synergy.app/Contents/Resources/Synergy.icns rename to dist/macos/bundle/Barrier.app/Contents/Resources/Barrier.icns diff --git a/dist/rpm/barrier.spec.in b/dist/rpm/barrier.spec.in new file mode 100644 index 00000000..b175ded8 --- /dev/null +++ b/dist/rpm/barrier.spec.in @@ -0,0 +1,27 @@ +Name: barrier +Version: @BARRIER_VERSION@ +Summary: Keyboard and mouse sharing solution +Group: Applications/Productivity +URL: https://github.com/debauchee/barrier/ +Source: https://github.com/debauchee/barrier/ +Vendor: Debauchee +Packager: Debauchee +License: GPLv2 +Release: @BARRIER_BUILD_NUMBER@@BARRIER_SNAPSHOT_INFO@%{?dist} + +%description +Barrier allows you to share one mouse and keyboard between multiple computers. +Work seamlessly across Windows, macOS and Linux. + +%files +%defattr(755,root,root,-) +%{_bindir}/barrier +%{_bindir}/barrierc +%{_bindir}/barriers +%{_bindir}/syntool +%attr(644,-,-) %{_datarootdir}/applications/barrier.desktop +%attr(644,-,-) %{_datarootdir}/icons/hicolor/scalable/apps/barrier.svg + +%changelog +* Sat Jan 27 2018 Debauchee +- Initial version of the package diff --git a/dist/rpm/synergy.spec.in b/dist/rpm/synergy.spec.in deleted file mode 100644 index 7f1c1fe4..00000000 --- a/dist/rpm/synergy.spec.in +++ /dev/null @@ -1,27 +0,0 @@ -Name: synergy -Version: @SYNERGY_VERSION@ -Summary: Keyboard and mouse sharing solution -Group: Applications/Productivity -URL: https://symless.com/synergy -Source: https://symless.com/synergy/downloads -Vendor: Symless -Packager: Symless -License: GPLv2 -Release: @SYNERGY_BUILD_NUMBER@@SYNERGY_SNAPSHOT_INFO@%{?dist} - -%description -Synergy allows you to share one mouse and keyboard between multiple computers. -Work seamlessly across Windows, macOS and Linux. - -%files -%defattr(755,root,root,-) -%{_bindir}/synergy -%{_bindir}/synergyc -%{_bindir}/synergys -%{_bindir}/syntool -%attr(644,-,-) %{_datarootdir}/applications/synergy.desktop -%attr(644,-,-) %{_datarootdir}/icons/hicolor/scalable/apps/synergy.svg - -%changelog -* Wed Apr 26 2017 Symless -- Initial version of the package diff --git a/dist/wix/Synergy.sln b/dist/wix/Barrier.sln similarity index 88% rename from dist/wix/Synergy.sln rename to dist/wix/Barrier.sln index 81ed8811..c163c62c 100644 --- a/dist/wix/Synergy.sln +++ b/dist/wix/Barrier.sln @@ -2,7 +2,7 @@ # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Synergy", "Synergy.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Barrier", "Barrier.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/dist/wix/Synergy.wixproj b/dist/wix/Barrier.wixproj similarity index 95% rename from dist/wix/Synergy.wixproj rename to dist/wix/Barrier.wixproj index 003665ee..ffc7701f 100644 --- a/dist/wix/Synergy.wixproj +++ b/dist/wix/Barrier.wixproj @@ -4,7 +4,7 @@ 3.10 {d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17} 2.0 - Synergy + Barrier Package $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in index 94e7bd1d..de30cb9f 100644 --- a/dist/wix/Include.wxi.in +++ b/dist/wix/Include.wxi.in @@ -1,9 +1,9 @@ - - + + - + diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs index 02f23315..4923f953 100644 --- a/dist/wix/Product.wxs +++ b/dist/wix/Product.wxs @@ -23,21 +23,21 @@ - + = 602)]]> - + - + - + @@ -66,23 +66,23 @@ - - + + - - + + - + - - + + @@ -120,7 +120,7 @@ - + diff --git a/doc/MacReadme.txt b/doc/MacReadme.txt index dfa33fa9..9e194e1b 100755 --- a/doc/MacReadme.txt +++ b/doc/MacReadme.txt @@ -5,14 +5,11 @@ To install on Mac OS X with the .zip distribution (first seen in 1.3.6) you must 1. Extract the zip file to any location (usually double click will do this) 2. Open Terminal, and cd to the extracted directory (e.g. /Users/my-name/Downloads/extracted-dir/) - 3. Copy the binaries to /usr/bin using: sudo cp synergy* /usr/bin - 4. Correct the permissions and ownership: sudo chown root:wheel /usr/bin/synergy*; sudo chmod 555 /usr/bin/synergy* + 3. Copy the binaries to /usr/bin using: sudo cp barrier* /usr/bin + 4. Correct the permissions and ownership: sudo chown root:wheel /usr/bin/barrier*; sudo chmod 555 /usr/bin/barrier* Alternatively, you can copy the binaries as root. How to enable the root user in Mac OS X: http://support.apple.com/en-us/ht1528 Once the binaries have been copied to /usr/bin, you should follow the configuration guide: http://synergy2.sourceforge.net/configuration.html - -If you have any problems, see the [[Support]] page: - http://symless.com/help/ diff --git a/doc/QtCodeStyle.xml b/doc/QtCodeStyle.xml index b07d20da..e621c4f6 100644 --- a/doc/QtCodeStyle.xml +++ b/doc/QtCodeStyle.xml @@ -34,7 +34,7 @@ DisplayName - Synergy + Barrier @@ -73,7 +73,7 @@ DisplayName - Synergy + Barrier @@ -112,7 +112,7 @@ DisplayName - Synergy + Barrier @@ -151,7 +151,7 @@ DisplayName - Synergy + Barrier @@ -190,7 +190,7 @@ DisplayName - Synergy + Barrier @@ -229,6 +229,6 @@ DisplayName - Synergy + Barrier diff --git a/doc/synergy.conf.example b/doc/barrier.conf.example similarity index 95% rename from doc/synergy.conf.example rename to doc/barrier.conf.example index 2586dfaf..58158758 100644 --- a/doc/synergy.conf.example +++ b/doc/barrier.conf.example @@ -1,4 +1,4 @@ -# sample synergy configuration file +# sample barrier configuration file # # comments begin with the # character and continue to the end of # line. comments may appear anywhere the syntax permits. diff --git a/doc/synergy.conf.example-advanced b/doc/barrier.conf.example-advanced similarity index 97% rename from doc/synergy.conf.example-advanced rename to doc/barrier.conf.example-advanced index 771cf534..ad9df29f 100644 --- a/doc/synergy.conf.example-advanced +++ b/doc/barrier.conf.example-advanced @@ -1,4 +1,4 @@ -# sample synergy configuration file +# sample barrier configuration file # # comments begin with the # character and continue to the end of # line. comments may appear anywhere the syntax permits. diff --git a/doc/synergy.conf.example-basic b/doc/barrier.conf.example-basic similarity index 96% rename from doc/synergy.conf.example-basic rename to doc/barrier.conf.example-basic index 6f3c20d9..39ff6d63 100644 --- a/doc/synergy.conf.example-basic +++ b/doc/barrier.conf.example-basic @@ -1,4 +1,4 @@ -# sample synergy configuration file +# sample barrier configuration file # # comments begin with the # character and continue to the end of # line. comments may appear anywhere the syntax permits. diff --git a/doc/synergyc.man b/doc/barrierc.man similarity index 87% rename from doc/synergyc.man rename to doc/barrierc.man index de165a88..a1174c67 100644 --- a/doc/synergyc.man +++ b/doc/barrierc.man @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. -.TH SYNERGYC "1" "June 2010" "synergyc 1.5.0, protocol version 1.3" "User Commands" +.TH BARRIERC "1" "June 2010" "barrierc 1.5.0, protocol version 1.3" "User Commands" .SH NAME -synergyc \- manual page for synergyc 1.5.0, protocol version 1.3 +barrierc \- manual page for barrierc 1.5.0, protocol version 1.3 .SH SYNOPSIS -.B synergyc +.B barrierc [\fI--yscroll \fR] [\fI--daemon|--no-daemon\fR] [\fI--name \fR] [\fI--restart|--no-restart\fR] [\fI--debug \fR] \fI\fR .SH DESCRIPTION -Connect to a synergy mouse/keyboard sharing server. +Connect to a barrier mouse/keyboard sharing server. .TP \fB\-d\fR, \fB\-\-debug\fR filter out log messages with priority below level. diff --git a/doc/synergys.man b/doc/barriers.man similarity index 88% rename from doc/synergys.man rename to doc/barriers.man index 1543ffdd..64b9c385 100644 --- a/doc/synergys.man +++ b/doc/barriers.man @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. -.TH SYNERGYS "1" "June 2010" "synergys 1.5.0, protocol version 1.3" "User Commands" +.TH BARRIERS "1" "June 2010" "barriers 1.5.0, protocol version 1.3" "User Commands" .SH NAME -synergys \- manual page for synergys 1.5.0, protocol version 1.3 +barriers \- manual page for barriers 1.5.0, protocol version 1.3 .SH SYNOPSIS -.B synergys +.B barriers [\fI--address
\fR] [\fI--config \fR] [\fI--daemon|--no-daemon\fR] [\fI--name \fR] [\fI--restart|--no-restart\fR] [\fI--debug \fR] .SH DESCRIPTION -Start the synergy mouse/keyboard sharing server. +Start the barrier mouse/keyboard sharing server. .TP \fB\-a\fR, \fB\-\-address\fR
listen for clients on the given address. @@ -51,7 +51,7 @@ default port, 24800. If no configuration file pathname is provided then the first of the following to load successfully sets the configuration: .IP -$HOME/.synergy.conf -/etc/synergy.conf +$HOME/.barrier.conf +/etc/barrier.conf .SH COPYRIGHT Copyright \(co 2010 Chris Schoeneman, Nick Bolton, Sorin Sbarnea diff --git a/doc/org.synergy-foss.org.synergyc.plist b/doc/org.barrier-foss.org.barrierc.plist similarity index 68% rename from doc/org.synergy-foss.org.synergyc.plist rename to doc/org.barrier-foss.org.barrierc.plist index 385ad74b..31e10ba5 100644 --- a/doc/org.synergy-foss.org.synergyc.plist +++ b/doc/org.barrier-foss.org.barrierc.plist @@ -2,16 +2,16 @@ - + Label - org.symless.com.synergyc.plist + org.debauchee.com.barrierc.plist OnDemand ProgramArguments - /usr/bin/synergyc - + /usr/bin/barrierc + 192.168.0.2 RunAtLoad diff --git a/doc/org.synergy-foss.org.synergys.plist b/doc/org.barrier-foss.org.barriers.plist similarity index 66% rename from doc/org.synergy-foss.org.synergys.plist rename to doc/org.barrier-foss.org.barriers.plist index 116615d1..f1ab5bf9 100644 --- a/doc/org.synergy-foss.org.synergys.plist +++ b/doc/org.barrier-foss.org.barriers.plist @@ -2,19 +2,19 @@ - + Label - org.symless.com.synergys.plist + org.debauchee.com.barriers.plist OnDemand ProgramArguments - /usr/bin/synergys + /usr/bin/barriers --no-daemon --config - - /Users/snorp/.synergy.conf + + /Users/snorp/.barrier.conf RunAtLoad diff --git a/ext/gmock/build-aux/config.guess b/ext/gmock/build-aux/config.guess index e3a2116a..b3ff7e7a 100644 --- a/ext/gmock/build-aux/config.guess +++ b/ext/gmock/build-aux/config.guess @@ -461,7 +461,7 @@ EOF Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + Night_Hawk:*:*:PowerMAX_OS | Barrier:PowerMAX_OS:*:*) echo powerpc-harris-powermax exit ;; Night_Hawk:Power_UNIX:*:*) diff --git a/ext/gtest/build-aux/config.guess b/ext/gtest/build-aux/config.guess index e3a2116a..b3ff7e7a 100644 --- a/ext/gtest/build-aux/config.guess +++ b/ext/gtest/build-aux/config.guess @@ -461,7 +461,7 @@ EOF Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + Night_Hawk:*:*:PowerMAX_OS | Barrier:PowerMAX_OS:*:*) echo powerpc-harris-powermax exit ;; Night_Hawk:Power_UNIX:*:*) diff --git a/res/Readme.txt b/res/Readme.txt index e4bfb175..0b2802bd 100644 --- a/res/Readme.txt +++ b/res/Readme.txt @@ -1,12 +1,9 @@ -Thank you for chosing Synergy! -http://symless.com/ +Thank you for chosing Barrier! +https://github.com/debauchee/barrier/ -Synergy allows you to share your keyboard and mouse between computers over a network. - -For FAQ, setup, and usage instructions, please visit our online Readme: -http://symless.com/pm/projects/synergy/wiki/Readme +Barrier allows you to share your keyboard and mouse between computers over a network. Have fun! Thanks, -The Synergy Team +The Barrier Team diff --git a/res/synergy.desktop b/res/barrier.desktop similarity index 79% rename from res/synergy.desktop rename to res/barrier.desktop index fa987bdf..94422eaa 100644 --- a/res/synergy.desktop +++ b/res/barrier.desktop @@ -1,11 +1,11 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Synergy +Name=Barrier Comment=Keyboard and mouse sharing solution Path=/usr/bin -Exec=/usr/bin/synergy -Icon=synergy +Exec=/usr/bin/barrier +Icon=barrier Terminal=false Categories=Utility; Keywords=keyboard;mouse;sharing;network;share; diff --git a/res/synergy.ico b/res/barrier.ico similarity index 100% rename from res/synergy.ico rename to res/barrier.ico diff --git a/res/synergy.svg b/res/barrier.svg similarity index 100% rename from res/synergy.svg rename to res/barrier.svg diff --git a/res/synergy2.desktop b/res/barrier2.desktop similarity index 79% rename from res/synergy2.desktop rename to res/barrier2.desktop index 1a4c4948..25aaf519 100644 --- a/res/synergy2.desktop +++ b/res/barrier2.desktop @@ -1,11 +1,11 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Synergy +Name=Barrier Comment=Keyboard and mouse sharing solution Path=/usr/bin -Exec=/usr/bin/synergy2 -Icon=synergy +Exec=/usr/bin/barrier2 +Icon=barrier Terminal=false Categories=Utility; Keywords=keyboard;mouse;sharing;network;share; diff --git a/res/config.h.in b/res/config.h.in index 9a64c532..f3a72449 100644 --- a/res/config.h.in +++ b/res/config.h.in @@ -1,5 +1,5 @@ /* Define version here for Unix, but using /D for Windows. */ -#cmakedefine SYNERGY_VERSION "${SYNERGY_VERSION}" +#cmakedefine BARRIER_VERSION "${BARRIER_VERSION}" /* Define to the base type of arg 3 for `accept`. */ #cmakedefine ACCEPT_TYPE_ARG3 ${ACCEPT_TYPE_ARG3} diff --git a/res/doxygen.cfg.in b/res/doxygen.cfg.in index ed7fae71..e8233a2a 100644 --- a/res/doxygen.cfg.in +++ b/res/doxygen.cfg.in @@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = "Synergy" +PROJECT_NAME = "Barrier" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/res/openssl/synergy.conf b/res/openssl/barrier.conf similarity index 97% rename from res/openssl/synergy.conf rename to res/openssl/barrier.conf index c7a3e439..84325c66 100644 --- a/res/openssl/synergy.conf +++ b/res/openssl/barrier.conf @@ -1,5 +1,5 @@ # -# Synergy OpenSSL configuration file. +# Barrier OpenSSL configuration file. # Used for generation of certificate requests. # diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ab63a066..911fef3c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2011 Nick Bolton # @@ -19,6 +19,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib) add_subdirectory(lib) add_subdirectory(cmd) -if (SYNERGY_BUILD_LEGACY_GUI) +if (BARRIER_BUILD_LEGACY_GUI) add_subdirectory(gui) -endif (SYNERGY_BUILD_LEGACY_GUI) +endif (BARRIER_BUILD_LEGACY_GUI) diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index 9fbd7075..0c6d1a92 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2011 Nick Bolton # @@ -14,11 +14,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -add_subdirectory(synergyc) -add_subdirectory(synergys) +add_subdirectory(barrierc) +add_subdirectory(barriers) add_subdirectory(syntool) -if (SYNERGY_BUILD_LEGACY_SERVICE) - add_subdirectory(synergyd) -endif (SYNERGY_BUILD_LEGACY_SERVICE) +if (BARRIER_BUILD_LEGACY_SERVICE) + add_subdirectory(barrierd) +endif (BARRIER_BUILD_LEGACY_SERVICE) diff --git a/src/cmd/synergyc/.gitignore b/src/cmd/barrierc/.gitignore similarity index 100% rename from src/cmd/synergyc/.gitignore rename to src/cmd/barrierc/.gitignore diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/barrierc/CMakeLists.txt similarity index 82% rename from src/cmd/synergyc/CMakeLists.txt rename to src/cmd/barrierc/CMakeLists.txt index ed44ff69..92276d22 100644 --- a/src/cmd/synergyc/CMakeLists.txt +++ b/src/cmd/barrierc/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -15,7 +15,7 @@ # along with this program. If not, see . set(sources - synergyc.cpp + barrierc.cpp ) if (WIN32) @@ -23,8 +23,8 @@ if (WIN32) file(GLOB arch_sources "MSWindows*.cpp") list(APPEND sources resource.h - synergyc.ico - synergyc.rc + barrierc.ico + barrierc.rc tb_error.ico tb_idle.ico tb_run.ico @@ -41,17 +41,17 @@ endif() list(APPEND sources ${arch_sources}) list(APPEND headers ${arch_headers}) -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() -add_executable(synergyc ${sources}) -target_link_libraries(synergyc +add_executable(barrierc ${sources}) +target_link_libraries(barrierc arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS}) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - install (TARGETS synergyc DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) + install (TARGETS barrierc DESTINATION ${BARRIER_BUNDLE_BINARY_DIR}) elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - install (TARGETS synergyc DESTINATION bin) + install (TARGETS barrierc DESTINATION bin) endif() diff --git a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp b/src/cmd/barrierc/MSWindowsClientTaskBarReceiver.cpp similarity index 98% rename from src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp rename to src/cmd/barrierc/MSWindowsClientTaskBarReceiver.cpp index 05af63a5..8d17900c 100644 --- a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp +++ b/src/cmd/barrierc/MSWindowsClientTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -363,11 +363,11 @@ createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events { ArchMiscWindows::setIcons( (HICON)LoadImage(ArchMiscWindows::instanceWin32(), - MAKEINTRESOURCE(IDI_SYNERGY), + MAKEINTRESOURCE(IDI_BARRIER), IMAGE_ICON, 32, 32, LR_SHARED), (HICON)LoadImage(ArchMiscWindows::instanceWin32(), - MAKEINTRESOURCE(IDI_SYNERGY), + MAKEINTRESOURCE(IDI_BARRIER), IMAGE_ICON, 16, 16, LR_SHARED)); diff --git a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h b/src/cmd/barrierc/MSWindowsClientTaskBarReceiver.h similarity index 95% rename from src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h rename to src/cmd/barrierc/MSWindowsClientTaskBarReceiver.h index 0fa3c8fa..91688e8d 100644 --- a/src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h +++ b/src/cmd/barrierc/MSWindowsClientTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/ClientTaskBarReceiver.h" +#include "barrier/ClientTaskBarReceiver.h" #define WIN32_LEAN_AND_MEAN #include diff --git a/src/cmd/synergyc/OSXClientTaskBarReceiver.cpp b/src/cmd/barrierc/OSXClientTaskBarReceiver.cpp similarity index 96% rename from src/cmd/synergyc/OSXClientTaskBarReceiver.cpp rename to src/cmd/barrierc/OSXClientTaskBarReceiver.cpp index 488698ba..7e79991b 100644 --- a/src/cmd/synergyc/OSXClientTaskBarReceiver.cpp +++ b/src/cmd/barrierc/OSXClientTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/cmd/synergyc/OSXClientTaskBarReceiver.h b/src/cmd/barrierc/OSXClientTaskBarReceiver.h similarity index 92% rename from src/cmd/synergyc/OSXClientTaskBarReceiver.h rename to src/cmd/barrierc/OSXClientTaskBarReceiver.h index a24856f8..fcc763a3 100644 --- a/src/cmd/synergyc/OSXClientTaskBarReceiver.h +++ b/src/cmd/barrierc/OSXClientTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/ClientTaskBarReceiver.h" +#include "barrier/ClientTaskBarReceiver.h" class BufferedLogOutputter; class IEventQueue; diff --git a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp b/src/cmd/barrierc/XWindowsClientTaskBarReceiver.cpp similarity index 97% rename from src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp rename to src/cmd/barrierc/XWindowsClientTaskBarReceiver.cpp index 20001360..f56481c3 100644 --- a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp +++ b/src/cmd/barrierc/XWindowsClientTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * diff --git a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.h b/src/cmd/barrierc/XWindowsClientTaskBarReceiver.h similarity index 93% rename from src/cmd/synergyc/XWindowsClientTaskBarReceiver.h rename to src/cmd/barrierc/XWindowsClientTaskBarReceiver.h index fe87a706..73250d0a 100644 --- a/src/cmd/synergyc/XWindowsClientTaskBarReceiver.h +++ b/src/cmd/barrierc/XWindowsClientTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/ClientTaskBarReceiver.h" +#include "barrier/ClientTaskBarReceiver.h" class BufferedLogOutputter; class IEventQueue; diff --git a/src/cmd/synergyc/synergyc.cpp b/src/cmd/barrierc/barrierc.cpp similarity index 94% rename from src/cmd/synergyc/synergyc.cpp rename to src/cmd/barrierc/barrierc.cpp index 5d598add..d52dd7c0 100644 --- a/src/cmd/synergyc/synergyc.cpp +++ b/src/cmd/barrierc/barrierc.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/ClientApp.h" +#include "barrier/ClientApp.h" #include "arch/Arch.h" #include "base/Log.h" #include "base/EventQueue.h" diff --git a/src/cmd/synergyc/synergyc.ico b/src/cmd/barrierc/barrierc.ico similarity index 100% rename from src/cmd/synergyc/synergyc.ico rename to src/cmd/barrierc/barrierc.ico diff --git a/src/cmd/synergyc/synergyc.rc b/src/cmd/barrierc/barrierc.rc similarity index 94% rename from src/cmd/synergyc/synergyc.rc rename to src/cmd/barrierc/barrierc.rc index 7f2a5dc1..b34127c5 100644 --- a/src/cmd/synergyc/synergyc.rc +++ b/src/cmd/barrierc/barrierc.rc @@ -57,7 +57,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_SYNERGY ICON DISCARDABLE "synergyc.ico" +IDI_BARRIER ICON DISCARDABLE "barrierc.ico" IDI_TASKBAR_NOT_RUNNING ICON DISCARDABLE "tb_idle.ico" IDI_TASKBAR_NOT_WORKING ICON DISCARDABLE "tb_error.ico" IDI_TASKBAR_NOT_CONNECTED ICON DISCARDABLE "tb_wait.ico" @@ -84,7 +84,7 @@ END IDR_TASKBAR MENU DISCARDABLE BEGIN - POPUP "Synergy" + POPUP "Barrier" BEGIN MENUITEM "Show Status", IDC_TASKBAR_STATUS MENUITEM "Show Log", IDC_TASKBAR_SHOW_LOG @@ -119,8 +119,8 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_FAILED "Synergy is about to quit with errors or warnings. Please check the log then click OK." - IDS_INIT_FAILED "Synergy failed to initialize: %{1}" + IDS_FAILED "Barrier is about to quit with errors or warnings. Please check the log then click OK." + IDS_INIT_FAILED "Barrier failed to initialize: %{1}" IDS_UNCAUGHT_EXCEPTION "Uncaught exception: %{1}" END diff --git a/src/cmd/synergyc/resource.h b/src/cmd/barrierc/resource.h similarity index 95% rename from src/cmd/synergyc/resource.h rename to src/cmd/barrierc/resource.h index eeee6e1e..57b271e7 100644 --- a/src/cmd/synergyc/resource.h +++ b/src/cmd/barrierc/resource.h @@ -1,11 +1,11 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by synergyc.rc +// Used by barrierc.rc // #define IDS_FAILED 1 #define IDS_INIT_FAILED 2 #define IDS_UNCAUGHT_EXCEPTION 3 -#define IDI_SYNERGY 101 +#define IDI_BARRIER 101 #define IDI_TASKBAR_NOT_RUNNING 102 #define IDI_TASKBAR_NOT_WORKING 103 #define IDI_TASKBAR_NOT_CONNECTED 104 diff --git a/src/cmd/synergyc/tb_error.ico b/src/cmd/barrierc/tb_error.ico similarity index 100% rename from src/cmd/synergyc/tb_error.ico rename to src/cmd/barrierc/tb_error.ico diff --git a/src/cmd/synergyc/tb_idle.ico b/src/cmd/barrierc/tb_idle.ico similarity index 100% rename from src/cmd/synergyc/tb_idle.ico rename to src/cmd/barrierc/tb_idle.ico diff --git a/src/cmd/synergyc/tb_run.ico b/src/cmd/barrierc/tb_run.ico similarity index 100% rename from src/cmd/synergyc/tb_run.ico rename to src/cmd/barrierc/tb_run.ico diff --git a/src/cmd/synergyc/tb_wait.ico b/src/cmd/barrierc/tb_wait.ico similarity index 100% rename from src/cmd/synergyc/tb_wait.ico rename to src/cmd/barrierc/tb_wait.ico diff --git a/src/cmd/synergyd/CMakeLists.txt b/src/cmd/barrierd/CMakeLists.txt similarity index 83% rename from src/cmd/synergyd/CMakeLists.txt rename to src/cmd/barrierd/CMakeLists.txt index 59146252..a8b070c3 100644 --- a/src/cmd/synergyd/CMakeLists.txt +++ b/src/cmd/barrierd/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2012 Nick Bolton # @@ -18,10 +18,10 @@ file(GLOB headers "*.h") file(GLOB sources "*.cpp") if (WIN32) - add_executable (synergyd WIN32 ${sources}) + add_executable (barrierd WIN32 ${sources}) else() - add_executable (synergyd ${sources}) + add_executable (barrierd ${sources}) endif() -target_link_libraries (synergyd +target_link_libraries (barrierd arch base common io ipc mt net platform synlib shared ${libs} ${OPENSSL_LIBS}) diff --git a/src/cmd/synergyd/synergyd.cpp b/src/cmd/barrierd/barrierd.cpp similarity index 92% rename from src/cmd/synergyd/synergyd.cpp rename to src/cmd/barrierd/barrierd.cpp index 74f3fd2f..30423c7a 100644 --- a/src/cmd/synergyd/synergyd.cpp +++ b/src/cmd/barrierd/barrierd.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/DaemonApp.h" +#include "barrier/DaemonApp.h" #include diff --git a/src/cmd/synergys/.gitignore b/src/cmd/barriers/.gitignore similarity index 100% rename from src/cmd/synergys/.gitignore rename to src/cmd/barriers/.gitignore diff --git a/src/cmd/synergys/CMakeLists.txt b/src/cmd/barriers/CMakeLists.txt similarity index 82% rename from src/cmd/synergys/CMakeLists.txt rename to src/cmd/barriers/CMakeLists.txt index 4393455c..e1871ee8 100644 --- a/src/cmd/synergys/CMakeLists.txt +++ b/src/cmd/barriers/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -15,7 +15,7 @@ # along with this program. If not, see . set(sources - synergys.cpp + barriers.cpp ) if (WIN32) @@ -23,8 +23,8 @@ if (WIN32) file(GLOB arch_sources "MSWindows*.cpp") list(APPEND sources resource.h - synergys.ico - synergys.rc + barriers.ico + barriers.rc tb_error.ico tb_idle.ico tb_run.ico @@ -41,18 +41,18 @@ endif() list(APPEND sources ${arch_sources}) list(APPEND headers ${arch_headers}) -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() -add_executable(synergys ${sources}) -target_link_libraries(synergys +add_executable(barriers ${sources}) +target_link_libraries(barriers arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS}) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - install (TARGETS synergys DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) + install (TARGETS barriers DESTINATION ${BARRIER_BUNDLE_BINARY_DIR}) elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - install (TARGETS synergys DESTINATION bin) + install (TARGETS barriers DESTINATION bin) endif() diff --git a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp b/src/cmd/barriers/MSWindowsServerTaskBarReceiver.cpp similarity index 98% rename from src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp rename to src/cmd/barriers/MSWindowsServerTaskBarReceiver.cpp index 2b63c0c2..a221dac8 100644 --- a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp +++ b/src/cmd/barriers/MSWindowsServerTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -204,7 +204,7 @@ MSWindowsServerTaskBarReceiver::runMenu(int x, int y) m_events->getSystemTarget())); break; - case ID_SYNERGY_RESETSERVER: + case ID_BARRIER_RESETSERVER: m_events->addEvent(Event(m_events->forServerApp().resetServer(), m_events->getSystemTarget())); break; @@ -395,11 +395,11 @@ createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events { ArchMiscWindows::setIcons( (HICON)LoadImage(ArchMiscWindows::instanceWin32(), - MAKEINTRESOURCE(IDI_SYNERGY), + MAKEINTRESOURCE(IDI_BARRIER), IMAGE_ICON, 32, 32, LR_SHARED), (HICON)LoadImage(ArchMiscWindows::instanceWin32(), - MAKEINTRESOURCE(IDI_SYNERGY), + MAKEINTRESOURCE(IDI_BARRIER), IMAGE_ICON, 16, 16, LR_SHARED)); diff --git a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.h b/src/cmd/barriers/MSWindowsServerTaskBarReceiver.h similarity index 95% rename from src/cmd/synergys/MSWindowsServerTaskBarReceiver.h rename to src/cmd/barriers/MSWindowsServerTaskBarReceiver.h index 07f03366..a308ab4e 100644 --- a/src/cmd/synergys/MSWindowsServerTaskBarReceiver.h +++ b/src/cmd/barriers/MSWindowsServerTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/ServerTaskBarReceiver.h" +#include "barrier/ServerTaskBarReceiver.h" #define WIN32_LEAN_AND_MEAN #include diff --git a/src/cmd/synergys/OSXServerTaskBarReceiver.cpp b/src/cmd/barriers/OSXServerTaskBarReceiver.cpp similarity index 96% rename from src/cmd/synergys/OSXServerTaskBarReceiver.cpp rename to src/cmd/barriers/OSXServerTaskBarReceiver.cpp index cd51c3f0..bbe8fd19 100644 --- a/src/cmd/synergys/OSXServerTaskBarReceiver.cpp +++ b/src/cmd/barriers/OSXServerTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/cmd/synergys/OSXServerTaskBarReceiver.h b/src/cmd/barriers/OSXServerTaskBarReceiver.h similarity index 92% rename from src/cmd/synergys/OSXServerTaskBarReceiver.h rename to src/cmd/barriers/OSXServerTaskBarReceiver.h index c230ee53..ab6928f4 100644 --- a/src/cmd/synergys/OSXServerTaskBarReceiver.h +++ b/src/cmd/barriers/OSXServerTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/ServerTaskBarReceiver.h" +#include "barrier/ServerTaskBarReceiver.h" class BufferedLogOutputter; diff --git a/src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp b/src/cmd/barriers/XWindowsServerTaskBarReceiver.cpp similarity index 97% rename from src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp rename to src/cmd/barriers/XWindowsServerTaskBarReceiver.cpp index cdee1a28..7f525c51 100644 --- a/src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp +++ b/src/cmd/barriers/XWindowsServerTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * diff --git a/src/cmd/synergys/XWindowsServerTaskBarReceiver.h b/src/cmd/barriers/XWindowsServerTaskBarReceiver.h similarity index 93% rename from src/cmd/synergys/XWindowsServerTaskBarReceiver.h rename to src/cmd/barriers/XWindowsServerTaskBarReceiver.h index 351fe80a..549a62f1 100644 --- a/src/cmd/synergys/XWindowsServerTaskBarReceiver.h +++ b/src/cmd/barriers/XWindowsServerTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/ServerTaskBarReceiver.h" +#include "barrier/ServerTaskBarReceiver.h" class BufferedLogOutputter; class IEventQueue; diff --git a/src/cmd/synergys/synergys.cpp b/src/cmd/barriers/barriers.cpp similarity index 94% rename from src/cmd/synergys/synergys.cpp rename to src/cmd/barriers/barriers.cpp index 1ec3fe4e..1003c321 100644 --- a/src/cmd/synergys/synergys.cpp +++ b/src/cmd/barriers/barriers.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/ServerApp.h" +#include "barrier/ServerApp.h" #include "arch/Arch.h" #include "base/Log.h" #include "base/EventQueue.h" diff --git a/src/cmd/synergys/synergys.ico b/src/cmd/barriers/barriers.ico similarity index 100% rename from src/cmd/synergys/synergys.ico rename to src/cmd/barriers/barriers.ico diff --git a/src/cmd/synergys/synergys.rc b/src/cmd/barriers/barriers.rc similarity index 89% rename from src/cmd/synergys/synergys.rc rename to src/cmd/barriers/barriers.rc index 860d6f54..c4d263c7 100644 --- a/src/cmd/synergys/synergys.rc +++ b/src/cmd/barriers/barriers.rc @@ -54,7 +54,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_SYNERGY ICON "synergys.ico" +IDI_BARRIER ICON "barriers.ico" IDI_TASKBAR_NOT_RUNNING ICON "tb_idle.ico" IDI_TASKBAR_NOT_WORKING ICON "tb_error.ico" IDI_TASKBAR_NOT_CONNECTED ICON "tb_wait.ico" @@ -67,7 +67,7 @@ IDI_TASKBAR_CONNECTED ICON "tb_run.ico" IDR_TASKBAR MENU BEGIN - POPUP "Synergy" + POPUP "Barrier" BEGIN MENUITEM "Show Status", IDC_TASKBAR_STATUS MENUITEM "Show Log", IDC_TASKBAR_SHOW_LOG @@ -84,7 +84,7 @@ BEGIN END MENUITEM "Reload Configuration", IDC_RELOAD_CONFIG MENUITEM "Force Reconnect", IDC_FORCE_RECONNECT - MENUITEM "Reset Server", ID_SYNERGY_RESETSERVER + MENUITEM "Reset Server", ID_BARRIER_RESETSERVER MENUITEM SEPARATOR MENUITEM "Quit", IDC_TASKBAR_QUIT END @@ -112,8 +112,8 @@ END STRINGTABLE BEGIN - IDS_FAILED "Synergy is about to quit with errors or warnings. Please check the log then click OK." - IDS_INIT_FAILED "Synergy failed to initialize: %{1}" + IDS_FAILED "Barrier is about to quit with errors or warnings. Please check the log then click OK." + IDS_INIT_FAILED "Barrier failed to initialize: %{1}" IDS_UNCAUGHT_EXCEPTION "Uncaught exception: %{1}" END diff --git a/src/cmd/synergys/resource.h b/src/cmd/barriers/resource.h similarity index 90% rename from src/cmd/synergys/resource.h rename to src/cmd/barriers/resource.h index 1cc1e8b9..9594db1d 100644 --- a/src/cmd/synergys/resource.h +++ b/src/cmd/barriers/resource.h @@ -1,11 +1,11 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by synergys.rc +// Used by barriers.rc // #define IDS_FAILED 1 #define IDS_INIT_FAILED 2 #define IDS_UNCAUGHT_EXCEPTION 3 -#define IDI_SYNERGY 101 +#define IDI_BARRIER 101 #define IDI_TASKBAR_NOT_RUNNING 102 #define IDI_TASKBAR_NOT_WORKING 103 #define IDI_TASKBAR_NOT_CONNECTED 104 @@ -27,8 +27,8 @@ #define IDC_TASKBAR_LOG_LEVEL_DEBUG 40013 #define IDC_TASKBAR_LOG_LEVEL_DEBUG1 40014 #define IDC_TASKBAR_LOG_LEVEL_DEBUG2 40015 -#define ID_SYNERGY_RELOADSYSTEM 40016 -#define ID_SYNERGY_RESETSERVER 40017 +#define ID_BARRIER_RELOADSYSTEM 40016 +#define ID_BARRIER_RESETSERVER 40017 // Next default values for new objects // diff --git a/src/cmd/synergys/tb_error.ico b/src/cmd/barriers/tb_error.ico similarity index 100% rename from src/cmd/synergys/tb_error.ico rename to src/cmd/barriers/tb_error.ico diff --git a/src/cmd/synergys/tb_idle.ico b/src/cmd/barriers/tb_idle.ico similarity index 100% rename from src/cmd/synergys/tb_idle.ico rename to src/cmd/barriers/tb_idle.ico diff --git a/src/cmd/synergys/tb_run.ico b/src/cmd/barriers/tb_run.ico similarity index 100% rename from src/cmd/synergys/tb_run.ico rename to src/cmd/barriers/tb_run.ico diff --git a/src/cmd/synergys/tb_wait.ico b/src/cmd/barriers/tb_wait.ico similarity index 100% rename from src/cmd/synergys/tb_wait.ico rename to src/cmd/barriers/tb_wait.ico diff --git a/src/cmd/syntool/CMakeLists.txt b/src/cmd/syntool/CMakeLists.txt index 62374962..863d4f48 100644 --- a/src/cmd/syntool/CMakeLists.txt +++ b/src/cmd/syntool/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2014-2016 Symless Ltd. # # This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ target_link_libraries(syntool synlib arch base client common io ipc mt net platform server ${libs} ${OPENSSL_LIBS}) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - install (TARGETS syntool DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) + install (TARGETS syntool DESTINATION ${BARRIER_BUNDLE_BINARY_DIR}) elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") install (TARGETS syntool DESTINATION bin) endif() diff --git a/src/cmd/syntool/syntool.cpp b/src/cmd/syntool/syntool.cpp index cf3d8e99..72d35b9d 100644 --- a/src/cmd/syntool/syntool.cpp +++ b/src/cmd/syntool/syntool.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/ToolApp.h" +#include "barrier/ToolApp.h" #include "arch/Arch.h" int diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index afb80c07..bfdd53ea 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -10,18 +10,18 @@ file (GLOB LEGACY_GUI_SOURCE_FILES src/*.cpp src/*.h) file (GLOB LEGACY_GUI_UI_FILES src/*.ui) if (WIN32) - set (LEGACY_GUI_RC_FILES res/win/Synergy.rc) + set (LEGACY_GUI_RC_FILES res/win/Barrier.rc) endif() -add_executable (synergy WIN32 +add_executable (barrier WIN32 ${LEGACY_GUI_SOURCE_FILES} ${LEGACY_GUI_UI_FILES} ${LEGACY_GUI_RC_FILES} - res/Synergy.qrc + res/Barrier.qrc ) include_directories (./src) -target_link_libraries (synergy shared) +target_link_libraries (barrier shared) if (WIN32) include_directories ($ENV{BONJOUR_SDK_HOME}/Include) @@ -29,20 +29,20 @@ if (WIN32) HINTS ENV BONJOUR_SDK_HOME PATH_SUFFIXES "Lib/x64") elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - target_link_libraries (synergy dns_sd) + target_link_libraries (barrier dns_sd) endif() -qt5_use_modules (synergy Core Widgets Network) -target_compile_definitions (synergy PRIVATE -DSYNERGY_VERSION_STAGE="${SYNERGY_VERSION_STAGE}") -target_compile_definitions (synergy PRIVATE -DSYNERGY_REVISION="${SYNERGY_REVISION}") +qt5_use_modules (barrier Core Widgets Network) +target_compile_definitions (barrier PRIVATE -DBARRIER_VERSION_STAGE="${BARRIER_VERSION_STAGE}") +target_compile_definitions (barrier PRIVATE -DBARRIER_REVISION="${BARRIER_REVISION}") if (WIN32) - target_link_libraries (synergy ${DNSSD_LIB}) - set_target_properties (synergy PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT") + target_link_libraries (barrier ${DNSSD_LIB}) + set_target_properties (barrier PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT") endif() if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - install (TARGETS synergy DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) + install (TARGETS barrier DESTINATION ${BARRIER_BUNDLE_BINARY_DIR}) elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - install (TARGETS synergy DESTINATION bin) + install (TARGETS barrier DESTINATION bin) endif() diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 176d6851..14a2407f 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -1,7 +1,7 @@ QT += widgets \ network TEMPLATE = app -TARGET = synergy +TARGET = barrier DEFINES += VERSION_STAGE=\\\"$$QMAKE_VERSION_STAGE\\\" DEFINES += VERSION_REVISION=\\\"$$QMAKE_VERSION_REVISION\\\" DEFINES -= UNICODE @@ -43,13 +43,13 @@ SOURCES += src/main.cpp \ src/KeySequenceWidget.cpp \ src/SettingsDialog.cpp \ src/AppConfig.cpp \ - src/QSynergyApplication.cpp \ + src/QBarrierApplication.cpp \ src/VersionChecker.cpp \ src/SetupWizard.cpp \ src/IpcClient.cpp \ src/IpcReader.cpp \ src/Ipc.cpp \ - src/SynergyLocale.cpp \ + src/BarrierLocale.cpp \ src/QUtility.cpp \ src/ZeroconfServer.cpp \ src/ZeroconfThread.cpp \ @@ -88,13 +88,13 @@ HEADERS += src/MainWindow.h \ src/KeySequenceWidget.h \ src/SettingsDialog.h \ src/AppConfig.h \ - src/QSynergyApplication.h \ + src/QBarrierApplication.h \ src/VersionChecker.h \ src/SetupWizard.h \ src/IpcClient.h \ src/IpcReader.h \ src/Ipc.h \ - src/SynergyLocale.h \ + src/BarrierLocale.h \ src/QUtility.h \ src/ZeroconfServer.h \ src/ZeroconfThread.h \ @@ -118,14 +118,14 @@ HEADERS += src/MainWindow.h \ ../lib/shared/EditionType.h \ ../lib/shared/SerialKey.h \ src/LicenseManager.h -RESOURCES += res/Synergy.qrc -RC_FILE = res/win/Synergy.rc +RESOURCES += res/Barrier.qrc +RC_FILE = res/win/Barrier.rc macx { QMAKE_INFO_PLIST = res/mac/Info.plist - TARGET = Synergy - QSYNERGY_ICON.files = res/mac/Synergy.icns - QSYNERGY_ICON.path = Contents/Resources - QMAKE_BUNDLE_DATA += QSYNERGY_ICON + TARGET = Barrier + QBARRIER_ICON.files = res/mac/Barrier.icns + QBARRIER_ICON.path = Contents/Resources + QMAKE_BUNDLE_DATA += QBARRIER_ICON LIBS += $$MACX_LIBS } unix:!macx:LIBS += -ldns_sd diff --git a/src/gui/gui.ts b/src/gui/gui.ts index 96eeeb7d..a4eaa6ab 100644 --- a/src/gui/gui.ts +++ b/src/gui/gui.ts @@ -5,28 +5,28 @@ AboutDialogBase - About Synergy + About Barrier <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> +Copyright © 2018 Debauchee Open Source Group<br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> -Visit our website for help and info (symless.com). +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz. </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> +Copyright © 2018 Debauchee Open Source Group<br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> -Visit our website for help and info (symless.com). +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz. </p> @@ -204,7 +204,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -220,12 +220,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -235,7 +235,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -245,7 +245,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -255,27 +255,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -324,17 +324,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -346,17 +346,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -395,7 +395,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -481,7 +481,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -601,7 +601,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -650,12 +650,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -889,7 +889,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1046,14 +1046,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1169,7 +1169,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1187,7 +1187,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1197,12 +1197,12 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). @@ -1389,7 +1389,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/Synergy.qrc b/src/gui/res/Barrier.qrc similarity index 90% rename from src/gui/res/Synergy.qrc rename to src/gui/res/Barrier.qrc index 8f8ac0c8..39da79e6 100644 --- a/src/gui/res/Synergy.qrc +++ b/src/gui/res/Barrier.qrc @@ -1,11 +1,11 @@ - icons/16x16/synergy-connected.png - icons/16x16/synergy-disconnected.png + icons/16x16/barrier-connected.png + icons/16x16/barrier-disconnected.png icons/64x64/video-display.png icons/64x64/user-trash.png icons/16x16/warning.png - icons/256x256/synergy.ico + icons/256x256/barrier.ico image/about.png lang/gui_ar.qm lang/gui_bg-BG.qm @@ -53,6 +53,6 @@ icons/16x16/money.png image/spinning-wheel.gif icons/16x16/padlock.png - icons/16x16/synergy-transfering.png + icons/16x16/barrier-transfering.png diff --git a/src/gui/res/icons/16x16/synergy-connected.png b/src/gui/res/icons/16x16/barrier-connected.png similarity index 100% rename from src/gui/res/icons/16x16/synergy-connected.png rename to src/gui/res/icons/16x16/barrier-connected.png diff --git a/src/gui/res/icons/16x16/synergy-connected.psd b/src/gui/res/icons/16x16/barrier-connected.psd similarity index 100% rename from src/gui/res/icons/16x16/synergy-connected.psd rename to src/gui/res/icons/16x16/barrier-connected.psd diff --git a/src/gui/res/icons/16x16/synergy-disconnected.png b/src/gui/res/icons/16x16/barrier-disconnected.png similarity index 100% rename from src/gui/res/icons/16x16/synergy-disconnected.png rename to src/gui/res/icons/16x16/barrier-disconnected.png diff --git a/src/gui/res/icons/16x16/synergy-disconnected.psd b/src/gui/res/icons/16x16/barrier-disconnected.psd similarity index 100% rename from src/gui/res/icons/16x16/synergy-disconnected.psd rename to src/gui/res/icons/16x16/barrier-disconnected.psd diff --git a/src/gui/res/icons/16x16/synergy-transfering.png b/src/gui/res/icons/16x16/barrier-transfering.png similarity index 100% rename from src/gui/res/icons/16x16/synergy-transfering.png rename to src/gui/res/icons/16x16/barrier-transfering.png diff --git a/src/gui/res/icons/256x256/synergy.ico b/src/gui/res/icons/256x256/barrier.ico similarity index 100% rename from src/gui/res/icons/256x256/synergy.ico rename to src/gui/res/icons/256x256/barrier.ico diff --git a/src/gui/res/lang/gui_af-ZA.ts b/src/gui/res/lang/gui_af-ZA.ts index 1102b22b..4ab262ad 100644 --- a/src/gui/res/lang/gui_af-ZA.ts +++ b/src/gui/res/lang/gui_af-ZA.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,12 +1195,12 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_ar.ts b/src/gui/res/lang/gui_ar.ts index cde17ab0..267287ae 100644 --- a/src/gui/res/lang/gui_ar.ts +++ b/src/gui/res/lang/gui_ar.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier عن سينيرجي @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found عامل التآزر لم يتم العثور عليه - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. لا وجود للتنفيذ لان عامل التآزر غير موجود. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. الرجاء ملء اسم المضيف لعاملالتآزر للاتصال. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier سينيرجي - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier سينيرجي @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,12 +1195,12 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! شكرا لتنزيل السنغري - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). التآزر يتيح لك بسهولة مشاركة الماوس ولوحة المفاتيح بين العديد من أجهزة الكمبيوتر في مكتبك، وانها لالحرة والمفتوحة المصدر. مجرد تحرك الماوس من على حافة شاشة جهاز كمبيوتر واحد على آخر. يمكنك حتى أن حصة كل من الألواح الكتابة الخاصة بك. كل ما تحتاجه هو اتصال بالشبكة. التآزر هو عبر منصة (يعمل على ويندوز، وماكنتوش ولينكس). @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier سينيرجي diff --git a/src/gui/res/lang/gui_bg-BG.ts b/src/gui/res/lang/gui_bg-BG.ts index 096fa7b4..5c0c559c 100644 --- a/src/gui/res/lang/gui_bg-BG.ts +++ b/src/gui/res/lang/gui_bg-BG.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier За Синерджи @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> <p>Вашата версия на Синерджи не е актуална. Версия <b>%1</b> е достъпна за <a href="%2">сваляне</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found Синерджи клиентът не е намерен. - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. Моля попълнете име на приемника за да може синерджи клиентът да се свърже. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. Временният конфигурационен файл, необходим за стартиране на синерджи, не може да бъде записан. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? Не сте записали валидно име на конфигурационния файл за синерджи сървъра. Искате ли да направите това сега? - Synergy server not found + Barrier server not found Синерджи сървърът не е намерен - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error Синерджи беше изключена поради грешка - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. Синерджи беше неочаквано изключена с изходен код %1.<br><br> Моля за детайли вижте регистрационния файл. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. Синерджи се стартира. - Synergy is running. + Barrier is running. Синерджи е активна. - Synergy is not running. + Barrier is not running. Синерджи не е активна. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier Синерджи - Browse for a synergys config file + Browse for a barriers config file Браузвайте за да намерите конфигурационния файл на програмата - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier Синерджи @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... Относно Синерджи @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier Настройка на Синерджи @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) Конфигурации на Синерджи (*.sgc);; Всички файлове (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) Конфигурации на Синерджи (*.conf);; Всички файлове (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1046,14 +1046,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier Вдигане на предимството на Синерджи - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. Сигурни ли сте че искате да повишите предимството на Синерджи? Това ще позволи на Синерджи да общува с процеси с по-голямо предимство и UAC диалоговите прозорци, но може да предизвика проблеми с процеси с по-нисък проритет. Вдигнете предимството само ако е наистина необходимо. @@ -1169,7 +1169,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier Настройка на Синерджи @@ -1187,7 +1187,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier Настройка на Синерджи @@ -1197,12 +1197,12 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! Благодарим, че инсталирахте Синерджи! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). Синерджи ти помага лесно да споделиш мишката и клавиатурата си с множество компютри на работното ти място и е безплатен и с отворен код. Просто местиш мишка от ръба на екрана на един от компютрите на друг. Можеш да ползваш дори клипборд функцията на всички компютри свързани чрез Синерджи. Всичко, от което имаш нужда е мрежова връзка между компютрите, които ползваш. Синерджи е мултиплатформена (работи на Windows, Mac OS X и Linux). @@ -1392,7 +1392,7 @@ Server response: - Synergy + Barrier Синерджи diff --git a/src/gui/res/lang/gui_ca-AD.ts b/src/gui/res/lang/gui_ca-AD.ts index 7e41d58b..a9c23c9c 100644 --- a/src/gui/res/lang/gui_ca-AD.ts +++ b/src/gui/res/lang/gui_ca-AD.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - En quant a Synergy + About Barrier + En quant a Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>La teva versió de Synergy està desactualitzada. La nova versió <b>%1</b> està ara disponible per <a href="%2">descarregar</a>.</p> + <p>La teva versió de Barrier està desactualitzada. La nova versió <b>%1</b> està ara disponible per <a href="%2">descarregar</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - No s'ha trobat cap client de Synergy + Barrier client not found + No s'ha trobat cap client de Barrier - The executable for the synergy client does not exist. - L'executable del client de Synergy no existeix. + The executable for the barrier client does not exist. + L'executable del client de Barrier no existeix. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Si us plau completa el camp nom de host per al client de Synergy per connectar-t'hi. + Please fill in a hostname for the barrier client to connect to. + Si us plau completa el camp nom de host per al client de Barrier per connectar-t'hi. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - No s'ha pogut escriure al fitxer de configuració temporal requerit per iniciar Synergy + The temporary configuration file required to start barrier can not be written. + No s'ha pogut escriure al fitxer de configuració temporal requerit per iniciar Barrier @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - No has omplert un arxiu de configuració vàlid per al servidor de Synergy. Vols veure ara el fitxer de configuració? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + No has omplert un arxiu de configuració vàlid per al servidor de Barrier. Vols veure ara el fitxer de configuració? - Synergy server not found - No s'ha trobat el Servidor de Synergy + Barrier server not found + No s'ha trobat el Servidor de Barrier - The executable for the synergy server does not exist. - L'executable del servidor de Synergy no existeix. + The executable for the barrier server does not exist. + L'executable del servidor de Barrier no existeix. - Synergy terminated with an error - Synergy ha finalitzat degut a un error + Barrier terminated with an error + Barrier ha finalitzat degut a un error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy ha finalitzat inesperadament amb el codi d'error %1.<br><br>Si us plau mira el log de sortida per més detalls. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier ha finalitzat inesperadament amb el codi d'error %1.<br><br>Si us plau mira el log de sortida per més detalls. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy està engegant-se. + Barrier is starting. + Barrier està engegant-se. - Synergy is running. - Synergy està executant-se. + Barrier is running. + Barrier està executant-se. - Synergy is not running. - Synergy no s'està executant. + Barrier is not running. + Barrier no s'està executant. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file + Browse for a barriers config file Mostrar el fitxer de configuració de Sygergy - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - En &quant a Synergy... + &About Barrier... + En &quant a Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Configurar Synergy + Setup Barrier + Configurar Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Configuracions Synergy (*.sgc);;Tots els arxius (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Configuracions Barrier (*.sgc);;Tots els arxius (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Configuracions Synergy (*.conf);;Tots els arxius (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Configuracions Barrier (*.conf);;Tots els arxius (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Configura la disposició de configuració del teu servidor synergy. + Configure the layout of your barrier server configuration. + Configura la disposició de configuració del teu servidor barrier. @@ -1046,16 +1046,16 @@ Fes doble clic a una pantalla per editar la seva configuració. - Elevate Synergy - Elevar Synergy + Elevate Barrier + Elevar Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Estas segur que vols elevar Synergy? -Això permet a Synergy interactuar amb processos elevats i el diàleg del UAC, però pot causar problemes amb processos no elevats. Eleva Synergy només si realment ho necessites. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Estas segur que vols elevar Barrier? +Això permet a Barrier interactuar amb processos elevats i el diàleg del UAC, però pot causar problemes amb processos no elevats. Eleva Barrier només si realment ho necessites. @@ -1170,8 +1170,8 @@ Això permet a Synergy interactuar amb processos elevats i el diàleg del UAC, p SetupWizard - Setup Synergy - Configurar Synergy + Setup Barrier + Configurar Barrier @@ -1188,8 +1188,8 @@ Això permet a Synergy interactuar amb processos elevats i el diàleg del UAC, p SetupWizardBase - Setup Synergy - Configurar Synergy + Setup Barrier + Configurar Barrier @@ -1198,13 +1198,13 @@ Això permet a Synergy interactuar amb processos elevats i el diàleg del UAC, p - Thanks for installing Synergy! - Gràcies per instal·lar Synergy! + Thanks for installing Barrier! + Gràcies per instal·lar Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy et permet compartir fàcilment el ratolí i teclat entre diversos ordinadors al teu escriptori, i és lliure i de codi obert. Només cal moure el punter del ratolí per la vora de la pantalla d'un ordinador a un altre. Fins i tot pots compartir el portapapers. Únicament el que necessites és una connexió de xarxa. Synergy és multiplataforma (funciona en Windows, Mac OS X i Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier et permet compartir fàcilment el ratolí i teclat entre diversos ordinadors al teu escriptori, i és lliure i de codi obert. Només cal moure el punter del ratolí per la vora de la pantalla d'un ordinador a un altre. Fins i tot pots compartir el portapapers. Únicament el que necessites és una connexió de xarxa. Barrier és multiplataforma (funciona en Windows, Mac OS X i Linux). @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_cs-CZ.ts b/src/gui/res/lang/gui_cs-CZ.ts index 5dbe5cdd..12dc8b7f 100644 --- a/src/gui/res/lang/gui_cs-CZ.ts +++ b/src/gui/res/lang/gui_cs-CZ.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - O Synergy + About Barrier + O Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>Používáte starou verzi aplikace Synergy. Ke <a href="%2">stažení</a> je nyní již verze <b>%1</b>.</p> + <p>Používáte starou verzi aplikace Barrier. Ke <a href="%2">stažení</a> je nyní již verze <b>%1</b>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Synergy klient nebyl nalezen + Barrier client not found + Barrier klient nebyl nalezen - The executable for the synergy client does not exist. - Spustitelný soubor s programem Synergy klienta neexistuje. + The executable for the barrier client does not exist. + Spustitelný soubor s programem Barrier klienta neexistuje. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Vyplňte adresu cílového počítače ke kterému se Synergy klient má připojit. + Please fill in a hostname for the barrier client to connect to. + Vyplňte adresu cílového počítače ke kterému se Barrier klient má připojit. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Do dočasného souboru s nastaveními, potřebného pro spuštění Synergy, nelze zapisovat. + The temporary configuration file required to start barrier can not be written. + Do dočasného souboru s nastaveními, potřebného pro spuštění Barrier, nelze zapisovat. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Nevyplnili jste platný soubor s nastaveními pro synergy server. Chcete nyní určit umístění souboru s nastaveními? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Nevyplnili jste platný soubor s nastaveními pro barrier server. Chcete nyní určit umístění souboru s nastaveními? - Synergy server not found - Synergy server nebyl nalezen + Barrier server not found + Barrier server nebyl nalezen - The executable for the synergy server does not exist. - Spustitelný soubor s programem synergy serveru neexistuje. + The executable for the barrier server does not exist. + Spustitelný soubor s programem barrier serveru neexistuje. - Synergy terminated with an error - Synergy bylo ukončeno s chybou + Barrier terminated with an error + Barrier bylo ukončeno s chybou - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Neočekávané ukončení Synergy. Běh skončil s kódem %1. <br><br>Podrobnosti viz protokol. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Neočekávané ukončení Barrier. Běh skončil s kódem %1. <br><br>Podrobnosti viz protokol. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy se spouští. + Barrier is starting. + Barrier se spouští. - Synergy is running. - Synergy je spuštěné. + Barrier is running. + Barrier je spuštěné. - Synergy is not running. - Synergy není spuštěné. + Barrier is not running. + Barrier není spuštěné. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Otevřít existující soubor s nastaveními pro synergy + Browse for a barriers config file + Otevřít existující soubor s nastaveními pro barrier - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - &O Synergy… + &About Barrier... + &O Barrier… @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Instalovat Synergy + Setup Barrier + Instalovat Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Nastavení Synergy (*.sgc);;Všechny soubory (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Nastavení Barrier (*.sgc);;Všechny soubory (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Nastavení Synergy (*.conf);;Všechny soubory (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Nastavení Barrier (*.conf);;Všechny soubory (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Nastavte rozložení svého nastavení serveru synergy. + Configure the layout of your barrier server configuration. + Nastavte rozložení svého nastavení serveru barrier. @@ -1046,16 +1046,16 @@ Nastavení obrazovky upravíte dvojklikem na ni. - Elevate Synergy - Zvýšit stupeň oprávnění pro Synergy + Elevate Barrier + Zvýšit stupeň oprávnění pro Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Opravdu chcete zvýšit stupeň oprávnění pro Synergy? -Sice to Synergy umožní pracovat s procesy, které mají také takový stupeň a s dialogem řízení uživatelských účtů (UAC), může ale působit problémy aplikacím s běžnými oprávněními. Tuto možnost byste tedy měli využít pouze pokud ji opravdu potřebujete. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Opravdu chcete zvýšit stupeň oprávnění pro Barrier? +Sice to Barrier umožní pracovat s procesy, které mají také takový stupeň a s dialogem řízení uživatelských účtů (UAC), může ale působit problémy aplikacím s běžnými oprávněními. Tuto možnost byste tedy měli využít pouze pokud ji opravdu potřebujete. @@ -1170,8 +1170,8 @@ Sice to Synergy umožní pracovat s procesy, které mají také takový stupeň SetupWizard - Setup Synergy - Instalovat Synergy + Setup Barrier + Instalovat Barrier @@ -1188,8 +1188,8 @@ Sice to Synergy umožní pracovat s procesy, které mají také takový stupeň SetupWizardBase - Setup Synergy - Instalovat Synergy + Setup Barrier + Instalovat Barrier @@ -1198,13 +1198,13 @@ Sice to Synergy umožní pracovat s procesy, které mají také takový stupeň - Thanks for installing Synergy! - Těší nás, že jste si nainstalovali Synergy! + Thanks for installing Barrier! + Těší nás, že jste si nainstalovali Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy vám umožní snadno sdílet myš a klávesnici napříč vícero počítači na vašem stole. Aplikace je svobodná a s otevřeným zdrojovým kódem. Stačí jen přesunout kurzor myši mimo okraj obrazovky jednoho počítače na obrazovku dalšího. Mezi počítači můžete dokonce sdílet obsahy jejich schránek. Jediné, co je potřeba, je propojení sítí. Synergy je multiplatformní (funguje na Windows, Mac OS X a GNU/Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier vám umožní snadno sdílet myš a klávesnici napříč vícero počítači na vašem stole. Aplikace je svobodná a s otevřeným zdrojovým kódem. Stačí jen přesunout kurzor myši mimo okraj obrazovky jednoho počítače na obrazovku dalšího. Mezi počítači můžete dokonce sdílet obsahy jejich schránek. Jediné, co je potřeba, je propojení sítí. Barrier je multiplatformní (funguje na Windows, Mac OS X a GNU/Linux). @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_cy.ts b/src/gui/res/lang/gui_cy.ts index 70b352c9..3aeee06d 100644 --- a/src/gui/res/lang/gui_cy.ts +++ b/src/gui/res/lang/gui_cy.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Ynghylch Synergy + About Barrier + Ynghylch Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Methwyd dod o hyd i gleient Synergy + Barrier client not found + Methwyd dod o hyd i gleient Barrier - The executable for the synergy client does not exist. - Nid yw'r ffeil weithredadwy ar gyfer y cleient synergy yn bodoli. + The executable for the barrier client does not exist. + Nid yw'r ffeil weithredadwy ar gyfer y cleient barrier yn bodoli. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Rhowch enw gwesteiwr i'r cleient synergy i gysylltu iddo. + Please fill in a hostname for the barrier client to connect to. + Rhowch enw gwesteiwr i'r cleient barrier i gysylltu iddo. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Nid yw'n bosib sgrifennu i'r ffeil gyfluniad dros dro sydd angen i ddechrau synergy + The temporary configuration file required to start barrier can not be written. + Nid yw'n bosib sgrifennu i'r ffeil gyfluniad dros dro sydd angen i ddechrau barrier @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Nid ydych wedi llenwi mewn ffeil gyfluniad dilys ar gyfer y gweinydd synergy. Hoffech chi bori am ffeil gyfluniad nawr? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Nid ydych wedi llenwi mewn ffeil gyfluniad dilys ar gyfer y gweinydd barrier. Hoffech chi bori am ffeil gyfluniad nawr? - Synergy server not found - Methwyd dod o hyd i weinydd Synergy + Barrier server not found + Methwyd dod o hyd i weinydd Barrier - The executable for the synergy server does not exist. - Nid yw'r ffeil weithredadwy ar gyfer y gweinydd synergy yn bodoli. + The executable for the barrier server does not exist. + Nid yw'r ffeil weithredadwy ar gyfer y gweinydd barrier yn bodoli. - Synergy terminated with an error - Fe wnaeth Synergy derfynnu gyda gwall + Barrier terminated with an error + Fe wnaeth Barrier derfynnu gyda gwall - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Fe wnaeth Synergy derfynnu yn annisgwyl gyda cod gorffen %1.<br><br>Gwelwch allbwn log am fanylion. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Fe wnaeth Barrier derfynnu yn annisgwyl gyda cod gorffen %1.<br><br>Gwelwch allbwn log am fanylion. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Mae Synergy yn dechrau. + Barrier is starting. + Mae Barrier yn dechrau. - Synergy is running. - Mae Synergy yn rhedeg. + Barrier is running. + Mae Barrier yn rhedeg. - Synergy is not running. - Nid yw Synergy yn rhedeg. + Barrier is not running. + Nid yw Barrier yn rhedeg. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Profi am ffeil gyfluniad synergys + Browse for a barriers config file + Profi am ffeil gyfluniad barriers - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Ynghylch Synergy + &About Barrier... + Ynghylch Barrier @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Gosod fyny Synergy + Setup Barrier + Gosod fyny Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Cyfluniadau Synergy (*.sgc);;Pob ffeil (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Cyfluniadau Barrier (*.sgc);;Pob ffeil (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Cyfluniadau Synergy (*.conf);;Pob ffeil (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Cyfluniadau Barrier (*.conf);;Pob ffeil (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Cyfluniwch gynllun eich cyfluniad gweinydd synergy + Configure the layout of your barrier server configuration. + Cyfluniwch gynllun eich cyfluniad gweinydd barrier @@ -1046,14 +1046,14 @@ Rhowch glic dwbl ar sgrîn i newid ei osodiadau. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1169,8 +1169,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - Gosod fyny Synergy + Setup Barrier + Gosod fyny Barrier @@ -1187,8 +1187,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - Gosod fyny Synergy + Setup Barrier + Gosod fyny Barrier @@ -1197,13 +1197,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Mae Synergy yn gadael i chi rhannu eich llygoden a'r bysellfwrdd yn hawdd rhwng nifer o gyfrifiaduron ar eich desg, ac mae'n rhad ac am ddim a Ffynhonnell Agored. Dyna gyd sydd angen yw symud eich llygoden dros ymyl sgrîn un cyfrifiadur i un arall. Gallwch hyd yn oed rannu eich holl clipfyrddau. Y cyfan sydd ei angen yw cysylltiad rhwydwaith. Mae Synergy yn draws-lwyfan (mae'n gweithio ar Windows, Mac OS X a Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Mae Barrier yn gadael i chi rhannu eich llygoden a'r bysellfwrdd yn hawdd rhwng nifer o gyfrifiaduron ar eich desg, ac mae'n rhad ac am ddim a Ffynhonnell Agored. Dyna gyd sydd angen yw symud eich llygoden dros ymyl sgrîn un cyfrifiadur i un arall. Gallwch hyd yn oed rannu eich holl clipfyrddau. Y cyfan sydd ei angen yw cysylltiad rhwydwaith. Mae Barrier yn draws-lwyfan (mae'n gweithio ar Windows, Mac OS X a Linux). @@ -1389,8 +1389,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_da.ts b/src/gui/res/lang/gui_da.ts index c871d64e..57f1e1f6 100644 --- a/src/gui/res/lang/gui_da.ts +++ b/src/gui/res/lang/gui_da.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Om Synergy + About Barrier + Om Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>Din version af Synergy er forældet. Version <b>%1</b> er nu tilgængelig som <a href="%2">download</a>.</p> + <p>Din version af Barrier er forældet. Version <b>%1</b> er nu tilgængelig som <a href="%2">download</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Synergy-klienten blev ikke fundet + Barrier client not found + Barrier-klienten blev ikke fundet - The executable for the synergy client does not exist. - Programfilen til Synergy-klienten eksisterer ikke. + The executable for the barrier client does not exist. + Programfilen til Barrier-klienten eksisterer ikke. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Indtast det værtsnavn, som Synergy-klienten skal forbinde sig til. + Please fill in a hostname for the barrier client to connect to. + Indtast det værtsnavn, som Barrier-klienten skal forbinde sig til. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Den midlertidige konfigurationsfil, som skal bruges for at starte Synergy, kan ikke oprettes. + The temporary configuration file required to start barrier can not be written. + Den midlertidige konfigurationsfil, som skal bruges for at starte Barrier, kan ikke oprettes. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Du har ikke oprettet en gyldig konfigurationsfil til Synergy-serveren. Vil du søge efter konfigurationsfilen? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Du har ikke oprettet en gyldig konfigurationsfil til Barrier-serveren. Vil du søge efter konfigurationsfilen? - Synergy server not found - Synergy-serveren blev ikke fundet + Barrier server not found + Barrier-serveren blev ikke fundet - The executable for the synergy server does not exist. - Programfilen til Synergy-klienten eksisterer ikke. + The executable for the barrier server does not exist. + Programfilen til Barrier-klienten eksisterer ikke. - Synergy terminated with an error - Synergy afsluttede med en fejl + Barrier terminated with an error + Barrier afsluttede med en fejl - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy afsluttede uventet med fejlkoden %1.<br><br>Se venligst logfilen for detaljer. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier afsluttede uventet med fejlkoden %1.<br><br>Se venligst logfilen for detaljer. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy starter. + Barrier is starting. + Barrier starter. - Synergy is running. - Synergy kører allerede. + Barrier is running. + Barrier kører allerede. - Synergy is not running. - Synergy er ikke startet + Barrier is not running. + Barrier er ikke startet @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Søg efter en Synergy-konfigurationsfil + Browse for a barriers config file + Søg efter en Barrier-konfigurationsfil - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - &Om Synergy... + &About Barrier... + &Om Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Opsæt Synergy + Setup Barrier + Opsæt Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergy-konfigurationer (*.sgc);;Alle filer (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrier-konfigurationer (*.sgc);;Alle filer (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy-konfigurationer (*.conf);;Alle filer (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier-konfigurationer (*.conf);;Alle filer (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Indstil Synergy-serverens konfigurations-layout. + Configure the layout of your barrier server configuration. + Indstil Barrier-serverens konfigurations-layout. @@ -1046,15 +1046,15 @@ Dobbeltklik på skærmen for at redigere indstillingerne. - Elevate Synergy - Ophøj Synergy's rettigheder + Elevate Barrier + Ophøj Barrier's rettigheder - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Er du sikker på, at du vil ophøje Synergy's rettigheder? Det giver Synergy rettigheder til at interagere med andre ophøjede processer og UAC-dialogboksen, men det kan give problemer med processer, som ikke har samme rettigheder. Ophøj kun Synergy, hvis du virkelig har brug for det. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Er du sikker på, at du vil ophøje Barrier's rettigheder? Det giver Barrier rettigheder til at interagere med andre ophøjede processer og UAC-dialogboksen, men det kan give problemer med processer, som ikke har samme rettigheder. Ophøj kun Barrier, hvis du virkelig har brug for det. @@ -1169,8 +1169,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - Opsæt Synergy + Setup Barrier + Opsæt Barrier @@ -1187,8 +1187,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - Opsæt Synergy + Setup Barrier + Opsæt Barrier @@ -1197,13 +1197,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! - Tak fordi du installerede Synergy! + Thanks for installing Barrier! + Tak fordi du installerede Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy lader dig nemt dele din mus og tastatur mellem flere computere på dit skrivebord, og det er gratis og Open Source. Flyt blot din mus forbi skærmkanten på en computers skærm til en anden. Du kan endda dele din udklipsholder også. Det eneste du behøver er en netværksforbindelse. Desuden fungere Synergy på flere platforme (Virker på Windows, Mac OS X samt Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lader dig nemt dele din mus og tastatur mellem flere computere på dit skrivebord, og det er gratis og Open Source. Flyt blot din mus forbi skærmkanten på en computers skærm til en anden. Du kan endda dele din udklipsholder også. Det eneste du behøver er en netværksforbindelse. Desuden fungere Barrier på flere platforme (Virker på Windows, Mac OS X samt Linux). @@ -1392,8 +1392,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_de.ts b/src/gui/res/lang/gui_de.ts index 89cc2361..50d8fa5c 100644 --- a/src/gui/res/lang/gui_de.ts +++ b/src/gui/res/lang/gui_de.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Über Synergy + About Barrier + Über Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>Ihre Synergy Version ist veraltet. Version <b>%1</b> ist jetzt zum <a href="%2">Download</a> verfügbar.</p> + <p>Ihre Barrier Version ist veraltet. Version <b>%1</b> ist jetzt zum <a href="%2">Download</a> verfügbar.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Der Synergy Client wurde nicht gefunden + Barrier client not found + Der Barrier Client wurde nicht gefunden - The executable for the synergy client does not exist. - Die ausführbare Datei für den Synergy Client existiert nicht. + The executable for the barrier client does not exist. + Die ausführbare Datei für den Barrier Client existiert nicht. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Bitte tragen Sie einen Hostnamen ein, zu dem sich der Synergy-Client verbinden soll. + Please fill in a hostname for the barrier client to connect to. + Bitte tragen Sie einen Hostnamen ein, zu dem sich der Barrier-Client verbinden soll. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Die temporäre Konfigurationsdatei konnte nicht geschrieben werden. Sie wird jedoch für den Start von Synergy benötigt. + The temporary configuration file required to start barrier can not be written. + Die temporäre Konfigurationsdatei konnte nicht geschrieben werden. Sie wird jedoch für den Start von Barrier benötigt. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? Sie haben keine gültige Konfigurationsdatei angegeben. Wollen sie jetzt nach dieser Datei suchen? - Synergy server not found - Der Synergy Server wurde nicht gefunden. + Barrier server not found + Der Barrier Server wurde nicht gefunden. - The executable for the synergy server does not exist. - Die ausführbare Datei für den Synergy Server existiert nicht. + The executable for the barrier server does not exist. + Die ausführbare Datei für den Barrier Server existiert nicht. - Synergy terminated with an error - Synergy wurde mit einem Fehler beendet. + Barrier terminated with an error + Barrier wurde mit einem Fehler beendet. - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy wurde unerwartet mit Abbruchcode %1 beendet. <br><br> Weitere Informationen können dem Log entnommen werden. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier wurde unerwartet mit Abbruchcode %1 beendet. <br><br> Weitere Informationen können dem Log entnommen werden. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy wird gestartet. + Barrier is starting. + Barrier wird gestartet. - Synergy is running. - Synergy läuft. + Barrier is running. + Barrier läuft. - Synergy is not running. - Synergy wird nicht ausgeführt. + Barrier is not running. + Barrier wird nicht ausgeführt. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Nach einer Konfigurationsdatei für Synergy suchen. + Browse for a barriers config file + Nach einer Konfigurationsdatei für Barrier suchen. - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - &Über Synergy... + &About Barrier... + &Über Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Synergy einrichten + Setup Barrier + Barrier einrichten @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergy Konfigurationen (*.sgc);;Alle Dateien (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrier Konfigurationen (*.sgc);;Alle Dateien (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy Konfigurationen (*.conf);;Alle Dateien (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier Konfigurationen (*.conf);;Alle Dateien (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Konfigurieren Sie die Anordnung Ihrer Synergy Server Konfiguration. + Configure the layout of your barrier server configuration. + Konfigurieren Sie die Anordnung Ihrer Barrier Server Konfiguration. @@ -1046,16 +1046,16 @@ Klicken sie doppelt auf eine Anzeige um die Einstellungen zu bearbeiten. - Elevate Synergy - Synergy Befördern + Elevate Barrier + Barrier Befördern - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Sind Sie sicher das Sie Synergy Erweiterte Benutzerrechte einräumen wollen? -Das erlaubt Synergy mit Prozessen die höhere Rechte haben und dem UAC-Dialog zu interagieren, kann aber bei normalen Prozessen Probleme verursachen. Erweiterte Rechte an Synergy bitte nur vergeben wenn es unbedingt nötig ist. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Sind Sie sicher das Sie Barrier Erweiterte Benutzerrechte einräumen wollen? +Das erlaubt Barrier mit Prozessen die höhere Rechte haben und dem UAC-Dialog zu interagieren, kann aber bei normalen Prozessen Probleme verursachen. Erweiterte Rechte an Barrier bitte nur vergeben wenn es unbedingt nötig ist. @@ -1170,8 +1170,8 @@ Das erlaubt Synergy mit Prozessen die höhere Rechte haben und dem UAC-Dialog zu SetupWizard - Setup Synergy - Synergy einrichten + Setup Barrier + Barrier einrichten @@ -1188,8 +1188,8 @@ Das erlaubt Synergy mit Prozessen die höhere Rechte haben und dem UAC-Dialog zu SetupWizardBase - Setup Synergy - Synergy einrichten + Setup Barrier + Barrier einrichten @@ -1198,13 +1198,13 @@ Das erlaubt Synergy mit Prozessen die höhere Rechte haben und dem UAC-Dialog zu - Thanks for installing Synergy! - Danke, dass du Synergy installiert hast! + Thanks for installing Barrier! + Danke, dass du Barrier installiert hast! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Mit Synergy können Sie einfach Ihre Tastatur und Maus an mehreren Computern auf Ihrem Schreibtisch nutzen, und es ist Frei und Open Source. Bewegen Sie einfach ihre Maus über den Rand des Bildschirms eines Computers auf den Bildschirm eines anderen. Sie können sogar den Inhalt ihrer Zwischenablage an alle Computer verteilen. Alles was Sie brauchen ist ein Netzwerk-Anschluss. Synergy funktioniert auf Windows, Mac OS X und Linux. + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Mit Barrier können Sie einfach Ihre Tastatur und Maus an mehreren Computern auf Ihrem Schreibtisch nutzen, und es ist Frei und Open Source. Bewegen Sie einfach ihre Maus über den Rand des Bildschirms eines Computers auf den Bildschirm eines anderen. Sie können sogar den Inhalt ihrer Zwischenablage an alle Computer verteilen. Alles was Sie brauchen ist ein Netzwerk-Anschluss. Barrier funktioniert auf Windows, Mac OS X und Linux. @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_es.ts b/src/gui/res/lang/gui_es.ts index 07644155..eeef130e 100644 --- a/src/gui/res/lang/gui_es.ts +++ b/src/gui/res/lang/gui_es.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Acerca de Synergy + About Barrier + Acerca de Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>Tú versión de Synergy es antigua. La versión <b>%1</b> esta ahora disponible para <a href="%2">descargar</a>.</p> + <p>Tú versión de Barrier es antigua. La versión <b>%1</b> esta ahora disponible para <a href="%2">descargar</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - No se encontró el cliente Synergy + Barrier client not found + No se encontró el cliente Barrier - The executable for the synergy client does not exist. - El ejecutable para el cliente Synergy no existe. + The executable for the barrier client does not exist. + El ejecutable para el cliente Barrier no existe. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Por favor, ingresa un nombre de host al que se conectará el cliente Synergy. + Please fill in a hostname for the barrier client to connect to. + Por favor, ingresa un nombre de host al que se conectará el cliente Barrier. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - El archivo de configuración temporal necesario para iniciar Synergy no puede ser escrito. + The temporary configuration file required to start barrier can not be written. + El archivo de configuración temporal necesario para iniciar Barrier no puede ser escrito. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - No has ingresado un archivo de configuración válido para el servidor Synergy. Queres buscar el archivo de configuración ahora? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + No has ingresado un archivo de configuración válido para el servidor Barrier. Queres buscar el archivo de configuración ahora? - Synergy server not found - No se encontró el servidor Synergy + Barrier server not found + No se encontró el servidor Barrier - The executable for the synergy server does not exist. - El ejecutable para el servidor Synergy no existe. + The executable for the barrier server does not exist. + El ejecutable para el servidor Barrier no existe. - Synergy terminated with an error - Synergy terminó con un error + Barrier terminated with an error + Barrier terminó con un error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. Synergu terminó inesperadamente con el código de salida %1.<br><br>Por favor, vea el registro de eventos para detalles. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy está iniciando. + Barrier is starting. + Barrier está iniciando. - Synergy is running. - Synergy se está ejecutando. + Barrier is running. + Barrier se está ejecutando. - Synergy is not running. - Synergy no se está ejecutando. + Barrier is not running. + Barrier no se está ejecutando. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Buscar un archivo de configuración Synergy + Browse for a barriers config file + Buscar un archivo de configuración Barrier - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - &Acerca de Synergy... + &About Barrier... + &Acerca de Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Configurar Synergy + Setup Barrier + Configurar Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Configuraciones Synergy (*.sgc);;Todos los archivos (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Configuraciones Barrier (*.sgc);;Todos los archivos (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Configuraciones Synergy (*.conf);;Todos los archivos (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Configuraciones Barrier (*.conf);;Todos los archivos (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Elige el diseño de rejilla para la configuración de tu servidor Synergy. + Configure the layout of your barrier server configuration. + Elige el diseño de rejilla para la configuración de tu servidor Barrier. @@ -1046,16 +1046,16 @@ Haz doble click sobre una pantalla para modificar sus ajustes. - Elevate Synergy - Elevar a Synergy + Elevate Barrier + Elevar a Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - ¿Estás seguro que quieres elevar a Synergy? -Esto permitirá que puedas interactuar con procesos elevados y el cuadro de diálogo de UAC, pero puede causar problemas con procesos no elevados. Eleva a Synergy solo si realmente lo necesitas. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + ¿Estás seguro que quieres elevar a Barrier? +Esto permitirá que puedas interactuar con procesos elevados y el cuadro de diálogo de UAC, pero puede causar problemas con procesos no elevados. Eleva a Barrier solo si realmente lo necesitas. @@ -1171,8 +1171,8 @@ Esto permitirá que puedas interactuar con procesos elevados y el cuadro de diá SetupWizard - Setup Synergy - Configurar Synergy + Setup Barrier + Configurar Barrier @@ -1189,8 +1189,8 @@ Esto permitirá que puedas interactuar con procesos elevados y el cuadro de diá SetupWizardBase - Setup Synergy - Configurar Synergy + Setup Barrier + Configurar Barrier @@ -1199,13 +1199,13 @@ Esto permitirá que puedas interactuar con procesos elevados y el cuadro de diá - Thanks for installing Synergy! - ¡Gracias por instalar Synergy! + Thanks for installing Barrier! + ¡Gracias por instalar Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy te permite compartir fácilmente tu mouse y teclado entre múltiples computadores en tu escritorio, es Gratis y es de Código Abierto. Solo mueve tu mouse hacia los bordes de la pantalla de uno de los computadores hacia otro. Puedes incluso compartir tu portapapeles. Todo lo que necesitas es una conexión de red. Synergy es multiplataforma (funciona en Windows, Mac OS X y Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier te permite compartir fácilmente tu mouse y teclado entre múltiples computadores en tu escritorio, es Gratis y es de Código Abierto. Solo mueve tu mouse hacia los bordes de la pantalla de uno de los computadores hacia otro. Puedes incluso compartir tu portapapeles. Todo lo que necesitas es una conexión de red. Barrier es multiplataforma (funciona en Windows, Mac OS X y Linux). @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_et-EE.ts b/src/gui/res/lang/gui_et-EE.ts index 35ae3719..28b79755 100644 --- a/src/gui/res/lang/gui_et-EE.ts +++ b/src/gui/res/lang/gui_et-EE.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Synergy'st + About Barrier + Barrier'st @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>Teie Synergy versioon on aegunud . Uus versioon <b>%1</b> on saadaval <a href="%2">allalaadimiseks</a>.</p> + <p>Teie Barrier versioon on aegunud . Uus versioon <b>%1</b> on saadaval <a href="%2">allalaadimiseks</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Synergy klienti ei leitud + Barrier client not found + Barrier klienti ei leitud - The executable for the synergy client does not exist. - Synergy kliendi käivitusfaili ei leitud. + The executable for the barrier client does not exist. + Barrier kliendi käivitusfaili ei leitud. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Palun sisestage tugijaama nimi millega synergy klient peab ühenduma. + Please fill in a hostname for the barrier client to connect to. + Palun sisestage tugijaama nimi millega barrier klient peab ühenduma. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Synergy käivitamiseks vajaliku ajutise seadete faili kirjutamine ebaõnnestus. + The temporary configuration file required to start barrier can not be written. + Barrier käivitamiseks vajaliku ajutise seadete faili kirjutamine ebaõnnestus. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Te pole valinud korrektset seadete faili synergy serverile. Kas soovite valida seadete faili nüüd? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Te pole valinud korrektset seadete faili barrier serverile. Kas soovite valida seadete faili nüüd? - Synergy server not found - Synergy serverit ei leitud + Barrier server not found + Barrier serverit ei leitud - The executable for the synergy server does not exist. - Synergy serveri käivitusfaili ei leitud. + The executable for the barrier server does not exist. + Barrier serveri käivitusfaili ei leitud. - Synergy terminated with an error - Synergy katkestas töö veateatega + Barrier terminated with an error + Barrier katkestas töö veateatega - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy katkestas ootamatul töö veateatega %1.<br><br>Täpsema info saamiseks kontrollige väljundlogi. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier katkestas ootamatul töö veateatega %1.<br><br>Täpsema info saamiseks kontrollige väljundlogi. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy käivitub. + Barrier is starting. + Barrier käivitub. - Synergy is running. - Synergy töötab + Barrier is running. + Barrier töötab - Synergy is not running. - Synergy ei tööta. + Barrier is not running. + Barrier ei tööta. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Vali synergy seadete fail + Browse for a barriers config file + Vali barrier seadete fail - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Synergy'st... + &About Barrier... + Barrier'st... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Synergy seadistamine + Setup Barrier + Barrier seadistamine @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergy seaded (*.sgc);;kõik failid (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrier seaded (*.sgc);;kõik failid (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy seaded (*.conf);;Kõik failid (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier seaded (*.conf);;Kõik failid (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Seadista synergy serveri paigutuse seadeid. + Configure the layout of your barrier server configuration. + Seadista barrier serveri paigutuse seadeid. @@ -1046,16 +1046,16 @@ Ekraani seadete muutmiseks tee sellel topeltklõps. - Elevate Synergy - Synergy ülendamine + Elevate Barrier + Barrier ülendamine - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Kas soovite kindlasti Synergy't ülendada? -See võimaldab Synergy'l toimetada ülendatud protsessidega ja UAC dialoogiga, kuid võib tekitada probleeme ülendamata protsessidega. Ülendage Synergy ainult kindlal vajadusel. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Kas soovite kindlasti Barrier't ülendada? +See võimaldab Barrier'l toimetada ülendatud protsessidega ja UAC dialoogiga, kuid võib tekitada probleeme ülendamata protsessidega. Ülendage Barrier ainult kindlal vajadusel. @@ -1170,8 +1170,8 @@ See võimaldab Synergy'l toimetada ülendatud protsessidega ja UAC dialoogiga, k SetupWizard - Setup Synergy - Synergy seadistamine + Setup Barrier + Barrier seadistamine @@ -1188,8 +1188,8 @@ See võimaldab Synergy'l toimetada ülendatud protsessidega ja UAC dialoogiga, k SetupWizardBase - Setup Synergy - Synergy seadistamine + Setup Barrier + Barrier seadistamine @@ -1198,13 +1198,13 @@ See võimaldab Synergy'l toimetada ülendatud protsessidega ja UAC dialoogiga, k - Thanks for installing Synergy! + Thanks for installing Barrier! Täname, et installeerisid Sünergia! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy võimaldab lihtsalt jagada oma klaviatuuri ja hiirt mitme arvuti vahel, see on tasuta ja vabavaraline. Lihtsalt liiguta oma hiir üle ühe arvuti ekraaniserva teise arvuti ekraanile. Võite isegi jagada kõiki oma lõikepuhvreid. Vajad vaid võrgu ühendust. Synergy't saab kasutada erinevates operatsioonisüsteemides (Windows, Mac OS X ja Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier võimaldab lihtsalt jagada oma klaviatuuri ja hiirt mitme arvuti vahel, see on tasuta ja vabavaraline. Lihtsalt liiguta oma hiir üle ühe arvuti ekraaniserva teise arvuti ekraanile. Võite isegi jagada kõiki oma lõikepuhvreid. Vajad vaid võrgu ühendust. Barrier't saab kasutada erinevates operatsioonisüsteemides (Windows, Mac OS X ja Linux). @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_fi.ts b/src/gui/res/lang/gui_fi.ts index 046bbc8b..21c265f2 100644 --- a/src/gui/res/lang/gui_fi.ts +++ b/src/gui/res/lang/gui_fi.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Tietoa Synergystä + About Barrier + Tietoa Barrierstä @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>Synergy versiosi on vanhentunut. Versio <b>%1</b> on nyt saatavilla <a href="%2">ladattavaksi</a>.</p> + <p>Barrier versiosi on vanhentunut. Versio <b>%1</b> on nyt saatavilla <a href="%2">ladattavaksi</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Synergyn asiakasohjelmaa ei löydy + Barrier client not found + Barriern asiakasohjelmaa ei löydy - The executable for the synergy client does not exist. - Ajotiedosto Synergyn asiakasohjelmalle puuttuu. + The executable for the barrier client does not exist. + Ajotiedosto Barriern asiakasohjelmalle puuttuu. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Täytä isäntänimellä johon Synergy voi yhdistää. + Please fill in a hostname for the barrier client to connect to. + Täytä isäntänimellä johon Barrier voi yhdistää. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Väliaikaista Synergyn vaatimaa asetustiedostoa ei voida luoda. + The temporary configuration file required to start barrier can not be written. + Väliaikaista Barriern vaatimaa asetustiedostoa ei voida luoda. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Et ole määrittänyt kelvollista asetustiedostoa Synergy palvelimelle. Haluatko määrittää asetustiedoston sijainnin nyt? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Et ole määrittänyt kelvollista asetustiedostoa Barrier palvelimelle. Haluatko määrittää asetustiedoston sijainnin nyt? - Synergy server not found - Synergy palvelinta ei löydy + Barrier server not found + Barrier palvelinta ei löydy - The executable for the synergy server does not exist. - Ajotiedosto Synergy palvelimelle puuttuu. + The executable for the barrier server does not exist. + Ajotiedosto Barrier palvelimelle puuttuu. - Synergy terminated with an error - Synergy suljettiin virheen vuoksi + Barrier terminated with an error + Barrier suljettiin virheen vuoksi - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy suljettiin odottamattomasti paluukoodilla %1.<br><br>Tarkista lokitiedosto saadaksesi lisätietoja. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier suljettiin odottamattomasti paluukoodilla %1.<br><br>Tarkista lokitiedosto saadaksesi lisätietoja. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy käynnistyy. + Barrier is starting. + Barrier käynnistyy. - Synergy is running. - Synergy on käynnissä. + Barrier is running. + Barrier on käynnissä. - Synergy is not running. - Synergy ei ole käynnissä. + Barrier is not running. + Barrier ei ole käynnissä. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Määritä Synergyn asetustiedosto + Browse for a barriers config file + Määritä Barriern asetustiedosto - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Tietoa Synergystä + &About Barrier... + Tietoa Barrierstä @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Määritä Synergy + Setup Barrier + Määritä Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergy Configuration (*.sgc);;Kaikki tiedostot (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrier Configuration (*.sgc);;Kaikki tiedostot (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy Configuration (*.conf);;Kaikki tiedostot (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier Configuration (*.conf);;Kaikki tiedostot (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Määritä Synergy-palvelimen näyttöasetukset + Configure the layout of your barrier server configuration. + Määritä Barrier-palvelimen näyttöasetukset @@ -1046,16 +1046,16 @@ Kaksoisnapsauta näyttöä muokataksesi sen asetuksia. - Elevate Synergy - Korota Synergy + Elevate Barrier + Korota Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Oletko varma, että haluat korottaa Synergyn? -Tämä mahdollistaa Synergyn käyttämisen korotetuissa prosesseissa ja UAC-dialogeissa, mutta voi aiheuttaa ongelma korottamattomissa prosesseissa. Korota Synergy vain jos se on välttämätöntä. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Oletko varma, että haluat korottaa Barriern? +Tämä mahdollistaa Barriern käyttämisen korotetuissa prosesseissa ja UAC-dialogeissa, mutta voi aiheuttaa ongelma korottamattomissa prosesseissa. Korota Barrier vain jos se on välttämätöntä. @@ -1170,8 +1170,8 @@ Tämä mahdollistaa Synergyn käyttämisen korotetuissa prosesseissa ja UAC-dial SetupWizard - Setup Synergy - Määritä Synergy + Setup Barrier + Määritä Barrier @@ -1188,8 +1188,8 @@ Tämä mahdollistaa Synergyn käyttämisen korotetuissa prosesseissa ja UAC-dial SetupWizardBase - Setup Synergy - Määritä Synergy + Setup Barrier + Määritä Barrier @@ -1198,13 +1198,13 @@ Tämä mahdollistaa Synergyn käyttämisen korotetuissa prosesseissa ja UAC-dial - Thanks for installing Synergy! - Kiitos, että asensit Synergyn! + Thanks for installing Barrier! + Kiitos, että asensit Barriern! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergyn avulla voit helposti jakaa hiiren ja näppäimistösi usean tietokoneen välillä, ja se on ilmainen ja avointa lähdekoodia. Liikuta hiiresi vain näytön reunan yli toiselle koneelle. Voit jopa jakaa leikepöytäsi. Tarvitset vain internet yhteyden. Synergy on cross-platform ( toimii Windows, Mac OS X ja Linuxissa). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barriern avulla voit helposti jakaa hiiren ja näppäimistösi usean tietokoneen välillä, ja se on ilmainen ja avointa lähdekoodia. Liikuta hiiresi vain näytön reunan yli toiselle koneelle. Voit jopa jakaa leikepöytäsi. Tarvitset vain internet yhteyden. Barrier on cross-platform ( toimii Windows, Mac OS X ja Linuxissa). @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_fr.ts b/src/gui/res/lang/gui_fr.ts index 0b5ebecc..83da1ffd 100644 --- a/src/gui/res/lang/gui_fr.ts +++ b/src/gui/res/lang/gui_fr.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - À propos de Synergy + About Barrier + À propos de Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>Votre version de Synergy est périmée. La version <b>%1</b> est désormais disponible au <a href="%2">téléchargement</a>.</p> + <p>Votre version de Barrier est périmée. La version <b>%1</b> est désormais disponible au <a href="%2">téléchargement</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Le client Synergy n'est pas détecté + Barrier client not found + Le client Barrier n'est pas détecté - The executable for the synergy client does not exist. - L’exécutable du client Synergy n'existe pas + The executable for the barrier client does not exist. + L’exécutable du client Barrier n'existe pas @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Veuillez renseigner un nom d'hôte auquel le client Synergy doit se connecter + Please fill in a hostname for the barrier client to connect to. + Veuillez renseigner un nom d'hôte auquel le client Barrier doit se connecter @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Impossible d'écrire le fichier temporaire de configuration, nécessaire au lancement de synergy. + The temporary configuration file required to start barrier can not be written. + Impossible d'écrire le fichier temporaire de configuration, nécessaire au lancement de barrier. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Le fichier de configuration du serveur synergy n'est pas correct. Voulez vous visualiser ce fichier ? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Le fichier de configuration du serveur barrier n'est pas correct. Voulez vous visualiser ce fichier ? - Synergy server not found - Le serveur Synergy n'a pas été détecté + Barrier server not found + Le serveur Barrier n'a pas été détecté - The executable for the synergy server does not exist. - L'exécutable du serveur Synergy n'existe pas. + The executable for the barrier server does not exist. + L'exécutable du serveur Barrier n'existe pas. - Synergy terminated with an error - Synergy s'est arrêté suite à une erreur + Barrier terminated with an error + Barrier s'est arrêté suite à une erreur - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy s'est terminé de façon inattendue avec le code d'erreur %1.<br><br> Vous trouverez plus de détails dans le fichier journal. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier s'est terminé de façon inattendue avec le code d'erreur %1.<br><br> Vous trouverez plus de détails dans le fichier journal. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy est en train de démarrer + Barrier is starting. + Barrier est en train de démarrer - Synergy is running. - Synergy est en cours d'exécution + Barrier is running. + Barrier est en cours d'exécution - Synergy is not running. - Synergy n'est pas en train de s'exécuter + Barrier is not running. + Barrier n'est pas en train de s'exécuter @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Parcourir pour rechercher un fichier de configuration synergys + Browse for a barriers config file + Parcourir pour rechercher un fichier de configuration barriers - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - À &propos de Synergy + &About Barrier... + À &propos de Barrier @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Installer Synergy + Setup Barrier + Installer Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Configuration Synergy (*.sgc);; Tous les fichiers (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Configuration Barrier (*.sgc);; Tous les fichiers (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. Configurer l'organisation de votre configuration serveur @@ -1046,16 +1046,16 @@ Double cliquer sur un écran pour modifier ses réglages. - Elevate Synergy - Élever Synergy + Elevate Barrier + Élever Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Êtes-vous sûr de vouloir élever Synergy&nbsp;? -Ceci autorise Synergy à interagir avec les processus élevés et le dialogue UAC, mais peut poser des problèmes avec les processus non-élevés. N'élevez Synergy que si cela est nécessaire. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Êtes-vous sûr de vouloir élever Barrier&nbsp;? +Ceci autorise Barrier à interagir avec les processus élevés et le dialogue UAC, mais peut poser des problèmes avec les processus non-élevés. N'élevez Barrier que si cela est nécessaire. @@ -1170,8 +1170,8 @@ Ceci autorise Synergy à interagir avec les processus élevés et le dialogue UA SetupWizard - Setup Synergy - Installer Synergy + Setup Barrier + Installer Barrier @@ -1188,8 +1188,8 @@ Ceci autorise Synergy à interagir avec les processus élevés et le dialogue UA SetupWizardBase - Setup Synergy - Installer Synergy + Setup Barrier + Installer Barrier @@ -1198,13 +1198,13 @@ Ceci autorise Synergy à interagir avec les processus élevés et le dialogue UA - Thanks for installing Synergy! - Merci d'avoir installé Synergy ! + Thanks for installing Barrier! + Merci d'avoir installé Barrier ! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy vous permet de partager facilement votre souris et votre clavier entre plusieurs ordinateurs. Il est libre et Open Source. Il suffit de déplacer la souris d'un ordinateur à l'autre en passant par leurs bords, comme pour passer d'un écran à l'autre en multi-écran. Vous pouvez même partager les presse-papiers (copier-coller). Tout ce qu'il faut est une connexion réseau. Synergy est multi-plateforme (fonctionne sur Windows, Mac OS X et Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier vous permet de partager facilement votre souris et votre clavier entre plusieurs ordinateurs. Il est libre et Open Source. Il suffit de déplacer la souris d'un ordinateur à l'autre en passant par leurs bords, comme pour passer d'un écran à l'autre en multi-écran. Vous pouvez même partager les presse-papiers (copier-coller). Tout ce qu'il faut est une connexion réseau. Barrier est multi-plateforme (fonctionne sur Windows, Mac OS X et Linux). @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_gl.ts b/src/gui/res/lang/gui_gl.ts index 66036a03..86028b34 100644 --- a/src/gui/res/lang/gui_gl.ts +++ b/src/gui/res/lang/gui_gl.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Acerca de Synergy + About Barrier + Acerca de Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>A súa versión de Synergy está desactualizada. A versión <b>%1</b> xa está dispoñible para <a href="%2">descargar</a>.</p> + <p>A súa versión de Barrier está desactualizada. A versión <b>%1</b> xa está dispoñible para <a href="%2">descargar</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found - Cliente de Synergy non atopado + Barrier client not found + Cliente de Barrier non atopado - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found - Servidor de Synergy non atopado + Barrier server not found + Servidor de Barrier non atopado - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy está a iniciarse. + Barrier is starting. + Barrier está a iniciarse. - Synergy is running. - Synergy está a executarse. + Barrier is running. + Barrier está a executarse. - Synergy is not running. - Synergy non se está a executar. + Barrier is not running. + Barrier non se está a executar. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - &Acerca de Synergy + &About Barrier... + &Acerca de Barrier @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,12 +1195,12 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). @@ -1387,8 +1387,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_grk.ts b/src/gui/res/lang/gui_grk.ts index 5d06431d..11a8ce99 100644 --- a/src/gui/res/lang/gui_grk.ts +++ b/src/gui/res/lang/gui_grk.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Σχετικά με το Synergy + About Barrier + Σχετικά με το Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,13 +1195,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Το Synergy σας αφήνει με εύκολο τρόπο να μοιράσετε το ποντίκι και το πληκτρολόγιο ανάμεσα σε πολλαπλούς υπολογιστές στο γραφείο σας, είναι Δωρεάν και Ανοιχτού Κώδικα. Απλά μετακινείστε το ποντίκι στην άκρη της μιας οθόνης στην άλλη. Μπορείτε να μοιράσετε ακόμα και όλα τα clipboards. Το μόνο που χρειάζεται μία σύνδεση δικτύου. Το Synergy λειτουργεί σε πολλαπλές πλατφόρμες (δουλεύει σε Windows, Mac OS X και Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Το Barrier σας αφήνει με εύκολο τρόπο να μοιράσετε το ποντίκι και το πληκτρολόγιο ανάμεσα σε πολλαπλούς υπολογιστές στο γραφείο σας, είναι Δωρεάν και Ανοιχτού Κώδικα. Απλά μετακινείστε το ποντίκι στην άκρη της μιας οθόνης στην άλλη. Μπορείτε να μοιράσετε ακόμα και όλα τα clipboards. Το μόνο που χρειάζεται μία σύνδεση δικτύου. Το Barrier λειτουργεί σε πολλαπλές πλατφόρμες (δουλεύει σε Windows, Mac OS X και Linux). @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_he.ts b/src/gui/res/lang/gui_he.ts index b4e81210..ae0261b1 100644 --- a/src/gui/res/lang/gui_he.ts +++ b/src/gui/res/lang/gui_he.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - אודות Synergy + About Barrier + אודות Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - לקוח Synergy לא נמצא + Barrier client not found + לקוח Barrier לא נמצא - The executable for the synergy client does not exist. - תוכנת הלקוח של Synergy לא קיימת. + The executable for the barrier client does not exist. + תוכנת הלקוח של Barrier לא קיימת. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - אנא ציין שם מחשב שלקוח Synergy יתחבר אליו. + Please fill in a hostname for the barrier client to connect to. + אנא ציין שם מחשב שלקוח Barrier יתחבר אליו. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - לא ניתן לכתוב לקובץ ההגדרות הזמני. הדבר הכרחי על מנת להפעיל את Synergy. + The temporary configuration file required to start barrier can not be written. + לא ניתן לכתוב לקובץ ההגדרות הזמני. הדבר הכרחי על מנת להפעיל את Barrier. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found - שרת ה-Synergy לא נמצא. + Barrier server not found + שרת ה-Barrier לא נמצא. - The executable for the synergy server does not exist. - תוכנת השרת של Synergy לא נמצאה. + The executable for the barrier server does not exist. + תוכנת השרת של Barrier לא נמצאה. - Synergy terminated with an error - Synergy נסגרה עם שגיאה. + Barrier terminated with an error + Barrier נסגרה עם שגיאה. - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy נסגרה באופן לא צפוי עם שגיאה מספר %1.<br><br>לפרטים נוספים, פנו לקובץ התיעוד (לוג). + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier נסגרה באופן לא צפוי עם שגיאה מספר %1.<br><br>לפרטים נוספים, פנו לקובץ התיעוד (לוג). @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy מאתחל + Barrier is starting. + Barrier מאתחל - Synergy is running. - Synergy רץ ברקע + Barrier is running. + Barrier רץ ברקע - Synergy is not running. - Synergy לא רץ + Barrier is not running. + Barrier לא רץ @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - מציאת קובץ הגדרות של Synergy + Browse for a barriers config file + מציאת קובץ הגדרות של Barrier - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - הגדרת Synergy + Setup Barrier + הגדרת Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - קבצי הגדרות של Synergy (*.sgc);;All Files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + קבצי הגדרות של Barrier (*.sgc);;All Files (*.*) - Synergy Configurations (*.conf);;All files (*.*) - קבצי הגדרות של Synergy (*.conf);;All Files (*.*) + Barrier Configurations (*.conf);;All files (*.*) + קבצי הגדרות של Barrier (*.conf);;All Files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,8 +1167,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - הגדרת Synergy + Setup Barrier + הגדרת Barrier @@ -1185,8 +1185,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - הגדרת Synergy + Setup Barrier + הגדרת Barrier @@ -1195,13 +1195,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy מאפשרת לשתף בקלות את העכבר והמקלדת בין מספר מחשבים על השולחן, וזה חופשית וקוד פתוח. רק להזיז את העכבר מקצה מסך אחד של המחשב לאחר. אתה יכול גם לשתף את כל לוחות כתיבה שלך. כל מה שצריך הוא חיבור לרשת. סינרגיה היא חוצה פלטפורמות (עובד ב-Windows, Mac OS X ו-Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier מאפשרת לשתף בקלות את העכבר והמקלדת בין מספר מחשבים על השולחן, וזה חופשית וקוד פתוח. רק להזיז את העכבר מקצה מסך אחד של המחשב לאחר. אתה יכול גם לשתף את כל לוחות כתיבה שלך. כל מה שצריך הוא חיבור לרשת. סינרגיה היא חוצה פלטפורמות (עובד ב-Windows, Mac OS X ו-Linux). @@ -1387,8 +1387,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_hi.ts b/src/gui/res/lang/gui_hi.ts index ccc4872c..7d16c696 100644 --- a/src/gui/res/lang/gui_hi.ts +++ b/src/gui/res/lang/gui_hi.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,12 +1195,12 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_hr-HR.ts b/src/gui/res/lang/gui_hr-HR.ts index 26e0249a..bcf318b2 100644 --- a/src/gui/res/lang/gui_hr-HR.ts +++ b/src/gui/res/lang/gui_hr-HR.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - O Synergyu + About Barrier + O Barrieru @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Synergy klijent nije pronađen + Barrier client not found + Barrier klijent nije pronađen - The executable for the synergy client does not exist. - Izvršna datoteka synergy klijenta ne postoji. + The executable for the barrier client does not exist. + Izvršna datoteka barrier klijenta ne postoji. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Upišite naziv računala synergy klijenta na koji se spajate. + Please fill in a hostname for the barrier client to connect to. + Upišite naziv računala barrier klijenta na koji se spajate. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Privremena datoteka postavki potrebna za pokretanje synergya ne može biti zapisana. + The temporary configuration file required to start barrier can not be written. + Privremena datoteka postavki potrebna za pokretanje barriera ne može biti zapisana. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Niste odabrali valjanu datoteku postavki za synergy poslužitelj. Želite li sada odabrati datoteku postavki? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Niste odabrali valjanu datoteku postavki za barrier poslužitelj. Želite li sada odabrati datoteku postavki? - Synergy server not found - Synergy poslužitelj nije pronađen + Barrier server not found + Barrier poslužitelj nije pronađen - The executable for the synergy server does not exist. - Izvršna datoteka synergy poslužitelja ne postoji. + The executable for the barrier server does not exist. + Izvršna datoteka barrier poslužitelja ne postoji. - Synergy terminated with an error - Synergy je prestao sa radom zbog greške + Barrier terminated with an error + Barrier je prestao sa radom zbog greške - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy je neočekivano prestao sa radom, s izlaznim kodom of %1.<br><br>Pogledajte izlazni zapis za više pojedinosti. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier je neočekivano prestao sa radom, s izlaznim kodom of %1.<br><br>Pogledajte izlazni zapis za više pojedinosti. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy se pokreće. + Barrier is starting. + Barrier se pokreće. - Synergy is running. - Synergy je pokrenut. + Barrier is running. + Barrier je pokrenut. - Synergy is not running. - Synergy nije pokrenut. + Barrier is not running. + Barrier nije pokrenut. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Odaberite synergy datoteku postavki + Browse for a barriers config file + Odaberite barrier datoteku postavki - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - &O Synergyu... + &About Barrier... + &O Barrieru... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Podesite Synergy + Setup Barrier + Podesite Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergy postavke (*.sgc);;Sve datoteke (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrier postavke (*.sgc);;Sve datoteke (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy postavke (*.conf);;Sve datoteke (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier postavke (*.conf);;Sve datoteke (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Podesite izlaz vašeg synergy poslužitelja. + Configure the layout of your barrier server configuration. + Podesite izlaz vašeg barrier poslužitelja. @@ -1046,16 +1046,16 @@ Za uređivanje postavki dvostruko kliknite na zaslon. - Elevate Synergy - UAC ovlasti Synergya + Elevate Barrier + UAC ovlasti Barriera - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Sigurno želite dati UAC ovlasti Synergyu? -To omogućuje Synergyu interakciju s ovlaštenim procesima i UAC dijalogom, ali može uzrokovati probleme s neovlaštenim procesima. Dajte ovlasti Synergyu samo ako je stvarno potrebno. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Sigurno želite dati UAC ovlasti Barrieru? +To omogućuje Barrieru interakciju s ovlaštenim procesima i UAC dijalogom, ali može uzrokovati probleme s neovlaštenim procesima. Dajte ovlasti Barrieru samo ako je stvarno potrebno. @@ -1170,8 +1170,8 @@ To omogućuje Synergyu interakciju s ovlaštenim procesima i UAC dijalogom, ali SetupWizard - Setup Synergy - Podesite Synergy + Setup Barrier + Podesite Barrier @@ -1188,8 +1188,8 @@ To omogućuje Synergyu interakciju s ovlaštenim procesima i UAC dijalogom, ali SetupWizardBase - Setup Synergy - Podesite Synergy + Setup Barrier + Podesite Barrier @@ -1198,13 +1198,13 @@ To omogućuje Synergyu interakciju s ovlaštenim procesima i UAC dijalogom, ali - Thanks for installing Synergy! - Hvala što ste instalirali Synergy! + Thanks for installing Barrier! + Hvala što ste instalirali Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy vam omogućuje lagano dijeljenje vašg miša i tipkovnice između više računala na vašoj radnoj površini. Synergy je besplatan i otvorenog kôda. Jednostavno pomaknite vaš miš preko ruba zaslona jednog računala na zaslon drugog računala. Čak možete dijeliti sve vaše međuspremnike. Sve što trebate je Internet veza. Synergy je više platformska aplikacija (radi na Windowsima, Mac OS X i Linuxu). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier vam omogućuje lagano dijeljenje vašg miša i tipkovnice između više računala na vašoj radnoj površini. Barrier je besplatan i otvorenog kôda. Jednostavno pomaknite vaš miš preko ruba zaslona jednog računala na zaslon drugog računala. Čak možete dijeliti sve vaše međuspremnike. Sve što trebate je Internet veza. Barrier je više platformska aplikacija (radi na Windowsima, Mac OS X i Linuxu). @@ -1390,8 +1390,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_hu-HU.ts b/src/gui/res/lang/gui_hu-HU.ts index f21be596..d287892b 100644 --- a/src/gui/res/lang/gui_hu-HU.ts +++ b/src/gui/res/lang/gui_hu-HU.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Synergy névjegy + About Barrier + Barrier névjegy @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Synergy kliens nem található + Barrier client not found + Barrier kliens nem található - The executable for the synergy client does not exist. - A Synergy kliens futtatható állománya nem található. + The executable for the barrier client does not exist. + A Barrier kliens futtatható állománya nem található. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Kérjük adja meg a Synergy kliens gép nevét a csatlakozáshoz. + Please fill in a hostname for the barrier client to connect to. + Kérjük adja meg a Barrier kliens gép nevét a csatlakozáshoz. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Az ideiglenes konfigurációs fájl, amely szükséges a Synergy indításához, nem jött létre. + The temporary configuration file required to start barrier can not be written. + Az ideiglenes konfigurációs fájl, amely szükséges a Barrier indításához, nem jött létre. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Nem adott meg érvényes konfigurációs fájlnevet a synergy szerveren. Meg akarja keresni a konfigurációs fájlt most? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Nem adott meg érvényes konfigurációs fájlnevet a barrier szerveren. Meg akarja keresni a konfigurációs fájlt most? - Synergy server not found - Synergy szerver nem elérhető + Barrier server not found + Barrier szerver nem elérhető - The executable for the synergy server does not exist. - A Synergy szerver futtatható állománya nem található. + The executable for the barrier server does not exist. + A Barrier szerver futtatható állománya nem található. - Synergy terminated with an error - A Synergy hibát jelzett, ezért leállt + Barrier terminated with an error + A Barrier hibát jelzett, ezért leállt - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - A Synergy a következő hibakóddal lépet ki: %1.<br><br>A részletekért tekintse meg a naplót. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + A Barrier a következő hibakóddal lépet ki: %1.<br><br>A részletekért tekintse meg a naplót. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - A Synergy indul. + Barrier is starting. + A Barrier indul. - Synergy is running. - A Synergy fut + Barrier is running. + A Barrier fut - Synergy is not running. - A Synergy nem fut. + Barrier is not running. + A Barrier nem fut. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - A Synergy konfigurációs fájl kijelölése + Browse for a barriers config file + A Barrier konfigurációs fájl kijelölése - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Synergy névjegy... + &About Barrier... + Barrier névjegy... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Synergy beállítás + Setup Barrier + Barrier beállítás @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergy konfiguráció (*.sgc);;Minden fájl (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrier konfiguráció (*.sgc);;Minden fájl (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy konfiguráció (*.conf);;Minden fájl (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier konfiguráció (*.conf);;Minden fájl (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. + Configure the layout of your barrier server configuration. @@ -1046,14 +1046,14 @@ Dupla kattintással szerkesztheti a beállításokat. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1169,8 +1169,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - Synergy beállítás + Setup Barrier + Barrier beállítás @@ -1187,8 +1187,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - Synergy beállítás + Setup Barrier + Barrier beállítás @@ -1197,13 +1197,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - A Synergy lehetővé teszi a billentyűzet és egér megosztását több számítógép között és ráadásul Ingyenes és nyílt forráskódú. Csak mozgassa az egeret a képernyő szélére, hogy átkerüljön a másik számítógépe monitorára. A számítógépek között a vágólap is megosztásra kerül. Nincs másra szüksége csak hálózati kapcsolatra a két számítógép között. A Synergy operációs rendszer független, így használhatja Windows, Mac OS X és Linux rendszerű számítógéppel. + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + A Barrier lehetővé teszi a billentyűzet és egér megosztását több számítógép között és ráadásul Ingyenes és nyílt forráskódú. Csak mozgassa az egeret a képernyő szélére, hogy átkerüljön a másik számítógépe monitorára. A számítógépek között a vágólap is megosztásra kerül. Nincs másra szüksége csak hálózati kapcsolatra a két számítógép között. A Barrier operációs rendszer független, így használhatja Windows, Mac OS X és Linux rendszerű számítógéppel. @@ -1389,8 +1389,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_id.ts b/src/gui/res/lang/gui_id.ts index 36219187..26f5e418 100644 --- a/src/gui/res/lang/gui_id.ts +++ b/src/gui/res/lang/gui_id.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Tentang Synergy + About Barrier + Tentang Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Memulai Synergy. + Barrier is starting. + Memulai Barrier. - Synergy is running. + Barrier is running. - Synergy is not running. - Synergy tidak berjalan. + Barrier is not running. + Barrier tidak berjalan. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,13 +1195,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy akan mempermudah dalam membagi tetikus dan papan ketik diantara beberapa komputer yang berlainan, dan ini adalah software bebas dan bersumber terbuka. Hanya dengan menggeser tetikus ke pojok layar komputer maka akan berpindah ke layar komputer lainnya. Bahkan kamu dapat membagikan clipboard kamu. Yang kamu butuhkan hanya koneksi jaringan. Synerg adalah program yang dapat berjalan di beberapa Operating System yang berbeda. + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier akan mempermudah dalam membagi tetikus dan papan ketik diantara beberapa komputer yang berlainan, dan ini adalah software bebas dan bersumber terbuka. Hanya dengan menggeser tetikus ke pojok layar komputer maka akan berpindah ke layar komputer lainnya. Bahkan kamu dapat membagikan clipboard kamu. Yang kamu butuhkan hanya koneksi jaringan. Synerg adalah program yang dapat berjalan di beberapa Operating System yang berbeda. @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_is-IS.ts b/src/gui/res/lang/gui_is-IS.ts index 7dd22051..e04cb283 100644 --- a/src/gui/res/lang/gui_is-IS.ts +++ b/src/gui/res/lang/gui_is-IS.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,12 +1195,12 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_it.ts b/src/gui/res/lang/gui_it.ts index fb83ab6b..9bf62fbe 100644 --- a/src/gui/res/lang/gui_it.ts +++ b/src/gui/res/lang/gui_it.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Riguardo a Synergy + About Barrier + Riguardo a Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - La componente client di Synergy non è stata individuata + Barrier client not found + La componente client di Barrier non è stata individuata - The executable for the synergy client does not exist. - L'eseguibile per il client di Synergy non esiste. + The executable for the barrier client does not exist. + L'eseguibile per il client di Barrier non esiste. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Si prega di completare il nome macchina per permettere al client Synergy di connettercisi. + Please fill in a hostname for the barrier client to connect to. + Si prega di completare il nome macchina per permettere al client Barrier di connettercisi. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Il file temporaneo di configurazione necessario ad avviare Synergy non puo' essere scritto. + The temporary configuration file required to start barrier can not be written. + Il file temporaneo di configurazione necessario ad avviare Barrier non puo' essere scritto. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Non hai specificato un nome di file di configurazione valido per la componente server di Synergy. Vuoi sfogliare il contenuto del tuo computer per il trovare il file di configurazione ora? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Non hai specificato un nome di file di configurazione valido per la componente server di Barrier. Vuoi sfogliare il contenuto del tuo computer per il trovare il file di configurazione ora? - Synergy server not found - La componente server di Synergy non è stata trovata + Barrier server not found + La componente server di Barrier non è stata trovata - The executable for the synergy server does not exist. - L'eseguibile per il server Synergy non esiste. + The executable for the barrier server does not exist. + L'eseguibile per il server Barrier non esiste. - Synergy terminated with an error - Synergy si è chiuso con un errore + Barrier terminated with an error + Barrier si è chiuso con un errore - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy si è chiuso inaspettatamente con un codice di uscita di %1.<br><br> Sei pregato di visualizzare il log per maggiori dettagli. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier si è chiuso inaspettatamente con un codice di uscita di %1.<br><br> Sei pregato di visualizzare il log per maggiori dettagli. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy si sta avviando. + Barrier is starting. + Barrier si sta avviando. - Synergy is running. - Synergy è in funzione. + Barrier is running. + Barrier è in funzione. - Synergy is not running. - Synergy non è in funzione. + Barrier is not running. + Barrier non è in funzione. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Sfoglia il contenuto del tuo computer per un file di configurazione di Synergy + Browse for a barriers config file + Sfoglia il contenuto del tuo computer per un file di configurazione di Barrier - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Riguardo a Synergy... + &About Barrier... + Riguardo a Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Configura Synergy + Setup Barrier + Configura Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Configurazioni di Synergy (*.sgc);;Tutti i files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Configurazioni di Barrier (*.sgc);;Tutti i files (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Configurazioni di Synergy (*.conf);;Tutti i files (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Configurazioni di Barrier (*.conf);;Tutti i files (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Configura il layout del server Synergy + Configure the layout of your barrier server configuration. + Configura il layout del server Barrier @@ -1046,16 +1046,16 @@ Doppio click su uno schermo per modificarne le impostazioni. - Elevate Synergy - Eleva Synergy + Elevate Barrier + Eleva Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Sei sicuro di voler elevare Synergy? -Ciò consentirà a Synergy di interagire con molti processi e con il dialogo UAC,ma potrebbe casusare problemi con i processi non elevati.Eleva Synergy solo se ti serve davvero. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Sei sicuro di voler elevare Barrier? +Ciò consentirà a Barrier di interagire con molti processi e con il dialogo UAC,ma potrebbe casusare problemi con i processi non elevati.Eleva Barrier solo se ti serve davvero. @@ -1170,8 +1170,8 @@ Ciò consentirà a Synergy di interagire con molti processi e con il dialogo UAC SetupWizard - Setup Synergy - Configura Synergy + Setup Barrier + Configura Barrier @@ -1188,8 +1188,8 @@ Ciò consentirà a Synergy di interagire con molti processi e con il dialogo UAC SetupWizardBase - Setup Synergy - Configura Synergy + Setup Barrier + Configura Barrier @@ -1198,13 +1198,13 @@ Ciò consentirà a Synergy di interagire con molti processi e con il dialogo UAC - Thanks for installing Synergy! - Grazie per aver installato Synergy! + Thanks for installing Barrier! + Grazie per aver installato Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy ti permette facilmente di condividere il mouse e la tastiera tra piu' computers sulla tua scrivania, è un software Libero e Gratuito. Ti basta muovere il mouse oltre i bordi dello schermo per passare da un computer ad un altro. Puoi anche condividere la bacheca degli appunti (Copia e Incolla). Tutto cio' che serve è una connessione di rete (WiFi o LAN). Synergy è multi-piattaforma (Funziona correttamente su Windows, Mac OS X e Linux) + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier ti permette facilmente di condividere il mouse e la tastiera tra piu' computers sulla tua scrivania, è un software Libero e Gratuito. Ti basta muovere il mouse oltre i bordi dello schermo per passare da un computer ad un altro. Puoi anche condividere la bacheca degli appunti (Copia e Incolla). Tutto cio' che serve è una connessione di rete (WiFi o LAN). Barrier è multi-piattaforma (Funziona correttamente su Windows, Mac OS X e Linux) @@ -1390,8 +1390,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_ja-JP.ts b/src/gui/res/lang/gui_ja-JP.ts index efb549c4..0a17909c 100644 --- a/src/gui/res/lang/gui_ja-JP.ts +++ b/src/gui/res/lang/gui_ja-JP.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Synergyについて + About Barrier + Barrierについて @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Synergyクライアントが見つかりません + Barrier client not found + Barrierクライアントが見つかりません - The executable for the synergy client does not exist. - Synergyクライアントの実行ファイルが存在しません。 + The executable for the barrier client does not exist. + Barrierクライアントの実行ファイルが存在しません。 @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Synergyクライアントで接続するホスト名を入力してください。 + Please fill in a hostname for the barrier client to connect to. + Barrierクライアントで接続するホスト名を入力してください。 @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Synergyの開始に必要な一時的な構成ファイルを書き込めません。 + The temporary configuration file required to start barrier can not be written. + Barrierの開始に必要な一時的な構成ファイルを書き込めません。 @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Synergyサーバーの正しい構成ファイルを書き込んでいません。今、構成ファイルを閲覧しますか? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Barrierサーバーの正しい構成ファイルを書き込んでいません。今、構成ファイルを閲覧しますか? - Synergy server not found - Synergyサーバーが見つかりません + Barrier server not found + Barrierサーバーが見つかりません - The executable for the synergy server does not exist. - Synergyサーバーの実行ファイルが存在しません。 + The executable for the barrier server does not exist. + Barrierサーバーの実行ファイルが存在しません。 - Synergy terminated with an error - Synergyはエラーで終了しました + Barrier terminated with an error + Barrierはエラーで終了しました - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergyは予期しない終了コード%1で終了しました。<br><br>詳細はログの出力を参照してください。 + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrierは予期しない終了コード%1で終了しました。<br><br>詳細はログの出力を参照してください。 @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergyを開始中です。 + Barrier is starting. + Barrierを開始中です。 - Synergy is running. - Synergyは動作中です。 + Barrier is running. + Barrierは動作中です。 - Synergy is not running. - Synergyは動作していません。 + Barrier is not running. + Barrierは動作していません。 @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Synergyの設定ファイルを参照 + Browse for a barriers config file + Barrierの設定ファイルを参照 - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Synergyについて... + &About Barrier... + Barrierについて... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Synergyのセットアップ + Setup Barrier + Barrierのセットアップ @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergyの構成(*.sgc);;すべてのファイル(*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrierの構成(*.sgc);;すべてのファイル(*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergyの構成(*.conf);;すべてのファイル(*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrierの構成(*.conf);;すべてのファイル(*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. サーバ構成の配置を設定する @@ -1046,16 +1046,16 @@ Double click on a screen to edit its settings. - Elevate Synergy - Synergyの権限昇格 + Elevate Barrier + Barrierの権限昇格 - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - 本当に Synergy を昇格させてよろしいですか？ -これにより昇格されたプロセスや UAC dialog と、Synergy とが互いに作用しあうことができるようになる反面、昇格されていないプロセスとの間で問題を生じることもあり得ます。確かに必要であると判断できる場合にのみ Synergy の昇格を行ってください。 +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + 本当に Barrier を昇格させてよろしいですか？ +これにより昇格されたプロセスや UAC dialog と、Barrier とが互いに作用しあうことができるようになる反面、昇格されていないプロセスとの間で問題を生じることもあり得ます。確かに必要であると判断できる場合にのみ Barrier の昇格を行ってください。 @@ -1170,8 +1170,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - Synergyのセットアップ + Setup Barrier + Barrierのセットアップ @@ -1188,8 +1188,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - Synergyのセットアップ + Setup Barrier + Barrierのセットアップ @@ -1198,13 +1198,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! - Synergyをインストールしていただき、ありがとうございます！ + Thanks for installing Barrier! + Barrierをインストールしていただき、ありがとうございます！ - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergyは複数のコンピュータ間のマウスとキーボードを簡単に共有することができるフリーのオープンソースソフトウェアです。あるコンピュータの画面の端にマウスを移動すると別のコンピュータの画面に移ります。クリップボードを共有することもできます。必要なのは ネットワーク接続だけです。 SynergyはクロスプラットフォームでWindows, Mac OS X, Linux上で動作します。 + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrierは複数のコンピュータ間のマウスとキーボードを簡単に共有することができるフリーのオープンソースソフトウェアです。あるコンピュータの画面の端にマウスを移動すると別のコンピュータの画面に移ります。クリップボードを共有することもできます。必要なのは ネットワーク接続だけです。 BarrierはクロスプラットフォームでWindows, Mac OS X, Linux上で動作します。 @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_ko.ts b/src/gui/res/lang/gui_ko.ts index 27a8275f..89dddb4f 100644 --- a/src/gui/res/lang/gui_ko.ts +++ b/src/gui/res/lang/gui_ko.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Synergy에 대하여 + About Barrier + Barrier에 대하여 @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> <p>사용 중인 시너지는 최신 버전이 아닙니다. 새 버전(<b>%1</b>)을 <a href="%2">다운로드</a> 받을 수 있습니다.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Synergy 클라이언트를 찾을 수 없습니다. + Barrier client not found + Barrier 클라이언트를 찾을 수 없습니다. - The executable for the synergy client does not exist. - Synergy 클라이언트 실행 파일이 존재하지 않습니다. + The executable for the barrier client does not exist. + Barrier 클라이언트 실행 파일이 존재하지 않습니다. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. 클라이언트가 접속할 호스트명을 입력해주세요. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Synergy를 구동하기 위해 필요한 임시 설정 파일을 작성할 수 없습니다. + The temporary configuration file required to start barrier can not be written. + Barrier를 구동하기 위해 필요한 임시 설정 파일을 작성할 수 없습니다. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Synergy 서버를 실행하기 위한 설정 파일이 제대로 작성되어 있지 않습니다. 지금 설정 파일을 찾아 보시겠습니까? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Barrier 서버를 실행하기 위한 설정 파일이 제대로 작성되어 있지 않습니다. 지금 설정 파일을 찾아 보시겠습니까? - Synergy server not found - Synergy 서버를 찾을 수 없습니다 + Barrier server not found + Barrier 서버를 찾을 수 없습니다 - The executable for the synergy server does not exist. - Synergy 서버 실행 파일이 존재하지 않습니다. + The executable for the barrier server does not exist. + Barrier 서버 실행 파일이 존재하지 않습니다. - Synergy terminated with an error - Synergy가 오류로 인해 종료되었습니다 + Barrier terminated with an error + Barrier가 오류로 인해 종료되었습니다 - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy가 %1의 코드로 비 정상적으로 종료되었습니다.<br><br>자세한 사항은 로그 출력결과를 확인하세요 + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier가 %1의 코드로 비 정상적으로 종료되었습니다.<br><br>자세한 사항은 로그 출력결과를 확인하세요 @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy가 실행 중 입니다. + Barrier is starting. + Barrier가 실행 중 입니다. - Synergy is running. - Synergy가 실행 중 입니다. + Barrier is running. + Barrier가 실행 중 입니다. - Synergy is not running. - Synergy가 실행 중이지 않습니다. + Barrier is not running. + Barrier가 실행 중이지 않습니다. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - synergys 설정 파일 탐색 + Browse for a barriers config file + barriers 설정 파일 탐색 - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Synergy에 관하여(&A)... + &About Barrier... + Barrier에 관하여(&A)... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier 시너지 설정 @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergy 설정파일 (*.sgc);;모든 파일 (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrier 설정파일 (*.sgc);;모든 파일 (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy 설정파일 (*.conf);;모든 파일 (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier 설정파일 (*.conf);;모든 파일 (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Synergy 서버 구성과 레이아웃을 설정하세요. + Configure the layout of your barrier server configuration. + Barrier 서버 구성과 레이아웃을 설정하세요. @@ -1046,16 +1046,16 @@ Double click on a screen to edit its settings. - Elevate Synergy - Synergy 승급 + Elevate Barrier + Barrier 승급 - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Synergy의 권한을 승급 하시겠습니까? -이것을 허용하게 되면 Synergy와 승급된 프로세스, UAC 대화상자와 상호작용 할 수 있지만, 승급되지 않은 프로세스들과 문제가 생길 수 있습니다. Synergy 권한 승급은 반드시 필요한 경우에만 사용하세요. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Barrier의 권한을 승급 하시겠습니까? +이것을 허용하게 되면 Barrier와 승급된 프로세스, UAC 대화상자와 상호작용 할 수 있지만, 승급되지 않은 프로세스들과 문제가 생길 수 있습니다. Barrier 권한 승급은 반드시 필요한 경우에만 사용하세요. @@ -1170,7 +1170,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier 시너지 설정 @@ -1188,7 +1188,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier 시너지 설정 @@ -1198,13 +1198,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! 시너지를 설치하여 주셔서 감사합니다. - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy는 마우스와 키보드를 여러 컴퓨터에 쉽게 공유하여 사용할 수 있게 해주는 무료 오픈 소스 프로그램입니다. 마우스를 한쪽 컴퓨터의 화면 끝으로 옮기기만 하면 다른 컴퓨터의 화면으로 이동할 수 있으며 클립보드의 내용까지도 공유할 수 있습니다. 필요한 것은 단지 네트워크 연결 뿐이며 Synergy는 여러 플랫폼(Windows와 Mac OS X, Linux)에서 사용할 수 있습니다. + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier는 마우스와 키보드를 여러 컴퓨터에 쉽게 공유하여 사용할 수 있게 해주는 무료 오픈 소스 프로그램입니다. 마우스를 한쪽 컴퓨터의 화면 끝으로 옮기기만 하면 다른 컴퓨터의 화면으로 이동할 수 있으며 클립보드의 내용까지도 공유할 수 있습니다. 필요한 것은 단지 네트워크 연결 뿐이며 Barrier는 여러 플랫폼(Windows와 Mac OS X, Linux)에서 사용할 수 있습니다. @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_lt.ts b/src/gui/res/lang/gui_lt.ts index af48b53f..c81dbd37 100644 --- a/src/gui/res/lang/gui_lt.ts +++ b/src/gui/res/lang/gui_lt.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,13 +1195,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy leis jums dalintis jūsų pelė ir klaviatūra tarp kompiuterių ir tai nieko nekainuoja ir tai Open Source. Tiesiog perkelkite pelę iš vieno kompiuterio ekrano krašto į kitą. Netgi galite dalintis Clipbourdų. Viskas ko jums reikia, yra tinklo sujungimas. Synergy yra cross-platform dirba ant Windows, Mac OS X ir Linux. + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier leis jums dalintis jūsų pelė ir klaviatūra tarp kompiuterių ir tai nieko nekainuoja ir tai Open Source. Tiesiog perkelkite pelę iš vieno kompiuterio ekrano krašto į kitą. Netgi galite dalintis Clipbourdų. Viskas ko jums reikia, yra tinklo sujungimas. Barrier yra cross-platform dirba ant Windows, Mac OS X ir Linux. @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_lv.ts b/src/gui/res/lang/gui_lv.ts index 11216486..20e82be6 100644 --- a/src/gui/res/lang/gui_lv.ts +++ b/src/gui/res/lang/gui_lv.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,13 +1195,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy ļauj tev viegli izmantot savu peli un klaviatūru vairākos datoros vienlaicīgi, un tā ir bezmakas un atvērtā koda programma. Vienkārši virzi kursoru no viena datora ekrāna malas uz cita datora ekrānu. Arī starpliktuve var būt kopīga. Vienīgais, kas tev nepieciešams, ir tīkla savienojums. Synergy darbojas uz dažādām operētājsistēmām – Windows, OS X un Linux. + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier ļauj tev viegli izmantot savu peli un klaviatūru vairākos datoros vienlaicīgi, un tā ir bezmakas un atvērtā koda programma. Vienkārši virzi kursoru no viena datora ekrāna malas uz cita datora ekrānu. Arī starpliktuve var būt kopīga. Vienīgais, kas tev nepieciešams, ir tīkla savienojums. Barrier darbojas uz dažādām operētājsistēmām – Windows, OS X un Linux. @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_mr.ts b/src/gui/res/lang/gui_mr.ts index d4b4017d..09c35ba4 100644 --- a/src/gui/res/lang/gui_mr.ts +++ b/src/gui/res/lang/gui_mr.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier सिनर्जी बद्दल @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,12 +1195,12 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! सिनर्जी इन्स्टॉल केल्याबद्दल धन्यवाद. - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). सिनर्जी सह तुम्ही तुमचा कीबोर्ड आणि माऊस अनेक संगणकांसमवेत वापरू शकता. एका पडद्याच्या कडेतून माऊस दुसऱ्या पडद्यावर नेऊ शकता, सामाईक क्लिपबोर्ड वारू शकता. आवश्यकता आहे ती केवळ एका नेटवर्क कनेक्शनची. सिनर्जी मोफत आहे, मुक्त स्रोत आहे आणि अनेक प्रणाल्यांवर चालू शकते. (विंडोज, मॅक ओ-एस एक्स आणि लिनक्स) @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_nl-NL.ts b/src/gui/res/lang/gui_nl-NL.ts index 79b2b40b..f2ca3df4 100644 --- a/src/gui/res/lang/gui_nl-NL.ts +++ b/src/gui/res/lang/gui_nl-NL.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Over Synergy + About Barrier + Over Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p> Uw versie van Synergy is verouderd. Versie <b>%1</b> is nu beschikbaar om te <a href="%2">downloaden</a>.</p> + <p> Uw versie van Barrier is verouderd. Versie <b>%1</b> is nu beschikbaar om te <a href="%2">downloaden</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - De Synergy client is niet gevonden + Barrier client not found + De Barrier client is niet gevonden - The executable for the synergy client does not exist. - De executable voor de Synergy client bestaat niet. + The executable for the barrier client does not exist. + De executable voor de Barrier client bestaat niet. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Vul a.u.b. een hostnaam in voor de Synergy client om mee te verbinden. + Please fill in a hostname for the barrier client to connect to. + Vul a.u.b. een hostnaam in voor de Barrier client om mee te verbinden. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Het tijdelijke configuratiebestand om Synergy te starten kan niet geschreven worden. + The temporary configuration file required to start barrier can not be written. + Het tijdelijke configuratiebestand om Barrier te starten kan niet geschreven worden. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - U heeft een ongeldig configuratiebestand ingegeven voor de Synergy server. Wilt u nu een configuratiebestand opgeven? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + U heeft een ongeldig configuratiebestand ingegeven voor de Barrier server. Wilt u nu een configuratiebestand opgeven? - Synergy server not found - Synergy server is niet gevonden + Barrier server not found + Barrier server is niet gevonden - The executable for the synergy server does not exist. - De executable voor de Synergy client bestaat niet. + The executable for the barrier server does not exist. + De executable voor de Barrier client bestaat niet. - Synergy terminated with an error - Synergy werd afgesloten met een error + Barrier terminated with an error + Barrier werd afgesloten met een error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy werd onverwachts afgesloten met de volgende exit code: %1.<br><br>. Raadpleeg de log voor meer details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier werd onverwachts afgesloten met de volgende exit code: %1.<br><br>. Raadpleeg de log voor meer details. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy wordt gestart. + Barrier is starting. + Barrier wordt gestart. - Synergy is running. - Synergy is actief. + Barrier is running. + Barrier is actief. - Synergy is not running. - Synergy is niet actief. + Barrier is not running. + Barrier is niet actief. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Open een Synergy configuratiebestand + Browse for a barriers config file + Open een Barrier configuratiebestand - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - &Over Synergy... + &About Barrier... + &Over Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Synergy configureren + Setup Barrier + Barrier configureren @@ -648,18 +648,18 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergy Configuratie (*.sgc);;Alle bestanden (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrier Configuratie (*.sgc);;Alle bestanden (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy configuratie (*.conf);;Alle bestanden (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier configuratie (*.conf);;Alle bestanden (*.*) System tray is unavailable, quitting. - Taakbalk is niet beschikbaar, Synergy wordt afgesloten. + Taakbalk is niet beschikbaar, Barrier wordt afgesloten. @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. Configureer de layout voor de server configuratie. @@ -1046,15 +1046,15 @@ Dubbelklik op een scherm om zijn instellingen aan te passen. - Elevate Synergy - Verhoog Synergy's Privileges + Elevate Barrier + Verhoog Barrier's Privileges - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Weet je zeker dat je Synergy's privileges wil verhogen? Dit staat interactie toe met verhoogde processen en het UAC venster, maar kan problemen veroorzaken met niet-verhoogde processen. Verhoog Synergy alleen als het noodzakelijk is. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Weet je zeker dat je Barrier's privileges wil verhogen? Dit staat interactie toe met verhoogde processen en het UAC venster, maar kan problemen veroorzaken met niet-verhoogde processen. Verhoog Barrier alleen als het noodzakelijk is. @@ -1169,8 +1169,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - Synergy configureren + Setup Barrier + Barrier configureren @@ -1187,8 +1187,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - Synergy configureren + Setup Barrier + Barrier configureren @@ -1197,13 +1197,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! - Bedankt voor het installeren van Synergy! + Thanks for installing Barrier! + Bedankt voor het installeren van Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Met Synergy kunt u eenvoudig uw muis en toetsenbord delen tussen meerdere computers op uw bureau. Bovendien is het gratis en Open Source. Beweeg uw muis over de rand van het scherm van de ene computer naar de andere. U kunt zelfs al uw klemborden delen. Het enige wat u nodig hebt is een netwerkverbinding. Synergy is cross-platform (werkt op Windows, Mac OS X en Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Met Barrier kunt u eenvoudig uw muis en toetsenbord delen tussen meerdere computers op uw bureau. Bovendien is het gratis en Open Source. Beweeg uw muis over de rand van het scherm van de ene computer naar de andere. U kunt zelfs al uw klemborden delen. Het enige wat u nodig hebt is een netwerkverbinding. Barrier is cross-platform (werkt op Windows, Mac OS X en Linux). @@ -1392,8 +1392,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_no.ts b/src/gui/res/lang/gui_no.ts index 15f672e4..c36b1dee 100644 --- a/src/gui/res/lang/gui_no.ts +++ b/src/gui/res/lang/gui_no.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Om Synergy + About Barrier + Om Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>Din Synergy-versjon er utdatert. Versjon <b>%1</b> er nå tilgjengelig for <a href="%2">nedlasting</a>.</p> + <p>Din Barrier-versjon er utdatert. Versjon <b>%1</b> er nå tilgjengelig for <a href="%2">nedlasting</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Finner ikke Synergy klient + Barrier client not found + Finner ikke Barrier klient - The executable for the synergy client does not exist. - Programfilen for Synergy-klienten finnes ikke + The executable for the barrier client does not exist. + Programfilen for Barrier-klienten finnes ikke @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Vennligst fyll inn et vertsnavn for Synergy-klienten å koble til. + Please fill in a hostname for the barrier client to connect to. + Vennligst fyll inn et vertsnavn for Barrier-klienten å koble til. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Den midlertidige oppsettsfilen, som er nødvendig for å starte Synergy, kan ikke opprettes. + The temporary configuration file required to start barrier can not be written. + Den midlertidige oppsettsfilen, som er nødvendig for å starte Barrier, kan ikke opprettes. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Du har ikke lagt inn en gyldig oppsettsfil for synergy-tjeneren. Vil du velge oppsettsfilen nå? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Du har ikke lagt inn en gyldig oppsettsfil for barrier-tjeneren. Vil du velge oppsettsfilen nå? - Synergy server not found - Finner ikke Synergy server + Barrier server not found + Finner ikke Barrier server - The executable for the synergy server does not exist. - Programfilen for synergy-tjeneren finnes ikke. + The executable for the barrier server does not exist. + Programfilen for barrier-tjeneren finnes ikke. - Synergy terminated with an error - Synergy stoppet med en feil + Barrier terminated with an error + Barrier stoppet med en feil - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy stoppet uventet med kode %1.<br><br>Se i loggen for detaljer. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier stoppet uventet med kode %1.<br><br>Se i loggen for detaljer. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy starter + Barrier is starting. + Barrier starter - Synergy is running. - Synergy kjører + Barrier is running. + Barrier kjører - Synergy is not running. - Synergy kjører ikke + Barrier is not running. + Barrier kjører ikke @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Velg en oppsettsfil for synergys. + Browse for a barriers config file + Velg en oppsettsfil for barriers. - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - &Om Synergy + &About Barrier... + &Om Barrier @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Konfigurer Synergy + Setup Barrier + Konfigurer Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergy-oppsett (*.sgc);;Alle filer (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrier-oppsett (*.sgc);;Alle filer (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy-oppsett (*.conf);;Alle filer (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier-oppsett (*.conf);;Alle filer (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Konfigurer oppsettet for din Synergy tjener-konfigurasjon. + Configure the layout of your barrier server configuration. + Konfigurer oppsettet for din Barrier tjener-konfigurasjon. @@ -1046,16 +1046,16 @@ Dobbeltklikk en skjerm for å endre dens innstillinger. - Elevate Synergy - Hev Synergy + Elevate Barrier + Hev Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Er du sikker på at du vil gi Synergy forhøyede rettigheter? -Dette tillater Synergy å kommunisere med forhøyede prosesser og UAC dialoger. Dette kan føre til problemer med normale prosesser. Bruk dette kun om du må. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Er du sikker på at du vil gi Barrier forhøyede rettigheter? +Dette tillater Barrier å kommunisere med forhøyede prosesser og UAC dialoger. Dette kan føre til problemer med normale prosesser. Bruk dette kun om du må. @@ -1170,8 +1170,8 @@ Dette tillater Synergy å kommunisere med forhøyede prosesser og UAC dialoger. SetupWizard - Setup Synergy - Konfigurer Synergy + Setup Barrier + Konfigurer Barrier @@ -1188,8 +1188,8 @@ Dette tillater Synergy å kommunisere med forhøyede prosesser og UAC dialoger. SetupWizardBase - Setup Synergy - Konfigurer Synergy + Setup Barrier + Konfigurer Barrier @@ -1198,13 +1198,13 @@ Dette tillater Synergy å kommunisere med forhøyede prosesser og UAC dialoger. - Thanks for installing Synergy! - Takk for at du installerte Synergy! + Thanks for installing Barrier! + Takk for at du installerte Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy kan du enkelt dele dine mus og tastatur mellom flere datamaskiner på skrivebordet, og det er gratis og Open Source. Bare flytte musen utenfor kanten av en datamaskin skjerm til en annen. Du kan også dele alle dine oppslagstavler. Alt du trenger er en nettverksforbindelse. Synergy er cross-platform (fungerer på Windows, Mac OS X og Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier kan du enkelt dele dine mus og tastatur mellom flere datamaskiner på skrivebordet, og det er gratis og Open Source. Bare flytte musen utenfor kanten av en datamaskin skjerm til en annen. Du kan også dele alle dine oppslagstavler. Alt du trenger er en nettverksforbindelse. Barrier er cross-platform (fungerer på Windows, Mac OS X og Linux). @@ -1394,8 +1394,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_pes-IR.ts b/src/gui/res/lang/gui_pes-IR.ts index 65d570a7..ff1e1f17 100644 --- a/src/gui/res/lang/gui_pes-IR.ts +++ b/src/gui/res/lang/gui_pes-IR.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,12 +1195,12 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_pl-PL.ts b/src/gui/res/lang/gui_pl-PL.ts index 06287696..b73a5ed1 100644 --- a/src/gui/res/lang/gui_pl-PL.ts +++ b/src/gui/res/lang/gui_pl-PL.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - O Synergy + About Barrier + O Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> <p>Dostępna jest wersja %1, <a href="%2">odwiedź stronę internetową</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Klient Synergy nie został odnaleziony + Barrier client not found + Klient Barrier nie został odnaleziony - The executable for the synergy client does not exist. - Plik wykonywalny klienta synergy nie istnieje + The executable for the barrier client does not exist. + Plik wykonywalny klienta barrier nie istnieje @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Wypełnij nazwę hosta do której ma się podłączyć klient synergy. + Please fill in a hostname for the barrier client to connect to. + Wypełnij nazwę hosta do której ma się podłączyć klient barrier. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Nie można zapisać tymczasowego pliku konfiguracyjnego wymaganego do uruchomienia synergy. + The temporary configuration file required to start barrier can not be written. + Nie można zapisać tymczasowego pliku konfiguracyjnego wymaganego do uruchomienia barrier. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Nie podałeś poprawnego pliku konfiguracji potrzebnego do uruchomienia serwera synergy. Czy chcesz wskazać ten plik teraz? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Nie podałeś poprawnego pliku konfiguracji potrzebnego do uruchomienia serwera barrier. Czy chcesz wskazać ten plik teraz? - Synergy server not found - Nie znaleziono serwera Synergy + Barrier server not found + Nie znaleziono serwera Barrier - The executable for the synergy server does not exist. - Plik wykonywalny serwera synergy nie istnieje + The executable for the barrier server does not exist. + Plik wykonywalny serwera barrier nie istnieje - Synergy terminated with an error - Synergy zostało zatrzymane z błędem + Barrier terminated with an error + Barrier zostało zatrzymane z błędem - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy zakończył działanie w sposób nieoczekiwany, kod wyjścia %1 (exit code). <br><br>Więcej szczegółów w pliku logów wyjściowych. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier zakończył działanie w sposób nieoczekiwany, kod wyjścia %1 (exit code). <br><br>Więcej szczegółów w pliku logów wyjściowych. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy jest uruchamiane. + Barrier is starting. + Barrier jest uruchamiane. - Synergy is running. - Synergy uruchomione. + Barrier is running. + Barrier uruchomione. - Synergy is not running. - Synergy nie uruchomione. + Barrier is not running. + Barrier nie uruchomione. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Wskaż plik konfiguracyjny synergy + Browse for a barriers config file + Wskaż plik konfiguracyjny barrier - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - O Synergy... + &About Barrier... + O Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Konfiguracja Synergy + Setup Barrier + Konfiguracja Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Konfiguracje Synergy (*.sgc);;Wszystkie pliki (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Konfiguracje Barrier (*.sgc);;Wszystkie pliki (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Konfiguracje Synergy (*.conf);;Wszystkie pliki (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Konfiguracje Barrier (*.conf);;Wszystkie pliki (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Konfiguracja układu serwera synergy. + Configure the layout of your barrier server configuration. + Konfiguracja układu serwera barrier. @@ -1046,16 +1046,16 @@ Kliknij dwukrotnie w ekran, aby edytować jego ustawienia. - Elevate Synergy - Zwiększ uprawnienia Synergy + Elevate Barrier + Zwiększ uprawnienia Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Czy jesteś pewien, żeby podnieść uprawnienia Synergy? -Pozwoli to Synergy współpracować z innymi aplikacjami o podniesionych uprawnieniach oraz systemem UAC, ale może stwarzać problemy z aplikacjami bez podniesionych uprawnień. Podnoś uprawnienia tylko w sytuacji, gdy naprawdę tego potrzebujesz. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Czy jesteś pewien, żeby podnieść uprawnienia Barrier? +Pozwoli to Barrier współpracować z innymi aplikacjami o podniesionych uprawnieniach oraz systemem UAC, ale może stwarzać problemy z aplikacjami bez podniesionych uprawnień. Podnoś uprawnienia tylko w sytuacji, gdy naprawdę tego potrzebujesz. @@ -1170,8 +1170,8 @@ Pozwoli to Synergy współpracować z innymi aplikacjami o podniesionych uprawni SetupWizard - Setup Synergy - Konfiguracja Synergy + Setup Barrier + Konfiguracja Barrier @@ -1188,8 +1188,8 @@ Pozwoli to Synergy współpracować z innymi aplikacjami o podniesionych uprawni SetupWizardBase - Setup Synergy - Konfiguracja Synergy + Setup Barrier + Konfiguracja Barrier @@ -1198,13 +1198,13 @@ Pozwoli to Synergy współpracować z innymi aplikacjami o podniesionych uprawni - Thanks for installing Synergy! - Dziękujemy za zainstalowanie Synergy! + Thanks for installing Barrier! + Dziękujemy za zainstalowanie Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy pozwala w łatwy sposób dzielić się myszką i klawiaturą pomiędzy wieloma komputerami na Twoim biurku, jest darmowe i Open Source. Wystarczy przesunąć kursor myszy poza krawędź jednego monitora aby przejść na monitor innego komputera. Możesz nawet dzielić wszystkie swoje schowki. Potrzebujesz do tego tylko połączenia z siecią. Synergy jest wieloplatformowe (działa na Windows, Mac OS X i Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier pozwala w łatwy sposób dzielić się myszką i klawiaturą pomiędzy wieloma komputerami na Twoim biurku, jest darmowe i Open Source. Wystarczy przesunąć kursor myszy poza krawędź jednego monitora aby przejść na monitor innego komputera. Możesz nawet dzielić wszystkie swoje schowki. Potrzebujesz do tego tylko połączenia z siecią. Barrier jest wieloplatformowe (działa na Windows, Mac OS X i Linux). @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_pt-BR.ts b/src/gui/res/lang/gui_pt-BR.ts index 93c62975..74f230d6 100644 --- a/src/gui/res/lang/gui_pt-BR.ts +++ b/src/gui/res/lang/gui_pt-BR.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Sobre o Synergy + About Barrier + Sobre o Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>A sua versão do Synergy está desatualizada. Versão <b>%1</b> está disponível para <a href="%2">download</a>.</p> + <p>A sua versão do Barrier está desatualizada. Versão <b>%1</b> está disponível para <a href="%2">download</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Cliente Synergy não foi encontrado. + Barrier client not found + Cliente Barrier não foi encontrado. - The executable for the synergy client does not exist. - O executável para o cliente do synergy não existe. + The executable for the barrier client does not exist. + O executável para o cliente do barrier não existe. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Por favor, preencha um nome do servidor para o cliente Synergy se conectar. + Please fill in a hostname for the barrier client to connect to. + Por favor, preencha um nome do servidor para o cliente Barrier se conectar. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - O arquivo temporário de configuração, necessário para iniciar o Synergy, não pode ser gravado. + The temporary configuration file required to start barrier can not be written. + O arquivo temporário de configuração, necessário para iniciar o Barrier, não pode ser gravado. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Você não preencheu um arquivo de configuração válido para o servidor do Synergy. Você quer procurá-lo agora? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Você não preencheu um arquivo de configuração válido para o servidor do Barrier. Você quer procurá-lo agora? - Synergy server not found - Servidor do Synergy não foi encontrado + Barrier server not found + Servidor do Barrier não foi encontrado - The executable for the synergy server does not exist. - O executável para o servidor do synergy não existe. + The executable for the barrier server does not exist. + O executável para o servidor do barrier não existe. - Synergy terminated with an error - Synergy terminou com um erro + Barrier terminated with an error + Barrier terminou com um erro - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy fechou inesperadamente retornando o código %1.<br><br>Por favor veja o log para detalhes. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier fechou inesperadamente retornando o código %1.<br><br>Por favor veja o log para detalhes. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy foi iniciado. + Barrier is starting. + Barrier foi iniciado. - Synergy is running. - Synergy esta rodando. + Barrier is running. + Barrier esta rodando. - Synergy is not running. - Synergy não esta rodando. + Barrier is not running. + Barrier não esta rodando. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Selecionar um arquivo de configuração synergys + Browse for a barriers config file + Selecionar um arquivo de configuração barriers - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Sobre o Synergy... + &About Barrier... + Sobre o Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Configurar Synergy + Setup Barrier + Configurar Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Configurações do Synergy (*.sgc);;Todos os arquivos (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Configurações do Barrier (*.sgc);;Todos os arquivos (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Configurações do Synergy (*.conf);;Todos os arquivos (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Configurações do Barrier (*.conf);;Todos os arquivos (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Configure a disposição na sua configuração do servidor synergy. + Configure the layout of your barrier server configuration. + Configure a disposição na sua configuração do servidor barrier. @@ -1046,16 +1046,16 @@ Clique duplo numa tela para editar as suas configurações. - Elevate Synergy - Elevar privilégios de execução do Synergy + Elevate Barrier + Elevar privilégios de execução do Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Você quer elevar os privilegios de execução do Synergy? -Isso permite ao Synergy interagir com processos privilegiados e com o UAC, mas pode causar problemas com processos sem privilégios. Eleve os privilégios de execução somente se você realmente precisar. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Você quer elevar os privilegios de execução do Barrier? +Isso permite ao Barrier interagir com processos privilegiados e com o UAC, mas pode causar problemas com processos sem privilégios. Eleve os privilégios de execução somente se você realmente precisar. @@ -1170,8 +1170,8 @@ Isso permite ao Synergy interagir com processos privilegiados e com o UAC, mas p SetupWizard - Setup Synergy - Configurar Synergy + Setup Barrier + Configurar Barrier @@ -1188,8 +1188,8 @@ Isso permite ao Synergy interagir com processos privilegiados e com o UAC, mas p SetupWizardBase - Setup Synergy - Configurar Synergy + Setup Barrier + Configurar Barrier @@ -1198,13 +1198,13 @@ Isso permite ao Synergy interagir com processos privilegiados e com o UAC, mas p - Thanks for installing Synergy! - Obrigado por instalar o Synergy! + Thanks for installing Barrier! + Obrigado por instalar o Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy permite que você compartilhe seu mouse e teclado facilmente entre vários computadores na sua área de trabalho, além de ser gratuito e de código aberto. Basta mover o mouse para fora da borda da tela de um computador para outro. Você pode até mesmo compartilhar todas as suas áreas de transferência. Tudo que você precisa é de uma conexão de rede. Synergy é multiplataforma (funciona em Windows, Mac OS X e Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier permite que você compartilhe seu mouse e teclado facilmente entre vários computadores na sua área de trabalho, além de ser gratuito e de código aberto. Basta mover o mouse para fora da borda da tela de um computador para outro. Você pode até mesmo compartilhar todas as suas áreas de transferência. Tudo que você precisa é de uma conexão de rede. Barrier é multiplataforma (funciona em Windows, Mac OS X e Linux). @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_pt-PT.ts b/src/gui/res/lang/gui_pt-PT.ts index ed1fa7f5..1ce5d3e6 100644 --- a/src/gui/res/lang/gui_pt-PT.ts +++ b/src/gui/res/lang/gui_pt-PT.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Acerca de Synergy + About Barrier + Acerca de Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>A tua versão do Synergy está desatualizada. Versão<b>%1</b> está agora disponivel <a href="%2">para download</a>.</p> + <p>A tua versão do Barrier está desatualizada. Versão<b>%1</b> está agora disponivel <a href="%2">para download</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - O cliente Synergy não foi encontrado + Barrier client not found + O cliente Barrier não foi encontrado - The executable for the synergy client does not exist. - O executável de cliente de Synergy não existe + The executable for the barrier client does not exist. + O executável de cliente de Barrier não existe @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Por favor coloque o nome de computador ao qual o cliente Synergy vai ligar-se + Please fill in a hostname for the barrier client to connect to. + Por favor coloque o nome de computador ao qual o cliente Barrier vai ligar-se @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Não foi possível escrever no ficheiro temporário de configuração de synergy, o qual é indispensável para o iniciar. + The temporary configuration file required to start barrier can not be written. + Não foi possível escrever no ficheiro temporário de configuração de barrier, o qual é indispensável para o iniciar. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Não colocaste um ficheiro de configuração válido para o servidor de synergy. Queres seleccionar o ficheiro de configuração agora? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Não colocaste um ficheiro de configuração válido para o servidor de barrier. Queres seleccionar o ficheiro de configuração agora? - Synergy server not found - O servidor de synergy não foi encontrado + Barrier server not found + O servidor de barrier não foi encontrado - The executable for the synergy server does not exist. - O executável de servidor de synergy não existe. + The executable for the barrier server does not exist. + O executável de servidor de barrier não existe. - Synergy terminated with an error - Synergy terminou com erro + Barrier terminated with an error + Barrier terminou com erro - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy terminou inesperadamente com o erro %1.<br><br>Por favor, verifique o registo de log para mais detalhes. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminou inesperadamente com o erro %1.<br><br>Por favor, verifique o registo de log para mais detalhes. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy está a iniciar + Barrier is starting. + Barrier está a iniciar - Synergy is running. - Synergy está em execução + Barrier is running. + Barrier está em execução - Synergy is not running. - Synergy não está em execução + Barrier is not running. + Barrier não está em execução @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Seleccionar um ficheiro de configuração de synergy + Browse for a barriers config file + Seleccionar um ficheiro de configuração de barrier - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - &Acerca de Synergy... + &About Barrier... + &Acerca de Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Configurar Synergy + Setup Barrier + Configurar Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Configuração de synergy (*.sgc);;Todos os ficheiros (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Configuração de barrier (*.sgc);;Todos os ficheiros (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Configuração de synergy (*.conf);;Todos os ficheiros (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Configuração de barrier (*.conf);;Todos os ficheiros (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Configurar a disposição na configuração do servidor de synergy + Configure the layout of your barrier server configuration. + Configurar a disposição na configuração do servidor de barrier @@ -1046,14 +1046,14 @@ Faça duplo clique num ecrã para alterar as suas definições. - Elevate Synergy - Elevar o Synergy + Elevate Barrier + Elevar o Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1169,8 +1169,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - Configurar Synergy + Setup Barrier + Configurar Barrier @@ -1187,8 +1187,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - Configurar Synergy + Setup Barrier + Configurar Barrier @@ -1197,13 +1197,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! - Obrigado por instalares o Synergy! + Thanks for installing Barrier! + Obrigado por instalares o Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy permite que uses o teu rato e teclado para controlar vários computadores na tua secretária em simultâneo, é gratuito e Open Source. Basta mover o rato para um lado ou para outro para mudar de ecrã. Podes até copiar e colar de um ecrã para o outro. Precisas apenas de uma ligação de rede. O Synergy é cross-platform (funciona em Windows, Mac OS X e Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier permite que uses o teu rato e teclado para controlar vários computadores na tua secretária em simultâneo, é gratuito e Open Source. Basta mover o rato para um lado ou para outro para mudar de ecrã. Podes até copiar e colar de um ecrã para o outro. Precisas apenas de uma ligação de rede. O Barrier é cross-platform (funciona em Windows, Mac OS X e Linux). @@ -1389,8 +1389,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_ro.ts b/src/gui/res/lang/gui_ro.ts index eb69251b..697fd0f2 100644 --- a/src/gui/res/lang/gui_ro.ts +++ b/src/gui/res/lang/gui_ro.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Sobre o Synergy + About Barrier + Sobre o Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Clientul Synergy nu poate fi găsit + Barrier client not found + Clientul Barrier nu poate fi găsit - The executable for the synergy client does not exist. - Executabilul pentru clientul synergy nu există. + The executable for the barrier client does not exist. + Executabilul pentru clientul barrier nu există. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Te rog să complectezi numele de gazda pentru clientul synergy la care să te conectezi. + Please fill in a hostname for the barrier client to connect to. + Te rog să complectezi numele de gazda pentru clientul barrier la care să te conectezi. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Fișierul de configurare temporar necesar pentru a porni Synergy nu poate fi scris + The temporary configuration file required to start barrier can not be written. + Fișierul de configurare temporar necesar pentru a porni Barrier nu poate fi scris @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Nu ati completat un fişier de configurare valabil pentru serverul synergy. Doriţi să răsfoiţi pentru un fişierul de configurare acum? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Nu ati completat un fişier de configurare valabil pentru serverul barrier. Doriţi să răsfoiţi pentru un fişierul de configurare acum? - Synergy server not found - Clientul Synergy nu poate fi găsit + Barrier server not found + Clientul Barrier nu poate fi găsit - The executable for the synergy server does not exist. - Executabilul pentru clientul synergy nu există. + The executable for the barrier server does not exist. + Executabilul pentru clientul barrier nu există. - Synergy terminated with an error - Synergy terminou com um erro + Barrier terminated with an error + Barrier terminou com um erro - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy a terminat în mod neaşteptat cu un cod %1.<br><br>Vă rugăm să consultaţi jurnalul pentru detalii. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier a terminat în mod neaşteptat cu un cod %1.<br><br>Vă rugăm să consultaţi jurnalul pentru detalii. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy pornește. + Barrier is starting. + Barrier pornește. - Synergy is running. - Synergy rulează. + Barrier is running. + Barrier rulează. - Synergy is not running. - Synergy nu rulează. + Barrier is not running. + Barrier nu rulează. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Răsfoiţi pentru un fişierul de configurare synergy + Browse for a barriers config file + Răsfoiţi pentru un fişierul de configurare barrier - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Despre Synergy... + &About Barrier... + Despre Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Configurare Synergy + Setup Barrier + Configurare Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Configurații Synergy (*.sgc);;Toate Fișierele (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Configurații Barrier (*.sgc);;Toate Fișierele (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Configurații Synergy (*.conf);;Toate Fișierele (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Configurații Barrier (*.conf);;Toate Fișierele (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Configurați aspectul serverului vostru synergy. + Configure the layout of your barrier server configuration. + Configurați aspectul serverului vostru barrier. @@ -1046,14 +1046,14 @@ Click dublu pe un ecran pentru ai edita setările. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1169,8 +1169,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - Configurare Synergy + Setup Barrier + Configurare Barrier @@ -1187,8 +1187,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - Configurare Synergy + Setup Barrier + Configurare Barrier @@ -1197,13 +1197,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! - Va multumim ca a-ti instalat Synergy! + Thanks for installing Barrier! + Va multumim ca a-ti instalat Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy vă permite să partajaţi cu uşurinţă mouse-ul şi tastatura între mai multe computere de pe birou, si este gratuit şi open source. Doar mutaţi mouse-ul de pe marginea ecranului pe un calculator pe altul. Puteţi chiar partaja toate clipboarduri tale. Tot ce trebuie este o conexiune la reţea. Sinergia este cross-platform (funcţionează pe Windows, Mac OS X şi Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier vă permite să partajaţi cu uşurinţă mouse-ul şi tastatura între mai multe computere de pe birou, si este gratuit şi open source. Doar mutaţi mouse-ul de pe marginea ecranului pe un calculator pe altul. Puteţi chiar partaja toate clipboarduri tale. Tot ce trebuie este o conexiune la reţea. Sinergia este cross-platform (funcţionează pe Windows, Mac OS X şi Linux). @@ -1389,8 +1389,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_ru.ts b/src/gui/res/lang/gui_ru.ts index 24213570..4dba5eb4 100644 --- a/src/gui/res/lang/gui_ru.ts +++ b/src/gui/res/lang/gui_ru.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier О программе @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p> Ваша версия Synergy устарела. Версия <b>%1</b> доступна для <a href="%2">скачивания</a>.</p> + <p> Ваша версия Barrier устарела. Версия <b>%1</b> доступна для <a href="%2">скачивания</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Клиент Synergy не найден + Barrier client not found + Клиент Barrier не найден - The executable for the synergy client does not exist. - Исполняемый файл для клиента Synergy не найден + The executable for the barrier client does not exist. + Исполняемый файл для клиента Barrier не найден @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Пожалуйста заполните имя хоста в клиенте Synergy для соединения. + Please fill in a hostname for the barrier client to connect to. + Пожалуйста заполните имя хоста в клиенте Barrier для соединения. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Временный файл конфигурации, использующийся для запуска Synergy, заблокирован для записи. + The temporary configuration file required to start barrier can not be written. + Временный файл конфигурации, использующийся для запуска Barrier, заблокирован для записи. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Вы не указали правильный файл конфигурации сервера Synergy. Желаете указать его сейчас? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Вы не указали правильный файл конфигурации сервера Barrier. Желаете указать его сейчас? - Synergy server not found - Сервер Synergy не найден + Barrier server not found + Сервер Barrier не найден - The executable for the synergy server does not exist. - Не найден выполняемый файл для сервера Synergy. + The executable for the barrier server does not exist. + Не найден выполняемый файл для сервера Barrier. - Synergy terminated with an error - Synergy завершилась с ошибкой + Barrier terminated with an error + Barrier завершилась с ошибкой - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy завершилась неожиданно с кодом выхода %1.<br><br>Пожалуйста просмотрите log-файл для деталей. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier завершилась неожиданно с кодом выхода %1.<br><br>Пожалуйста просмотрите log-файл для деталей. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy запускается. + Barrier is starting. + Barrier запускается. - Synergy is running. - Synergy работает. + Barrier is running. + Barrier работает. - Synergy is not running. - Synergy остановлена. + Barrier is not running. + Barrier остановлена. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Указать файл конфигурации Synergy + Browse for a barriers config file + Указать файл конфигурации Barrier - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - О Synergy + &About Barrier... + О Barrier @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Настроить Synergy + Setup Barrier + Настроить Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Конфигурация Synergy (*.sgc);;Все файлы (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Конфигурация Barrier (*.sgc);;Все файлы (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Конфигурация Synergy (*.conf);;Все файлы (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Конфигурация Barrier (*.conf);;Все файлы (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Настроить расположение конфигурации Вашего сервера Synergy. + Configure the layout of your barrier server configuration. + Настроить расположение конфигурации Вашего сервера Barrier. @@ -1046,16 +1046,16 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier Повысить привилегии приложения (для UAC) - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Вы уверены что хотите повышать Synergy? -Это позволит Synergy взаимодействовать с повышающим процессом и UAC диалогом, но может вызвать проблемы с неповышенными процессами. Повышайте Synregy только если это действительно необходимо. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Вы уверены что хотите повышать Barrier? +Это позволит Barrier взаимодействовать с повышающим процессом и UAC диалогом, но может вызвать проблемы с неповышенными процессами. Повышайте Synregy только если это действительно необходимо. @@ -1170,8 +1170,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - Настроить Synergy + Setup Barrier + Настроить Barrier @@ -1188,8 +1188,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - Настроить Synergy + Setup Barrier + Настроить Barrier @@ -1198,13 +1198,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! - Спасибо за установку Synergy! + Thanks for installing Barrier! + Спасибо за установку Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy позволяет вам просто и легко работать с одним набором клавиатуры и мышки между несколькими компьютерами. Это бесплатное приложение с открытым исходным кодом. Просто подведите курсор за край экрана. Вы также можете объединять буферы обмена. Все что вам нужно это сетевое подключение. Synergy это кросс-платформенное приложение, которое работает на Windows, Mac OS X и Linux. + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier позволяет вам просто и легко работать с одним набором клавиатуры и мышки между несколькими компьютерами. Это бесплатное приложение с открытым исходным кодом. Просто подведите курсор за край экрана. Вы также можете объединять буферы обмена. Все что вам нужно это сетевое подключение. Barrier это кросс-платформенное приложение, которое работает на Windows, Mac OS X и Linux. @@ -1396,8 +1396,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_si.ts b/src/gui/res/lang/gui_si.ts index cad8e119..7744451a 100644 --- a/src/gui/res/lang/gui_si.ts +++ b/src/gui/res/lang/gui_si.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Synergy ගැන විස්තර + About Barrier + Barrier ගැන විස්තර @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,12 +1195,12 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_sk-SK.ts b/src/gui/res/lang/gui_sk-SK.ts index aa3fe7a2..113f3eef 100644 --- a/src/gui/res/lang/gui_sk-SK.ts +++ b/src/gui/res/lang/gui_sk-SK.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,13 +1195,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy vám umožní ľahko zdieľať myš a klávesnicu medzi viacerými počítačmi na stole, je to zadarmo a Open Source. Len presunúť kurzor myši mimo okraj jedného počítača na obrazovke na ďalšie. Môžete dokonca zdieľať všetky vaše schránok. Všetko, čo potrebujete, je pripojenie k sieti. Synergy je cross-platformové (práca na Windows, Mac OS X a Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier vám umožní ľahko zdieľať myš a klávesnicu medzi viacerými počítačmi na stole, je to zadarmo a Open Source. Len presunúť kurzor myši mimo okraj jedného počítača na obrazovke na ďalšie. Môžete dokonca zdieľať všetky vaše schránok. Všetko, čo potrebujete, je pripojenie k sieti. Barrier je cross-platformové (práca na Windows, Mac OS X a Linux). @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_sl-SI.ts b/src/gui/res/lang/gui_sl-SI.ts index 5092d91b..943be704 100644 --- a/src/gui/res/lang/gui_sl-SI.ts +++ b/src/gui/res/lang/gui_sl-SI.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - O Synergy + About Barrier + O Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,13 +1195,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy omogoča preprosto souporabo miške in tipkovnice med mnogimi računalniki na vaši mizi. Je brezplačen in prostokodni program. Miškin kazalec lahko preprosto premaknemo preko roba ekrana enega računalnika na ekran drugega. Omogoča tudi souporabo odložišča. Vse kar potrebujete je mrežna povezava. Synergy podpira mnogo operacijskih sistemov (npr. Windows, Mac OS X in Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier omogoča preprosto souporabo miške in tipkovnice med mnogimi računalniki na vaši mizi. Je brezplačen in prostokodni program. Miškin kazalec lahko preprosto premaknemo preko roba ekrana enega računalnika na ekran drugega. Omogoča tudi souporabo odložišča. Vse kar potrebujete je mrežna povezava. Barrier podpira mnogo operacijskih sistemov (npr. Windows, Mac OS X in Linux). @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_sq-AL.ts b/src/gui/res/lang/gui_sq-AL.ts index eebd4aa0..812e0447 100644 --- a/src/gui/res/lang/gui_sq-AL.ts +++ b/src/gui/res/lang/gui_sq-AL.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier Rreth Sunergy @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found Klienti nuk u gjet - The executable for the synergy client does not exist. - Skedari i ekzekutueshem per serverin e synergy nuk egziston. + The executable for the barrier client does not exist. + Skedari i ekzekutueshem per serverin e barrier nuk egziston. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. Ju lutem vendosni nje host te klientit qe deshironi te lidheni. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Skedari i perkohshem qe eshte i nevojshem per te startuar Synergy nuk mund te shkruhet. + The temporary configuration file required to start barrier can not be written. + Skedari i perkohshem qe eshte i nevojshem per te startuar Barrier nuk mund te shkruhet. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? Nuk keni krijuar nje skedar konfiguracioni per serverin synergu. Deshironi te kerkoni per nje skedar konfiguracioni tani? - Synergy server not found - Serveri Synergy nuk u gjet + Barrier server not found + Serveri Barrier nuk u gjet - The executable for the synergy server does not exist. - Skedari i ekzekutueshem per serverin e synergy nuk egziston. + The executable for the barrier server does not exist. + Skedari i ekzekutueshem per serverin e barrier nuk egziston. - Synergy terminated with an error - Synergy ndaloi nga nje gabim + Barrier terminated with an error + Barrier ndaloi nga nje gabim - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy ndaloi papritur me nje kod gabimi %1.<br><br> Ju lutem shikoni detajet e te dhenave. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier ndaloi papritur me nje kod gabimi %1.<br><br> Ju lutem shikoni detajet e te dhenave. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy po fillon. + Barrier is starting. + Barrier po fillon. - Synergy is running. + Barrier is running. - Synergy is not running. - Synergy nuk po ekzekutohet. + Barrier is not running. + Barrier nuk po ekzekutohet. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Kerko per nje skedarin e konfigurimit te Synergy + Browse for a barriers config file + Kerko per nje skedarin e konfigurimit te Barrier - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Rreth Synergy... + &About Barrier... + Rreth Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Vendos Synergy + Setup Barrier + Vendos Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Konfiguracioni i Synergy (*.sgc);;Te gjithe (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Konfiguracioni i Barrier (*.sgc);;Te gjithe (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Konfiguracioni i Synergy (*.conf);;Te gjithe (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Konfiguracioni i Barrier (*.conf);;Te gjithe (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. Konfiguroni paraqitjen e konfiguraciont te serverit. @@ -1046,16 +1046,16 @@ Dopjo klik mbi nje ekran per te ndryshuar konfigurimet e tij. - Elevate Synergy - Permireso Synergy + Elevate Barrier + Permireso Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Jeni te sigurte qe doni te permiresoni Synergy? -Kjo i jep mundesi Synergy te bashkeveproje me procese te larta dhe UAC, por ju mund te shkaktoni probleme me proceset e uleta. Permiresoni Synergy vetem nese ju nevojitet. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Jeni te sigurte qe doni te permiresoni Barrier? +Kjo i jep mundesi Barrier te bashkeveproje me procese te larta dhe UAC, por ju mund te shkaktoni probleme me proceset e uleta. Permiresoni Barrier vetem nese ju nevojitet. @@ -1170,8 +1170,8 @@ Kjo i jep mundesi Synergy te bashkeveproje me procese te larta dhe UAC, por ju m SetupWizard - Setup Synergy - Vendos Synergy + Setup Barrier + Vendos Barrier @@ -1188,8 +1188,8 @@ Kjo i jep mundesi Synergy te bashkeveproje me procese te larta dhe UAC, por ju m SetupWizardBase - Setup Synergy - Vendos Synergy + Setup Barrier + Vendos Barrier @@ -1198,12 +1198,12 @@ Kjo i jep mundesi Synergy te bashkeveproje me procese te larta dhe UAC, por ju m - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). Sunergy ju mundeson lehtesisht te ndani mausin dhe tastieren me disa komopjutera te tjere ne tavolinen tuaj, eshte FALAS dhe me KOD TE HAPUR. Vetem levizni mausin nga kompjuteri juaj ne nje kompjuter tjeter. Madje mund te beni ndani te gjitha ekranet. Ju duhet vem nje lidhje interneti. Sunergy eshte nje platformi e gjere (punon ne Windows, MAC OS X dhe Linux). @@ -1390,8 +1390,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_sr.ts b/src/gui/res/lang/gui_sr.ts index 8cb55ed3..6dd0bed6 100644 --- a/src/gui/res/lang/gui_sr.ts +++ b/src/gui/res/lang/gui_sr.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,12 +1195,12 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_sv.ts b/src/gui/res/lang/gui_sv.ts index eccf78cb..26393ae5 100644 --- a/src/gui/res/lang/gui_sv.ts +++ b/src/gui/res/lang/gui_sv.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Om Synergy + About Barrier + Om Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>Du kör inte den senaste versionen av Synergy. Version <b>%1</b> finns tillgänglig för <a href="%2">nedladdning</a>.</p> + <p>Du kör inte den senaste versionen av Barrier. Version <b>%1</b> finns tillgänglig för <a href="%2">nedladdning</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Synergyklienten hittades inte + Barrier client not found + Barrierklienten hittades inte - The executable for the synergy client does not exist. - Den exekverbara filen för Synergyklienten existerar inte. + The executable for the barrier client does not exist. + Den exekverbara filen för Barrierklienten existerar inte. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Fyll i det värddatornamn som Synergyklienten skall ansluta till. + Please fill in a hostname for the barrier client to connect to. + Fyll i det värddatornamn som Barrierklienten skall ansluta till. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Den tillfälliga konfigurationsfilen som krävs för att kunna starta Synergy kan inte skapas. + The temporary configuration file required to start barrier can not be written. + Den tillfälliga konfigurationsfilen som krävs för att kunna starta Barrier kan inte skapas. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Du har inte fyllt i en giltig konfigurationsfil för Synergyservern. Vill du bläddra efter konfigurationsfilen nu? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Du har inte fyllt i en giltig konfigurationsfil för Barrierservern. Vill du bläddra efter konfigurationsfilen nu? - Synergy server not found - Synergyservern hittades inte + Barrier server not found + Barrierservern hittades inte - The executable for the synergy server does not exist. - Den körbara filen för Synergyservern existerar inte. + The executable for the barrier server does not exist. + Den körbara filen för Barrierservern existerar inte. - Synergy terminated with an error - Synergy avslutades med ett fel + Barrier terminated with an error + Barrier avslutades med ett fel - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergyterminalen avslutades oväntat med avbrottskoden %1.<br><br>Kontrollera loggdatan för detaljer. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrierterminalen avslutades oväntat med avbrottskoden %1.<br><br>Kontrollera loggdatan för detaljer. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy startas. + Barrier is starting. + Barrier startas. - Synergy is running. - Synergy körs. + Barrier is running. + Barrier körs. - Synergy is not running. - Synergy körs inte. + Barrier is not running. + Barrier körs inte. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Bläddra efter Synergys konfigurationsfil. + Browse for a barriers config file + Bläddra efter Barriers konfigurationsfil. - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Om Synergy... + &About Barrier... + Om Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Ställ in Synergy + Setup Barrier + Ställ in Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergy-konfigurationer (*.sgc);;Alla filer (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrier-konfigurationer (*.sgc);;Alla filer (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy-konfigurationer (*.conf);;Alla filer (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier-konfigurationer (*.conf);;Alla filer (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Konfigurera layouten på din Synergy-konfiguration. + Configure the layout of your barrier server configuration. + Konfigurera layouten på din Barrier-konfiguration. @@ -1046,16 +1046,16 @@ Dubbelklicka på en skärm för att ändra dess inställningar. - Elevate Synergy - Förhöj Synergys behörighet + Elevate Barrier + Förhöj Barriers behörighet - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Är du säker på att du vill förhöja Synergys behörighet? -Detta låter Synergy interagera med förhöjda processer och UAC-dialogen, men kan skapa program med processer som inte är förhöjda. Förhöj Synergys behörighet enbart om du verkligen måste. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Är du säker på att du vill förhöja Barriers behörighet? +Detta låter Barrier interagera med förhöjda processer och UAC-dialogen, men kan skapa program med processer som inte är förhöjda. Förhöj Barriers behörighet enbart om du verkligen måste. @@ -1170,8 +1170,8 @@ Detta låter Synergy interagera med förhöjda processer och UAC-dialogen, men k SetupWizard - Setup Synergy - Ställ in Synergy + Setup Barrier + Ställ in Barrier @@ -1188,8 +1188,8 @@ Detta låter Synergy interagera med förhöjda processer och UAC-dialogen, men k SetupWizardBase - Setup Synergy - Ställ in Synergy + Setup Barrier + Ställ in Barrier @@ -1198,13 +1198,13 @@ Detta låter Synergy interagera med förhöjda processer och UAC-dialogen, men k - Thanks for installing Synergy! - Tack för att du installerar Synergy! + Thanks for installing Barrier! + Tack för att du installerar Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Med Synergy kan du enkelt dela din mus och ditt tangentbord med flera datorer på ditt skrivbord, och det är Fri och Öppen mjukvara. För bara muspekaren över kanten på en datorskärm för att den skall dyka upp på nästa. Du kan till och med dela utklipp. Allt du behöver är en nätverksanslutning. Synergy är multiplattform (fungerar på både Windows, Mac OS X och Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Med Barrier kan du enkelt dela din mus och ditt tangentbord med flera datorer på ditt skrivbord, och det är Fri och Öppen mjukvara. För bara muspekaren över kanten på en datorskärm för att den skall dyka upp på nästa. Du kan till och med dela utklipp. Allt du behöver är en nätverksanslutning. Barrier är multiplattform (fungerar på både Windows, Mac OS X och Linux). @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_th-TH.ts b/src/gui/res/lang/gui_th-TH.ts index d81d707c..d19c2de1 100644 --- a/src/gui/res/lang/gui_th-TH.ts +++ b/src/gui/res/lang/gui_th-TH.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - เกี่ยวกับเรา Synergy + About Barrier + เกี่ยวกับเรา Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,13 +1195,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy ช่วยให้คุณสามารถแบ่งปันเมาส์และแป้นพิมพ์ระหว่างคอมพิวเตอร์หลายเครื่องบนโต๊ะทำงานของคุณและก็ฟรีและ Open Source เพียงแค่เลื่อนเมาส์ของคุณปิดขอบของหน้าจอคอมพิวเตอร์เครื่องหนึ่งของเมื่อไปยังอีก คุณยังสามารถแบ่งปันทั้งหมดของ clipboards ของคุณ ทั้งหมดที่คุณต้องมีการเชื่อมต่อเครือข่าย Synergy เป็นข้ามแพลตฟอร์ม (เมื่อใช้งานบน Windows, Mac OS X และ Linux) + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier ช่วยให้คุณสามารถแบ่งปันเมาส์และแป้นพิมพ์ระหว่างคอมพิวเตอร์หลายเครื่องบนโต๊ะทำงานของคุณและก็ฟรีและ Open Source เพียงแค่เลื่อนเมาส์ของคุณปิดขอบของหน้าจอคอมพิวเตอร์เครื่องหนึ่งของเมื่อไปยังอีก คุณยังสามารถแบ่งปันทั้งหมดของ clipboards ของคุณ ทั้งหมดที่คุณต้องมีการเชื่อมต่อเครือข่าย Barrier เป็นข้ามแพลตฟอร์ม (เมื่อใช้งานบน Windows, Mac OS X และ Linux) @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_tr-TR.ts b/src/gui/res/lang/gui_tr-TR.ts index 2bb1ad87..3e6a6387 100644 --- a/src/gui/res/lang/gui_tr-TR.ts +++ b/src/gui/res/lang/gui_tr-TR.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Synergy hakkında + About Barrier + Barrier hakkında @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>Synergy versiyonunuz eski. Versiyon <b>%1</b> hazır. İndirmek için <a href="%2">tıklayın</a>.</p> + <p>Barrier versiyonunuz eski. Versiyon <b>%1</b> hazır. İndirmek için <a href="%2">tıklayın</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Synergy alıcıyı bulamadı + Barrier client not found + Barrier alıcıyı bulamadı - The executable for the synergy client does not exist. - Synergy için çalışan kullanıcı makine yok. + The executable for the barrier client does not exist. + Barrier için çalışan kullanıcı makine yok. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Lütfen Synergy'nin bağlanması için bir bilgisayar adı girin + Please fill in a hostname for the barrier client to connect to. + Lütfen Barrier'nin bağlanması için bir bilgisayar adı girin @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Geçici ayar dosyası Synergy'nin başlaması için gerekli, üzerine kaydedilemez + The temporary configuration file required to start barrier can not be written. + Geçici ayar dosyası Barrier'nin başlaması için gerekli, üzerine kaydedilemez @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Synergy sunucusu için geçerli bir ayar dosyası oluşturmadınız. Bu ayar dosyasına şimdi göz atmak ister misiniz? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Barrier sunucusu için geçerli bir ayar dosyası oluşturmadınız. Bu ayar dosyasına şimdi göz atmak ister misiniz? - Synergy server not found - Synergy sunucusu bulunamadı + Barrier server not found + Barrier sunucusu bulunamadı - The executable for the synergy server does not exist. - Synergy için çalışan sunucu makine yok. + The executable for the barrier server does not exist. + Barrier için çalışan sunucu makine yok. - Synergy terminated with an error - Synergy bir hata yüzünden sonlandırıldı. + Barrier terminated with an error + Barrier bir hata yüzünden sonlandırıldı. - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy %1 hata kod ile sonlandırıldı.<br><br>Detaylar için hata günlüğüne bakınız. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier %1 hata kod ile sonlandırıldı.<br><br>Detaylar için hata günlüğüne bakınız. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy başlıyor + Barrier is starting. + Barrier başlıyor - Synergy is running. - Synergy çalışıyor + Barrier is running. + Barrier çalışıyor - Synergy is not running. - Synergy çalışmıyor + Barrier is not running. + Barrier çalışmıyor @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Synergy ayar dosyasına göz at + Browse for a barriers config file + Barrier ayar dosyasına göz at - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Synergy hakkında + &About Barrier... + Barrier hakkında @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Synergy Kurulum + Setup Barrier + Barrier Kurulum @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. Lütfen sinerji sunucu yapılandırma düzeninizi yapılandırın. @@ -1046,14 +1046,14 @@ Kendi ayarlarınızı düzenlemek için bir ekran üzerine çift tıklayın. - Elevate Synergy - Synergyi Yükselt + Elevate Barrier + Barrieri Yükselt - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1169,8 +1169,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - Synergy Kurulum + Setup Barrier + Barrier Kurulum @@ -1187,8 +1187,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - Synergy Kurulum + Setup Barrier + Barrier Kurulum @@ -1197,13 +1197,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! Sinerji yüklediğiniz için teşekkür ederiz ! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy, aynı mouse ve klavye ile birden çok bilgisayarı kontrol etmenizi sağlayan Özgür ve Açık Kaynak Kodlu bir uygulamadır. Yapmanız gereken mouse imlecinizi bilgisayar ekranından diğerine sürüklemek. Synergy aynı zamanda ortak bir panoya da izin vermektedir yani bilgisayarlar arası kopyala/yapıştır yapmanıza da olanak tanır. Tek gereken bilgisayarlarınız arasında kuruluş olan network bağlantısı. Synergy, çoklu platform desteği de vemektedir (Windows, Linux ve Mac OS X işletimde sistemlerinde çalışır). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier, aynı mouse ve klavye ile birden çok bilgisayarı kontrol etmenizi sağlayan Özgür ve Açık Kaynak Kodlu bir uygulamadır. Yapmanız gereken mouse imlecinizi bilgisayar ekranından diğerine sürüklemek. Barrier aynı zamanda ortak bir panoya da izin vermektedir yani bilgisayarlar arası kopyala/yapıştır yapmanıza da olanak tanır. Tek gereken bilgisayarlarınız arasında kuruluş olan network bağlantısı. Barrier, çoklu platform desteği de vemektedir (Windows, Linux ve Mac OS X işletimde sistemlerinde çalışır). @@ -1392,8 +1392,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_uk.ts b/src/gui/res/lang/gui_uk.ts index 07b0b8f9..f9b7c5cc 100644 --- a/src/gui/res/lang/gui_uk.ts +++ b/src/gui/res/lang/gui_uk.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Про Synergy + About Barrier + Про Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>Ваша версія Synergy застаріла. Зараз доступна версія <b>%1</b> для <a href="%2">завантаження</a>.</p> + <p>Ваша версія Barrier застаріла. Зараз доступна версія <b>%1</b> для <a href="%2">завантаження</a>.</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - Не знайдено жодного клієнта Synergy + Barrier client not found + Не знайдено жодного клієнта Barrier - The executable for the synergy client does not exist. - Виконуваної програми для клієнта Synergy не існує. + The executable for the barrier client does not exist. + Виконуваної програми для клієнта Barrier не існує. @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - Будь ласка вкажіть ім'я хосту до якого повинен приєднатися клієнт Synergy. + Please fill in a hostname for the barrier client to connect to. + Будь ласка вкажіть ім'я хосту до якого повинен приєднатися клієнт Barrier. @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - Тимчасовий файл конфігурації, який необхідний для запуску Synergy заблокований для запису. + The temporary configuration file required to start barrier can not be written. + Тимчасовий файл конфігурації, який необхідний для запуску Barrier заблокований для запису. @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - Ви не заповнили правильний файл конфігурації для сервера Synergy . Бажаєте зробити це зараз? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + Ви не заповнили правильний файл конфігурації для сервера Barrier . Бажаєте зробити це зараз? - Synergy server not found - Неможливо знайти сервер Synergy + Barrier server not found + Неможливо знайти сервер Barrier - The executable for the synergy server does not exist. - Виконуваної програми для серверу Synergy не існує. + The executable for the barrier server does not exist. + Виконуваної програми для серверу Barrier не існує. - Synergy terminated with an error - Synergy завершена з помилками + Barrier terminated with an error + Barrier завершена з помилками - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy завершилась неочікувано з кодом of %1.<br><br>Будь ласка перегляньте log-записи для деталей. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier завершилась неочікувано з кодом of %1.<br><br>Будь ласка перегляньте log-записи для деталей. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy запущено. + Barrier is starting. + Barrier запущено. - Synergy is running. - Synergy працює. + Barrier is running. + Barrier працює. - Synergy is not running. - Synergy зупинено. + Barrier is not running. + Barrier зупинено. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - Вкажіть файл конфігурації Synergy + Browse for a barriers config file + Вкажіть файл конфігурації Barrier - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - Про Synergy + &About Barrier... + Про Barrier @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - Встановлення Synergy + Setup Barrier + Встановлення Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Конфігурація Synergy (*.sgc);;Всі файли (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Конфігурація Barrier (*.sgc);;Всі файли (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Конфігурація Synergy (*.conf);;Всі файли (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Конфігурація Barrier (*.conf);;Всі файли (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - Налаштувати розташування конфігурації сервера Synergy . + Configure the layout of your barrier server configuration. + Налаштувати розташування конфігурації сервера Barrier . @@ -1046,16 +1046,16 @@ Double click on a screen to edit its settings. - Elevate Synergy - Підвищіть рівень доступу Synergy + Elevate Barrier + Підвищіть рівень доступу Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - Дійсно бажаєте підвищить рівень доступу Synergy? -Ця дія дозволить Synergy бути у взаємодії з процесами, які мають підвищеній рівень доступу, та діалогу UAC (контроль облікових записів користувачів). Але це може викликати проблеми з процесами, які мають звичайний рівень доступу. Підвищуйте рівень доступу Synergy тільки в тому випадку, коли це дійсно потрібно. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + Дійсно бажаєте підвищить рівень доступу Barrier? +Ця дія дозволить Barrier бути у взаємодії з процесами, які мають підвищеній рівень доступу, та діалогу UAC (контроль облікових записів користувачів). Але це може викликати проблеми з процесами, які мають звичайний рівень доступу. Підвищуйте рівень доступу Barrier тільки в тому випадку, коли це дійсно потрібно. @@ -1170,8 +1170,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - Встановлення Synergy + Setup Barrier + Встановлення Barrier @@ -1188,8 +1188,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - Встановлення Synergy + Setup Barrier + Встановлення Barrier @@ -1198,13 +1198,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! - Дякуємо за встановлення Synergy! + Thanks for installing Barrier! + Дякуємо за встановлення Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy дозволить Вам легко використовувати мишку та клавіатуру між декількома комп'ютерами за вашим столом, і це зовсім безкоштовний та відкритий продукт. Тільки підведіть курсор мишки до краю одного з комп'ютерів і він автоматично переміститься на інший. Також можна використовувати один буфер обміну між декількома комп'ютерами. Все що необхідно, це мережеве з'єднання. Synergy являється міжплатформовим продуктом (працює з Windows, Mac OS X та Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier дозволить Вам легко використовувати мишку та клавіатуру між декількома комп'ютерами за вашим столом, і це зовсім безкоштовний та відкритий продукт. Тільки підведіть курсор мишки до краю одного з комп'ютерів і він автоматично переміститься на інший. Також можна використовувати один буфер обміну між декількома комп'ютерами. Все що необхідно, це мережеве з'єднання. Barrier являється міжплатформовим продуктом (працює з Windows, Mac OS X та Linux). @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_ur.ts b/src/gui/res/lang/gui_ur.ts index eeccb241..1462b4cd 100644 --- a/src/gui/res/lang/gui_ur.ts +++ b/src/gui/res/lang/gui_ur.ts @@ -3,7 +3,7 @@ AboutDialogBase - About Synergy + About Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,7 +202,7 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found + Barrier server not found - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error + Barrier terminated with an error - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,17 +322,17 @@ Do you want to install Bonjour? - Synergy is starting. + Barrier is starting. - Synergy is running. + Barrier is running. - Synergy is not running. + Barrier is not running. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,7 +393,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,13 +1195,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy آپ کو آسانی سے اپنا ما٘وس اور کیبورڈ متعدد کمپیوٹرز کے ساتھ استعمال کرنے کی سہولت میسر کرتا ہے۔Synergy مفت اور اوپن سورس ہے۔ صرف ایک کمپیوٹر اسکرین کے کنارے سے دوسرے پر اپنے ماؤس لے جائیں اور بس۔ آپ تمام کمپیوٹرز کے کلپ بورڈ ایک دوسرے کے ساتھ تبدیل بھی کر سکتے ہیں۔ یہ سب کرنے کے لیے صرف ایک نیٹ ورک کنکشن کی ضرورت ہے۔ Synergy متعدد آپریٹنگ سسٹمز (ونڈوز، میک OS X اور لینکس) کے ساتھ استعمال کیا جا سکتا ہے + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier آپ کو آسانی سے اپنا ما٘وس اور کیبورڈ متعدد کمپیوٹرز کے ساتھ استعمال کرنے کی سہولت میسر کرتا ہے۔Barrier مفت اور اوپن سورس ہے۔ صرف ایک کمپیوٹر اسکرین کے کنارے سے دوسرے پر اپنے ماؤس لے جائیں اور بس۔ آپ تمام کمپیوٹرز کے کلپ بورڈ ایک دوسرے کے ساتھ تبدیل بھی کر سکتے ہیں۔ یہ سب کرنے کے لیے صرف ایک نیٹ ورک کنکشن کی ضرورت ہے۔ Barrier متعدد آپریٹنگ سسٹمز (ونڈوز، میک OS X اور لینکس) کے ساتھ استعمال کیا جا سکتا ہے @@ -1387,7 +1387,7 @@ Server response: - Synergy + Barrier diff --git a/src/gui/res/lang/gui_vi.ts b/src/gui/res/lang/gui_vi.ts index 9d63796d..318e853d 100644 --- a/src/gui/res/lang/gui_vi.ts +++ b/src/gui/res/lang/gui_vi.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - Thông tin về Synergy + About Barrier + Thông tin về Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>Phiên bản Synergy của bạn đã cũ. Phiên bản mới <b>%1</b> đã có để <a href="%2">tải về</a>.</p> + <p>Phiên bản Barrier của bạn đã cũ. Phiên bản mới <b>%1</b> đã có để <a href="%2">tải về</a>.</p> @@ -218,12 +218,12 @@ Visit our website for help and info (symless.com). - Synergy client not found + Barrier client not found - The executable for the synergy client does not exist. + The executable for the barrier client does not exist. @@ -233,7 +233,7 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. + Please fill in a hostname for the barrier client to connect to. @@ -243,7 +243,7 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. + The temporary configuration file required to start barrier can not be written. @@ -253,27 +253,27 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? - Synergy server not found - Không tìm thấy máy chủ Synergy + Barrier server not found + Không tìm thấy máy chủ Barrier - The executable for the synergy server does not exist. + The executable for the barrier server does not exist. - Synergy terminated with an error - Synergy đã ngừng vì lỗi + Barrier terminated with an error + Barrier đã ngừng vì lỗi - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy đang khởi động. + Barrier is starting. + Barrier đang khởi động. - Synergy is running. - Synergy đang chạy. + Barrier is running. + Barrier đang chạy. - Synergy is not running. - Synergy không chạy. + Barrier is not running. + Barrier không chạy. @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file + Browse for a barriers config file - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,7 +479,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... + &About Barrier... @@ -599,7 +599,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy + Setup Barrier @@ -648,12 +648,12 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) + Barrier Configurations (*.sgc);;All files (*.*) - Synergy Configurations (*.conf);;All files (*.*) + Barrier Configurations (*.conf);;All files (*.*) @@ -887,7 +887,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. @@ -1044,14 +1044,14 @@ Double click on a screen to edit its settings. - Elevate Synergy + Elevate Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. @@ -1167,7 +1167,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy + Setup Barrier @@ -1185,7 +1185,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy + Setup Barrier @@ -1195,13 +1195,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! + Thanks for installing Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Sức mạnh tổng hợp cho phép bạn dễ dàng chia sẻ chuột và bàn phím giữa nhiều máy tính trên bàn của bạn, và nó là miễn phí và mã nguồn mở. Chỉ cần di chuyển chuột của bạn khỏi các cạnh của màn hình một máy tính khác. Bạn thậm chí có thể chia sẻ tất cả các clipboards của bạn. Tất cả bạn cần là một kết nối mạng. Synergy là nền tảng chéo (hoạt động trên Windows, Mac OS X và Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Sức mạnh tổng hợp cho phép bạn dễ dàng chia sẻ chuột và bàn phím giữa nhiều máy tính trên bàn của bạn, và nó là miễn phí và mã nguồn mở. Chỉ cần di chuyển chuột của bạn khỏi các cạnh của màn hình một máy tính khác. Bạn thậm chí có thể chia sẻ tất cả các clipboards của bạn. Tất cả bạn cần là một kết nối mạng. Barrier là nền tảng chéo (hoạt động trên Windows, Mac OS X và Linux). @@ -1387,8 +1387,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_zh-CN.ts b/src/gui/res/lang/gui_zh-CN.ts index ee0638f1..4ae5d584 100644 --- a/src/gui/res/lang/gui_zh-CN.ts +++ b/src/gui/res/lang/gui_zh-CN.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - 关于Synergy + About Barrier + 关于Barrier @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>您正在使用的Synergy版本有些过时了，有新版 <b>%1</b> 可以 <a href="%2">下载</a>。</p> + <p>您正在使用的Barrier版本有些过时了，有新版 <b>%1</b> 可以 <a href="%2">下载</a>。</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - 未找到Synergy客户端 + Barrier client not found + 未找到Barrier客户端 - The executable for the synergy client does not exist. - Synergy客户端的可执行程序不存在。 + The executable for the barrier client does not exist. + Barrier客户端的可执行程序不存在。 @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - 请为Synergy客户端设置一个用于连接的主机名 + Please fill in a hostname for the barrier client to connect to. + 请为Barrier客户端设置一个用于连接的主机名 @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - 启动Synergy所需的临时配置文件不可写。 + The temporary configuration file required to start barrier can not be written. + 启动Barrier所需的临时配置文件不可写。 @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - 你没有为Synergy服务端设置一个可用的配置文件。需要现在浏览配置文件吗？ + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + 你没有为Barrier服务端设置一个可用的配置文件。需要现在浏览配置文件吗？ - Synergy server not found - 未找到Synergy服务端 + Barrier server not found + 未找到Barrier服务端 - The executable for the synergy server does not exist. - Synergy服务端可执行程序不存在。 + The executable for the barrier server does not exist. + Barrier服务端可执行程序不存在。 - Synergy terminated with an error - Synergy因错终止运行 + Barrier terminated with an error + Barrier因错终止运行 - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy意外终止运行，退出代码 %1。<br><br>请查看输出日志了解详情。 + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier意外终止运行，退出代码 %1。<br><br>请查看输出日志了解详情。 @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy正在启动 + Barrier is starting. + Barrier正在启动 - Synergy is running. - Synergy正在运行 + Barrier is running. + Barrier正在运行 - Synergy is not running. - Synergy没有运行 + Barrier is not running. + Barrier没有运行 @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file - 浏览Synergy配置文件 + Browse for a barriers config file + 浏览Barrier配置文件 - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - 关于Synergy… + &About Barrier... + 关于Barrier… @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - 设置Synergy + Setup Barrier + 设置Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergy配置文件(*.sgc);;所有文件 (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrier配置文件(*.sgc);;所有文件 (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy配置文件(*.conf);;所有文件 (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier配置文件(*.conf);;所有文件 (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - 设置Synergy服务端配置的屏幕布局。 + Configure the layout of your barrier server configuration. + 设置Barrier服务端配置的屏幕布局。 @@ -1046,16 +1046,16 @@ Double click on a screen to edit its settings. - Elevate Synergy - 评价Synergy + Elevate Barrier + 评价Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - 您确定要elevate Synergy吗？ -这会允许Synergy和elevated进程交互和UAC对话框，但是可能引起一切和非elevated进程交互的问题。只有在你需要的时候才Elevate Synergy。 +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + 您确定要elevate Barrier吗？ +这会允许Barrier和elevated进程交互和UAC对话框，但是可能引起一切和非elevated进程交互的问题。只有在你需要的时候才Elevate Barrier。 @@ -1170,8 +1170,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - 设置Synergy + Setup Barrier + 设置Barrier @@ -1188,8 +1188,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - 设置Synergy + Setup Barrier + 设置Barrier @@ -1198,13 +1198,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! - 感谢您安装Synergy！ + Thanks for installing Barrier! + 感谢您安装Barrier！ - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy允许你轻松地在你办公桌上多台计算机之间共享你的鼠标和键盘，它免费并且开放源代码。你只要将鼠标（指针）从一台计算机的屏幕边缘移出到另一个屏幕就行了。甚至可以共享你的剪贴板。你所需要的仅仅是一个网络连接。Synergy是跨平台的（可以运行于Windows，Mac OS X和Linux）。 + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier允许你轻松地在你办公桌上多台计算机之间共享你的鼠标和键盘，它免费并且开放源代码。你只要将鼠标（指针）从一台计算机的屏幕边缘移出到另一个屏幕就行了。甚至可以共享你的剪贴板。你所需要的仅仅是一个网络连接。Barrier是跨平台的（可以运行于Windows，Mac OS X和Linux）。 @@ -1393,8 +1393,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/lang/gui_zh-TW.ts b/src/gui/res/lang/gui_zh-TW.ts index d0a9e400..aebd077a 100644 --- a/src/gui/res/lang/gui_zh-TW.ts +++ b/src/gui/res/lang/gui_zh-TW.ts @@ -3,8 +3,8 @@ AboutDialogBase - About Synergy - 關於Synergy... + About Barrier + 關於Barrier... @@ -12,18 +12,18 @@ Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz.<br /><br /> Visit our website for help and info (symless.com). </p> @@ -202,9 +202,9 @@ Visit our website for help and info (symless.com). - <p>Your version of Synergy is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> + <p>Your version of Barrier is out of date. Version <b>%1</b> is now available to <a href="%2">download</a>.</p> <p>Version %1 is now available, <a href="%2">visit website</a>.</p> - <p>你的Synergy版本已經太舊， 版本 <b>%1</b>已經可以至 <a href="%2">下載</a>。</p> + <p>你的Barrier版本已經太舊， 版本 <b>%1</b>已經可以至 <a href="%2">下載</a>。</p> @@ -218,13 +218,13 @@ Visit our website for help and info (symless.com). - Synergy client not found - 找不到Synergy客戶端 + Barrier client not found + 找不到Barrier客戶端 - The executable for the synergy client does not exist. - Synergy客戶端執行檔不存在。 + The executable for the barrier client does not exist. + Barrier客戶端執行檔不存在。 @@ -233,8 +233,8 @@ Visit our website for help and info (symless.com). - Please fill in a hostname for the synergy client to connect to. - 請輸入synergy客戶端要連接的電腦名稱。 + Please fill in a hostname for the barrier client to connect to. + 請輸入barrier客戶端要連接的電腦名稱。 @@ -243,8 +243,8 @@ Visit our website for help and info (symless.com). - The temporary configuration file required to start synergy can not be written. - 無法寫入用以啟動synergy的暫存設定檔 + The temporary configuration file required to start barrier can not be written. + 無法寫入用以啟動barrier的暫存設定檔 @@ -253,28 +253,28 @@ Visit our website for help and info (symless.com). - You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now? - 你沒有輸入有效的synergy伺服器設定檔，你需要現在瀏覽設定檔嗎？ + You have not filled in a valid configuration file for the barrier server. Do you want to browse for the configuration file now? + 你沒有輸入有效的barrier伺服器設定檔，你需要現在瀏覽設定檔嗎？ - Synergy server not found - 找不到Synergy伺服器 + Barrier server not found + 找不到Barrier伺服器 - The executable for the synergy server does not exist. - Synergy伺服器執行檔不存在。 + The executable for the barrier server does not exist. + Barrier伺服器執行檔不存在。 - Synergy terminated with an error - Synergy遇到錯誤，停止運作 + Barrier terminated with an error + Barrier遇到錯誤，停止運作 - Synergy terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. - Synergy遇到錯誤，停止運作，錯誤碼 %1<br><br>詳細情況可參考記錄日誌。 + Barrier terminated unexpectedly with an exit code of %1.<br><br>Please see the log output for details. + Barrier遇到錯誤，停止運作，錯誤碼 %1<br><br>詳細情況可參考記錄日誌。 @@ -322,18 +322,18 @@ Do you want to install Bonjour? - Synergy is starting. - Synergy正在啟動中。 + Barrier is starting. + Barrier正在啟動中。 - Synergy is running. - Synergy正在運作中。 + Barrier is running. + Barrier正在運作中。 - Synergy is not running. - Synergy不在運作中。 + Barrier is not running. + Barrier不在運作中。 @@ -344,17 +344,17 @@ Do you want to install Bonjour? - Synergy - Synergy + Barrier + Barrier - Browse for a synergys config file + Browse for a barriers config file 瀏覽以選擇設定檔 - Synergy is now connected, You can close the config window. Synergy will remain connected in the background. + Barrier is now connected, You can close the config window. Barrier will remain connected in the background. @@ -393,8 +393,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re MainWindowBase - Synergy - Synergy + Barrier + Barrier @@ -479,8 +479,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - &About Synergy... - 關於Synergy... + &About Barrier... + 關於Barrier... @@ -599,8 +599,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re PluginWizardPage - Setup Synergy - 設定Synergy + Setup Barrier + 設定Barrier @@ -648,13 +648,13 @@ To automatically trust this fingerprint for future connections, click Yes. To re QObject - Synergy Configurations (*.sgc);;All files (*.*) - Synergy 設定檔 (*.sgc);;所有檔案 (*.*) + Barrier Configurations (*.sgc);;All files (*.*) + Barrier 設定檔 (*.sgc);;所有檔案 (*.*) - Synergy Configurations (*.conf);;All files (*.*) - Synergy 設定檔 (*.conf);;所有檔案 (*.*) + Barrier Configurations (*.conf);;All files (*.*) + Barrier 設定檔 (*.conf);;所有檔案 (*.*) @@ -887,8 +887,8 @@ To automatically trust this fingerprint for future connections, click Yes. To re - Configure the layout of your synergy server configuration. - 設定synergy伺服器設定佈局 + Configure the layout of your barrier server configuration. + 設定barrier伺服器設定佈局 @@ -1046,16 +1046,16 @@ Double click on a screen to edit its settings. - Elevate Synergy - 以管理員身份使用 Synergy + Elevate Barrier + 以管理員身份使用 Barrier - Are you sure you want to elevate Synergy? + Are you sure you want to elevate Barrier? -This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to. - 你是否肯定以管理員身份使用 Synergy ? -這將會容許 Synergy 接觸系統程序及 UAC 使用者帳戶控制，但可能會與非管理員身份執行的程式發生問題。請認真考慮。 +This allows Barrier to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Barrier only if you really need to. + 你是否肯定以管理員身份使用 Barrier ? +這將會容許 Barrier 接觸系統程序及 UAC 使用者帳戶控制，但可能會與非管理員身份執行的程式發生問題。請認真考慮。 @@ -1170,8 +1170,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizard - Setup Synergy - 設定Synergy + Setup Barrier + 設定Barrier @@ -1188,8 +1188,8 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but SetupWizardBase - Setup Synergy - 設定Synergy + Setup Barrier + 設定Barrier @@ -1198,13 +1198,13 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but - Thanks for installing Synergy! - 感謝您安裝Synergy! + Thanks for installing Barrier! + 感謝您安裝Barrier! - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). - Synergy是能讓您於多台電腦之間共享一組鍵盤與滑鼠的自由、開源軟體。您只須將滑鼠移出電腦螢幕邊緣就能遊走於不同電腦之間，甚至能共用每台電腦的系統剪貼簿。這些功能僅需依靠一條網路線連結，而且Synergy是跨平台的（可於Windows、Mac OS X及Linux上執行）。 + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). + Barrier是能讓您於多台電腦之間共享一組鍵盤與滑鼠的自由、開源軟體。您只須將滑鼠移出電腦螢幕邊緣就能遊走於不同電腦之間，甚至能共用每台電腦的系統剪貼簿。這些功能僅需依靠一條網路線連結，而且Barrier是跨平台的（可於Windows、Mac OS X及Linux上執行）。 @@ -1396,8 +1396,8 @@ Server response: - Synergy - Synergy + Barrier + Barrier diff --git a/src/gui/res/mac/Info.plist b/src/gui/res/mac/Info.plist index b2d87e09..d48d7c60 100644 --- a/src/gui/res/mac/Info.plist +++ b/src/gui/res/mac/Info.plist @@ -4,18 +4,18 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - Synergy + Barrier CFBundleExecutable - Synergy + Barrier CFBundleIconFile - Synergy.icns + Barrier.icns CFBundleIdentifier - synergy + barrier CFBundleInfoDictionaryVersion 6.0 CFBundleName - Synergy + Barrier CFBundlePackageType APPL CFBundleShortVersionString diff --git a/src/gui/res/mac/QSynergy.icns b/src/gui/res/mac/QBarrier.icns similarity index 100% rename from src/gui/res/mac/QSynergy.icns rename to src/gui/res/mac/QBarrier.icns diff --git a/src/gui/res/win/Barrier.rc b/src/gui/res/win/Barrier.rc new file mode 100644 index 00000000..9db2b3ea --- /dev/null +++ b/src/gui/res/win/Barrier.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "../icons/256x256/barrier.ico" diff --git a/src/gui/res/win/Synergy.rc b/src/gui/res/win/Synergy.rc deleted file mode 100644 index 62ec63d6..00000000 --- a/src/gui/res/win/Synergy.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "../icons/256x256/synergy.ico" diff --git a/src/gui/src/AboutDialog.cpp b/src/gui/src/AboutDialog.cpp index e86e707c..76ba26bb 100644 --- a/src/gui/src/AboutDialog.cpp +++ b/src/gui/src/AboutDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -21,20 +21,20 @@ #include #include -AboutDialog::AboutDialog(QWidget* parent, const QString& synergyApp) : +AboutDialog::AboutDialog(QWidget* parent, const QString& barrierApp) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), Ui::AboutDialogBase() { setupUi(this); - m_versionChecker.setApp(synergyApp); + m_versionChecker.setApp(barrierApp); QString version = m_versionChecker.getVersion(); - version = version + '-' + SYNERGY_VERSION_STAGE; -#ifdef SYNERGY_REVISION + version = version + '-' + BARRIER_VERSION_STAGE; +#ifdef BARRIER_REVISION version += '-'; - version += SYNERGY_REVISION; + version += BARRIER_REVISION; #endif - m_pLabelSynergyVersion->setText(version); + m_pLabelBarrierVersion->setText(version); QString buildDateString = QString::fromLocal8Bit(__DATE__).simplified(); QDate buildDate = QLocale("en_US").toDate(buildDateString, "MMM d yyyy"); diff --git a/src/gui/src/AboutDialog.h b/src/gui/src/AboutDialog.h index bb53125b..3c498b4f 100644 --- a/src/gui/src/AboutDialog.h +++ b/src/gui/src/AboutDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -33,7 +33,7 @@ class AboutDialog : public QDialog, public Ui::AboutDialogBase Q_OBJECT public: - AboutDialog(QWidget* parent, const QString& synergyApp = QString()); + AboutDialog(QWidget* parent, const QString& barrierApp = QString()); private: VersionChecker m_versionChecker; diff --git a/src/gui/src/AboutDialogBase.ui b/src/gui/src/AboutDialogBase.ui index b20e3a50..ed3e4d88 100644 --- a/src/gui/src/AboutDialogBase.ui +++ b/src/gui/src/AboutDialogBase.ui @@ -35,7 +35,7 @@ - About Synergy + About Barrier true @@ -52,12 +52,12 @@ <p> Keyboard and mouse sharing application. Cross platform and open source.<br /><br /> +Copyright © 2012-2018 Debauchee Open Source Group<br /> Copyright © 2012-2016 Symless Ltd.<br /> Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.<br /><br /> -Synergy is released under the GNU General Public License (GPLv2).<br /><br /> -Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.<br /> -The Synergy GUI is based on QSynergy by Volker Lanz.<br /><br /> -Visit our website for help and info (symless.com). +Barrier is released under the GNU General Public License (GPLv2).<br /><br /> +Barrier is based on CosmoBarrier by Richard Lee and Adam Feder.<br /> +The Barrier GUI is based on QBarrier by Volker Lanz. </p> @@ -87,7 +87,7 @@ Visit our website for help and info (symless.com). - :/res/image/about.png + :/res/image/about.png 0 @@ -129,7 +129,7 @@ Visit our website for help and info (symless.com). - + 0 @@ -200,7 +200,7 @@ Visit our website for help and info (symless.com). - + diff --git a/src/gui/src/Action.cpp b/src/gui/src/Action.cpp index 5d3792ef..2e0f3397 100644 --- a/src/gui/src/Action.cpp +++ b/src/gui/src/Action.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/Action.h b/src/gui/src/Action.h index dea98df6..27868422 100644 --- a/src/gui/src/Action.h +++ b/src/gui/src/Action.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ActionDialog.cpp b/src/gui/src/ActionDialog.cpp index 94950338..e824ea3c 100644 --- a/src/gui/src/ActionDialog.cpp +++ b/src/gui/src/ActionDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ActionDialog.h b/src/gui/src/ActionDialog.h index 34e4e856..388be1f1 100644 --- a/src/gui/src/ActionDialog.h +++ b/src/gui/src/ActionDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ActivationDialog.cpp b/src/gui/src/ActivationDialog.cpp index eb6593b5..95571e71 100644 --- a/src/gui/src/ActivationDialog.cpp +++ b/src/gui/src/ActivationDialog.cpp @@ -36,7 +36,7 @@ void ActivationDialog::refreshSerialKey() ui->m_pTextEditSerialKey->moveCursor(QTextCursor::End); ui->m_trialLabel->setText(tr("

Your trial has " "expired. Buy now!" "

") @@ -77,7 +77,7 @@ void ActivationDialog::accept() } catch (std::exception& e) { message.critical(this, "Unknown Error", - tr("An error occurred while trying to activate Synergy. " + tr("An error occurred while trying to activate Barrier. " "Please contact the helpdesk, and provide the " "following information:\n\n%1").arg(e.what())); refreshSerialKey(); diff --git a/src/gui/src/ActivationDialog.ui b/src/gui/src/ActivationDialog.ui index 86fea30d..6d33eddf 100644 --- a/src/gui/src/ActivationDialog.ui +++ b/src/gui/src/ActivationDialog.ui @@ -11,7 +11,7 @@ - Activate Synergy + Activate Barrier @@ -78,7 +78,7 @@ p, li { white-space: pre-wrap; } - :/res/icons/16x16/money.png + :/res/icons/16x16/money.png @@ -124,7 +124,7 @@ p, li { white-space: pre-wrap; } m_pTextEditSerialKey - + diff --git a/src/gui/src/ActivationNotifier.cpp b/src/gui/src/ActivationNotifier.cpp index cfe99810..9147fbe2 100644 --- a/src/gui/src/ActivationNotifier.cpp +++ b/src/gui/src/ActivationNotifier.cpp @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2015 Synergy Seamless Inc. + * barrier -- mouse and keyboard sharing utility + * Copyright (C) 2015 Barrier Seamless Inc. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/gui/src/ActivationNotifier.h b/src/gui/src/ActivationNotifier.h index 36ac76f4..2c0a0cd8 100644 --- a/src/gui/src/ActivationNotifier.h +++ b/src/gui/src/ActivationNotifier.h @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2015 Synergy Seamless Inc. + * barrier -- mouse and keyboard sharing utility + * Copyright (C) 2015 Barrier Seamless Inc. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/gui/src/AddClientDialog.cpp b/src/gui/src/AddClientDialog.cpp index fd2f1d10..afa945df 100644 --- a/src/gui/src/AddClientDialog.cpp +++ b/src/gui/src/AddClientDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/AddClientDialog.h b/src/gui/src/AddClientDialog.h index 0563ddc7..6d49cee5 100644 --- a/src/gui/src/AddClientDialog.h +++ b/src/gui/src/AddClientDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp index 3fac02a9..ab674306 100644 --- a/src/gui/src/AppConfig.cpp +++ b/src/gui/src/AppConfig.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -23,14 +23,14 @@ #include #if defined(Q_OS_WIN) -const char AppConfig::m_SynergysName[] = "synergys.exe"; -const char AppConfig::m_SynergycName[] = "synergyc.exe"; -const char AppConfig::m_SynergyLogDir[] = "log/"; +const char AppConfig::m_BarriersName[] = "barriers.exe"; +const char AppConfig::m_BarriercName[] = "barrierc.exe"; +const char AppConfig::m_BarrierLogDir[] = "log/"; #define DEFAULT_PROCESS_MODE Service #else -const char AppConfig::m_SynergysName[] = "synergys"; -const char AppConfig::m_SynergycName[] = "synergyc"; -const char AppConfig::m_SynergyLogDir[] = "/var/log/"; +const char AppConfig::m_BarriersName[] = "barriers"; +const char AppConfig::m_BarriercName[] = "barrierc"; +const char AppConfig::m_BarrierLogDir[] = "/var/log/"; #define DEFAULT_PROCESS_MODE Desktop #endif @@ -84,26 +84,26 @@ bool AppConfig::logToFile() const { return m_LogToFile; } const QString &AppConfig::logFilename() const { return m_LogFilename; } -QString AppConfig::synergyLogDir() const +QString AppConfig::barrierLogDir() const { #if defined(Q_OS_WIN) // on windows, we want to log to program files - return synergyProgramDir() + "log/"; + return barrierProgramDir() + "log/"; #else // on unix, we'll log to the standard log dir return "/var/log/"; #endif } -QString AppConfig::synergyProgramDir() const +QString AppConfig::barrierProgramDir() const { - // synergy binaries should be in the same dir. + // barrier binaries should be in the same dir. return QCoreApplication::applicationDirPath() + "/"; } void AppConfig::persistLogDir() { - QDir dir = synergyLogDir(); + QDir dir = barrierLogDir(); // persist the log directory if (!dir.exists()) @@ -144,7 +144,7 @@ void AppConfig::loadSettings() m_Interface = settings().value("interface").toString(); m_LogLevel = settings().value("logLevel", 3).toInt(); // level 3: INFO m_LogToFile = settings().value("logToFile", false).toBool(); - m_LogFilename = settings().value("logFilename", synergyLogDir() + "synergy.log").toString(); + m_LogFilename = settings().value("logFilename", barrierLogDir() + "barrier.log").toString(); m_WizardLastRun = settings().value("wizardLastRun", 0).toInt(); m_Language = settings().value("language", QLocale::system().name()).toString(); m_StartedBefore = settings().value("startedBefore", false).toBool(); @@ -270,9 +270,9 @@ int AppConfig::lastExpiringWarningTime() const { return m_LastExpiringWarningTim void AppConfig::setLastExpiringWarningTime(int t) { m_LastExpiringWarningTime = t; } -QString AppConfig::synergysName() const { return m_SynergysName; } +QString AppConfig::barriersName() const { return m_BarriersName; } -QString AppConfig::synergycName() const { return m_SynergycName; } +QString AppConfig::barriercName() const { return m_BarriercName; } ElevateMode AppConfig::elevateMode() { diff --git a/src/gui/src/AppConfig.h b/src/gui/src/AppConfig.h index fb4b37ed..c9fbda0e 100644 --- a/src/gui/src/AppConfig.h +++ b/src/gui/src/AppConfig.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -87,10 +87,10 @@ class AppConfig: public QObject int lastExpiringWarningTime() const; void setLastExpiringWarningTime(int t); - QString synergysName() const; - QString synergycName() const; - QString synergyProgramDir() const; - QString synergyLogDir() const; + QString barriersName() const; + QString barriercName() const; + QString barrierProgramDir() const; + QString barrierLogDir() const; bool detectPath(const QString& name, QString& path); void persistLogDir(); @@ -148,9 +148,9 @@ protected: int m_LastExpiringWarningTime; bool m_ActivationHasRun; - static const char m_SynergysName[]; - static const char m_SynergycName[]; - static const char m_SynergyLogDir[]; + static const char m_BarriersName[]; + static const char m_BarriercName[]; + static const char m_BarrierLogDir[]; signals: void sslToggled(bool enabled); diff --git a/src/gui/src/SynergyLocale.cpp b/src/gui/src/BarrierLocale.cpp similarity index 81% rename from src/gui/src/SynergyLocale.cpp rename to src/gui/src/BarrierLocale.cpp index 488cd0f0..c9785c57 100644 --- a/src/gui/src/SynergyLocale.cpp +++ b/src/gui/src/BarrierLocale.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,18 +15,18 @@ * along with this program. If not, see */ -#include "SynergyLocale.h" +#include "BarrierLocale.h" #include #include #include -SynergyLocale::SynergyLocale() +BarrierLocale::BarrierLocale() { loadLanguages(); } -void SynergyLocale::loadLanguages() +void BarrierLocale::loadLanguages() { QResource resource(":/res/lang/Languages.xml"); QByteArray bytes(reinterpret_cast(resource.data()), resource.size()); @@ -51,15 +51,15 @@ void SynergyLocale::loadLanguages() } } -void SynergyLocale::addLanguage(const QString& ietfCode, const QString& name) +void BarrierLocale::addLanguage(const QString& ietfCode, const QString& name) { - m_Languages.push_back(SynergyLocale::Language(ietfCode, name)); + m_Languages.push_back(BarrierLocale::Language(ietfCode, name)); } -void SynergyLocale::fillLanguageComboBox(QComboBox* comboBox) +void BarrierLocale::fillLanguageComboBox(QComboBox* comboBox) { comboBox->blockSignals(true); - QVector::iterator it; + QVector::iterator it; for (it = m_Languages.begin(); it != m_Languages.end(); ++it) { comboBox->addItem((*it).m_Name, (*it).m_IetfCode); diff --git a/src/gui/src/SynergyLocale.h b/src/gui/src/BarrierLocale.h similarity index 92% rename from src/gui/src/SynergyLocale.h rename to src/gui/src/BarrierLocale.h index beaa4f7d..a6454eaf 100644 --- a/src/gui/src/SynergyLocale.h +++ b/src/gui/src/BarrierLocale.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #include #include -class SynergyLocale +class BarrierLocale { class Language { @@ -36,7 +36,7 @@ class SynergyLocale }; public: - SynergyLocale(); + BarrierLocale(); void fillLanguageComboBox(QComboBox* comboBox); private: diff --git a/src/gui/src/BaseConfig.cpp b/src/gui/src/BaseConfig.cpp index 8def4f7b..36fe4307 100644 --- a/src/gui/src/BaseConfig.cpp +++ b/src/gui/src/BaseConfig.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/BaseConfig.h b/src/gui/src/BaseConfig.h index f6f38834..f1769bbb 100644 --- a/src/gui/src/BaseConfig.h +++ b/src/gui/src/BaseConfig.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/CancelActivationDialog.ui b/src/gui/src/CancelActivationDialog.ui index 054b3fe6..397913c3 100644 --- a/src/gui/src/CancelActivationDialog.ui +++ b/src/gui/src/CancelActivationDialog.ui @@ -19,7 +19,7 @@ Are you sure? -If you don't activate Synergy you'll be missing out on some great features. +If you don't activate Barrier you'll be missing out on some great features. true diff --git a/src/gui/src/CommandProcess.cpp b/src/gui/src/CommandProcess.cpp index 361d14fe..c85e847b 100644 --- a/src/gui/src/CommandProcess.cpp +++ b/src/gui/src/CommandProcess.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/CommandProcess.h b/src/gui/src/CommandProcess.h index 62397907..3e9763b8 100644 --- a/src/gui/src/CommandProcess.h +++ b/src/gui/src/CommandProcess.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/CoreInterface.cpp b/src/gui/src/CoreInterface.cpp index ef3dc326..d5ed40d2 100644 --- a/src/gui/src/CoreInterface.cpp +++ b/src/gui/src/CoreInterface.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -29,9 +29,9 @@ static const char kCoreBinary[] = "syntool"; #ifdef Q_WS_WIN -static const char kSerialKeyFilename[] = "Synergy.subkey"; +static const char kSerialKeyFilename[] = "Barrier.subkey"; #else -static const char kSerialKeyFilename[] = ".synergy.subkey"; +static const char kSerialKeyFilename[] = ".barrier.subkey"; #endif CoreInterface::CoreInterface() diff --git a/src/gui/src/CoreInterface.h b/src/gui/src/CoreInterface.h index 45ae47d1..26b9c0ab 100644 --- a/src/gui/src/CoreInterface.h +++ b/src/gui/src/CoreInterface.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/DataDownloader.cpp b/src/gui/src/DataDownloader.cpp index 4f778489..c71c73f5 100644 --- a/src/gui/src/DataDownloader.cpp +++ b/src/gui/src/DataDownloader.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/DataDownloader.h b/src/gui/src/DataDownloader.h index 7eb7d3ed..46f7a0d6 100644 --- a/src/gui/src/DataDownloader.h +++ b/src/gui/src/DataDownloader.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/ElevateMode.h b/src/gui/src/ElevateMode.h index 7e39eb52..b1dce7c4 100644 --- a/src/gui/src/ElevateMode.h +++ b/src/gui/src/ElevateMode.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless * * This package is free software; you can redistribute it and/or @@ -18,11 +18,11 @@ #pragma once // The elevate mode tristate determines two behaviours on Windows. -// The first, switch-on-desk-switch (SodS), passed through synergyd as a -// command line argument to synergy core, determines if the server restarts +// The first, switch-on-desk-switch (SodS), passed through barrierd as a +// command line argument to barrier core, determines if the server restarts // when switching Windows desktops (e.g. when Windows UAC dialog pops up). -// The second, passed as a boolean flag to Synergyd over the IPC inside -// kIpcCommandMessage, determines whether Synergy should be started with +// The second, passed as a boolean flag to Barrierd over the IPC inside +// kIpcCommandMessage, determines whether Barrier should be started with // elevated privileges. // // The matrix for these two behaviours is as follows: diff --git a/src/gui/src/FailedLoginDialog.ui b/src/gui/src/FailedLoginDialog.ui index d3c6b507..526d1781 100644 --- a/src/gui/src/FailedLoginDialog.ui +++ b/src/gui/src/FailedLoginDialog.ui @@ -55,7 +55,7 @@ - An error occurred while trying to activate Synergy. The Symless server returned the following error: + An error occurred while trying to activate Barrier. The Symless server returned the following error: %1 diff --git a/src/gui/src/Fingerprint.cpp b/src/gui/src/Fingerprint.cpp index c9d331e6..be8b4017 100644 --- a/src/gui/src/Fingerprint.cpp +++ b/src/gui/src/Fingerprint.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/Fingerprint.h b/src/gui/src/Fingerprint.h index 24e10984..ad5ce593 100644 --- a/src/gui/src/Fingerprint.h +++ b/src/gui/src/Fingerprint.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/Hotkey.cpp b/src/gui/src/Hotkey.cpp index d2234130..c7138e7a 100644 --- a/src/gui/src/Hotkey.cpp +++ b/src/gui/src/Hotkey.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/Hotkey.h b/src/gui/src/Hotkey.h index cc32a432..475da023 100644 --- a/src/gui/src/Hotkey.h +++ b/src/gui/src/Hotkey.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/HotkeyDialog.cpp b/src/gui/src/HotkeyDialog.cpp index 5c08d38f..ef25c3fc 100644 --- a/src/gui/src/HotkeyDialog.cpp +++ b/src/gui/src/HotkeyDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/HotkeyDialog.h b/src/gui/src/HotkeyDialog.h index efea813f..a13fc244 100644 --- a/src/gui/src/HotkeyDialog.h +++ b/src/gui/src/HotkeyDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/Ipc.cpp b/src/gui/src/Ipc.cpp index 3f4afbc7..ed429ac3 100644 --- a/src/gui/src/Ipc.cpp +++ b/src/gui/src/Ipc.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/gui/src/Ipc.h b/src/gui/src/Ipc.h index 9e627595..fe1ad085 100644 --- a/src/gui/src/Ipc.h +++ b/src/gui/src/Ipc.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/gui/src/IpcClient.cpp b/src/gui/src/IpcClient.cpp index 2322bc3d..da06ace4 100644 --- a/src/gui/src/IpcClient.cpp +++ b/src/gui/src/IpcClient.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/gui/src/IpcClient.h b/src/gui/src/IpcClient.h index ea4b4506..cd398b3d 100644 --- a/src/gui/src/IpcClient.h +++ b/src/gui/src/IpcClient.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/gui/src/IpcReader.cpp b/src/gui/src/IpcReader.cpp index 323a4103..edc34ce4 100644 --- a/src/gui/src/IpcReader.cpp +++ b/src/gui/src/IpcReader.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/gui/src/IpcReader.h b/src/gui/src/IpcReader.h index 8a3e7c09..388d9132 100644 --- a/src/gui/src/IpcReader.h +++ b/src/gui/src/IpcReader.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/gui/src/KeySequence.cpp b/src/gui/src/KeySequence.cpp index 8783609d..ee0fd562 100644 --- a/src/gui/src/KeySequence.cpp +++ b/src/gui/src/KeySequence.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -22,7 +22,7 @@ #include // this table originally comes from Qt sources (gui/kernel/qkeysequence.cpp) -// and is heavily modified for QSynergy +// and is heavily modified for QBarrier static const struct { int key; @@ -232,6 +232,6 @@ QString KeySequence::keyToString(int key) if (key < 0x10000) return QString("\\u%1").arg(QChar(key).toLower().unicode(), 4, 16, QChar('0')); - // give up, synergy probably won't handle this + // give up, barrier probably won't handle this return ""; } diff --git a/src/gui/src/KeySequence.h b/src/gui/src/KeySequence.h index 79f49c3a..8d9706d6 100644 --- a/src/gui/src/KeySequence.h +++ b/src/gui/src/KeySequence.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/KeySequenceWidget.cpp b/src/gui/src/KeySequenceWidget.cpp index c4ca4356..e5823e1c 100644 --- a/src/gui/src/KeySequenceWidget.cpp +++ b/src/gui/src/KeySequenceWidget.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/KeySequenceWidget.h b/src/gui/src/KeySequenceWidget.h index ecd81b94..eaef5143 100644 --- a/src/gui/src/KeySequenceWidget.h +++ b/src/gui/src/KeySequenceWidget.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/LicenseManager.cpp b/src/gui/src/LicenseManager.cpp index b608ae6c..30262ff3 100644 --- a/src/gui/src/LicenseManager.cpp +++ b/src/gui/src/LicenseManager.cpp @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2015 Synergy Seamless Inc. + * barrier -- mouse and keyboard sharing utility + * Copyright (C) 2015 Barrier Seamless Inc. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -134,7 +134,7 @@ void LicenseManager::skipActivation() QString LicenseManager::getEditionName(Edition const edition, bool trial) { - std::string name ("Synergy"); + std::string name ("Barrier"); switch (edition) { case kUnregistered: name += " (UNREGISTERED)"; diff --git a/src/gui/src/LicenseManager.h b/src/gui/src/LicenseManager.h index 88fdbb59..8cf931c7 100644 --- a/src/gui/src/LicenseManager.h +++ b/src/gui/src/LicenseManager.h @@ -1,6 +1,6 @@ /* - * synergy -- mouse and keyboard sharing utility - * Copyright (C) 2015 Synergy Seamless Inc. + * barrier -- mouse and keyboard sharing utility + * Copyright (C) 2015 Barrier Seamless Inc. * * This package is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index a55502dd..cb858b24 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#define DOWNLOAD_URL "http://symless.com/?source=gui" +#define DOWNLOAD_URL "http://github.com/debauchee/barrier/" #include @@ -57,23 +57,23 @@ #endif #if defined(Q_OS_WIN) -static const char synergyConfigName[] = "synergy.sgc"; -static const QString synergyConfigFilter(QObject::tr("Synergy Configurations (*.sgc);;All files (*.*)")); +static const char barrierConfigName[] = "barrier.sgc"; +static const QString barrierConfigFilter(QObject::tr("Barrier Configurations (*.sgc);;All files (*.*)")); static QString bonjourBaseUrl = "http://binaries.symless.com/bonjour/"; static const char bonjourFilename32[] = "Bonjour.msi"; static const char bonjourFilename64[] = "Bonjour64.msi"; static const char bonjourTargetFilename[] = "Bonjour.msi"; #else -static const char synergyConfigName[] = "synergy.conf"; -static const QString synergyConfigFilter(QObject::tr("Synergy Configurations (*.conf);;All files (*.*)")); +static const char barrierConfigName[] = "barrier.conf"; +static const QString barrierConfigFilter(QObject::tr("Barrier Configurations (*.conf);;All files (*.*)")); #endif -static const char* synergyIconFiles[] = +static const char* barrierIconFiles[] = { - ":/res/icons/16x16/synergy-disconnected.png", - ":/res/icons/16x16/synergy-disconnected.png", - ":/res/icons/16x16/synergy-connected.png", - ":/res/icons/16x16/synergy-transfering.png" + ":/res/icons/16x16/barrier-disconnected.png", + ":/res/icons/16x16/barrier-disconnected.png", + ":/res/icons/16x16/barrier-connected.png", + ":/res/icons/16x16/barrier-transfering.png" }; MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig, @@ -81,8 +81,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig, m_Settings(settings), m_AppConfig(&appConfig), m_LicenseManager(&licenseManager), - m_pSynergy(NULL), - m_SynergyState(synergyDisconnected), + m_pBarrier(NULL), + m_BarrierState(barrierDisconnected), m_ServerConfig(&m_Settings, 5, 3, m_AppConfig->screenName(), this), m_pTempConfigFile(NULL), m_pTrayIcon(NULL), @@ -111,7 +111,7 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig, initConnections(); m_pWidgetUpdate->hide(); - m_VersionChecker.setApp(appPath(appConfig.synergycName())); + m_VersionChecker.setApp(appPath(appConfig.barriercName())); m_pLabelScreenName->setText(getScreenName()); m_pLabelIpAddresses->setText(getIPAddresses()); @@ -204,11 +204,11 @@ void MainWindow::open() } // only start if user has previously started. this stops the gui from - // auto hiding before the user has configured synergy (which of course - // confuses first time users, who think synergy has crashed). + // auto hiding before the user has configured barrier (which of course + // confuses first time users, who think barrier has crashed). if (appConfig().startedBefore() && appConfig().processMode() == Desktop) { m_SuppressEmptyServerWarning = true; - startSynergy(); + startBarrier(); m_SuppressEmptyServerWarning = false; } } @@ -219,19 +219,19 @@ void MainWindow::onModeChanged(bool startDesktop, bool applyService) { // ensure that the apply button actually does something, since desktop // mode screws around with connecting/disconnecting the action. - disconnect(m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartSynergy, SLOT(trigger())); - connect(m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartSynergy, SLOT(trigger())); + disconnect(m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartBarrier, SLOT(trigger())); + connect(m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartBarrier, SLOT(trigger())); if (applyService) { stopDesktop(); - startSynergy(); + startBarrier(); } } else if ((appConfig().processMode() == Desktop) && startDesktop) { stopService(); - startSynergy(); + startBarrier(); } } @@ -244,8 +244,8 @@ void MainWindow::createTrayIcon() { m_pTrayIconMenu = new QMenu(this); - m_pTrayIconMenu->addAction(m_pActionStartSynergy); - m_pTrayIconMenu->addAction(m_pActionStopSynergy); + m_pTrayIconMenu->addAction(m_pActionStartBarrier); + m_pTrayIconMenu->addAction(m_pActionStopBarrier); m_pTrayIconMenu->addSeparator(); m_pTrayIconMenu->addAction(m_pActionMinimize); @@ -259,7 +259,7 @@ void MainWindow::createTrayIcon() connect(m_pTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason))); - setIcon(synergyDisconnected); + setIcon(barrierDisconnected); m_pTrayIcon->show(); } @@ -288,8 +288,8 @@ void MainWindow::createMenuBar() #endif m_pMenuBar->addAction(m_pMenuHelp->menuAction()); - m_pMenuFile->addAction(m_pActionStartSynergy); - m_pMenuFile->addAction(m_pActionStopSynergy); + m_pMenuFile->addAction(m_pActionStartBarrier); + m_pMenuFile->addAction(m_pActionStopBarrier); m_pMenuFile->addSeparator(); m_pMenuFile->addAction(m_pActivate); m_pMenuFile->addSeparator(); @@ -312,7 +312,7 @@ void MainWindow::loadSettings() m_pRadioInternalConfig->setChecked(settings().value("useInternalConfig", true).toBool()); m_pGroupServer->setChecked(settings().value("groupServerChecked", false).toBool()); - m_pLineEditConfigFile->setText(settings().value("configFile", QDir::homePath() + "/" + synergyConfigName).toString()); + m_pLineEditConfigFile->setText(settings().value("configFile", QDir::homePath() + "/" + barrierConfigName).toString()); m_pGroupClient->setChecked(settings().value("groupClientChecked", true).toBool()); m_pLineEditHostname->setText(settings().value("serverHostname").toString()); } @@ -321,8 +321,8 @@ void MainWindow::initConnections() { connect(m_pActionMinimize, SIGNAL(triggered()), this, SLOT(hide())); connect(m_pActionRestore, SIGNAL(triggered()), this, SLOT(showNormal())); - connect(m_pActionStartSynergy, SIGNAL(triggered()), this, SLOT(startSynergy())); - connect(m_pActionStopSynergy, SIGNAL(triggered()), this, SLOT(stopSynergy())); + connect(m_pActionStartBarrier, SIGNAL(triggered()), this, SLOT(startBarrier())); + connect(m_pActionStopBarrier, SIGNAL(triggered()), this, SLOT(stopBarrier())); connect(m_pActionQuit, SIGNAL(triggered()), qApp, SLOT(quit())); connect(&m_VersionChecker, SIGNAL(updateFound(const QString&)), this, SLOT(updateFound(const QString&))); } @@ -340,10 +340,10 @@ void MainWindow::saveSettings() settings().sync(); } -void MainWindow::setIcon(qSynergyState state) +void MainWindow::setIcon(qBarrierState state) { QIcon icon; - icon.addFile(synergyIconFiles[state]); + icon.addFile(barrierIconFiles[state]); if (m_pTrayIcon) m_pTrayIcon->setIcon(icon); @@ -369,9 +369,9 @@ void MainWindow::trayActivated(QSystemTrayIcon::ActivationReason reason) void MainWindow::logOutput() { - if (m_pSynergy) + if (m_pBarrier) { - QString text(m_pSynergy->readAllStandardOutput()); + QString text(m_pBarrier->readAllStandardOutput()); foreach(QString line, text.split(QRegExp("\r|\n|\r\n"))) { if (!line.isEmpty()) @@ -384,9 +384,9 @@ void MainWindow::logOutput() void MainWindow::logError() { - if (m_pSynergy) + if (m_pBarrier) { - appendLogRaw(m_pSynergy->readAllStandardError()); + appendLogRaw(m_pBarrier->readAllStandardError()); } } @@ -394,7 +394,7 @@ void MainWindow::updateFound(const QString &version) { m_pWidgetUpdate->show(); m_pLabelUpdate->setText( - tr("

Your version of Synergy is out of date. " + tr("

Your version of Barrier is out of date. " "Version %1 is now available to " "download.

") .arg(version).arg(DOWNLOAD_URL)); @@ -441,13 +441,13 @@ void MainWindow::checkConnected(const QString& line) line.contains("connected to server") || line.contains("watchdog status: ok")) { - setSynergyState(synergyConnected); + setBarrierState(barrierConnected); if (!appConfig().startedBefore() && isVisible()) { QMessageBox::information( - this, "Synergy", - tr("Synergy is now connected. You can close the " - "config window and Synergy will remain connected in " + this, "Barrier", + tr("Barrier is now connected. You can close the " + "config window and Barrier will remain connected in " "the background.")); appConfig().setStartedBefore(true); @@ -479,7 +479,7 @@ void MainWindow::checkFingerprint(const QString& line) static bool messageBoxAlreadyShown = false; if (!messageBoxAlreadyShown) { - stopSynergy(); + stopBarrier(); messageBoxAlreadyShown = true; QMessageBox::StandardButton fingerprintReply = @@ -500,7 +500,7 @@ void MainWindow::checkFingerprint(const QString& line) if (fingerprintReply == QMessageBox::Yes) { // restart core process after trusting fingerprint. Fingerprint::trustedServers().trust(fingerprint); - startSynergy(); + startBarrier(); } messageBoxAlreadyShown = false; @@ -524,19 +524,19 @@ QString MainWindow::getTimeStamp() return '[' + current.toString(Qt::ISODate) + ']'; } -void MainWindow::restartSynergy() +void MainWindow::restartBarrier() { - stopSynergy(); - startSynergy(); + stopBarrier(); + startBarrier(); } void MainWindow::proofreadInfo() { setEdition(m_AppConfig->edition()); // Why is this here? - int oldState = m_SynergyState; - m_SynergyState = synergyDisconnected; - setSynergyState((qSynergyState)oldState); + int oldState = m_BarrierState; + m_BarrierState = barrierDisconnected; + setBarrierState((qBarrierState)oldState); } void MainWindow::showEvent(QShowEvent* event) @@ -550,7 +550,7 @@ void MainWindow::clearLog() m_pLogOutput->clear(); } -void MainWindow::startSynergy() +void MainWindow::startBarrier() { SerialKey serialKey = m_LicenseManager->serialKey(); time_t currentTime = ::time(0); @@ -565,7 +565,7 @@ void MainWindow::startSynergy() appendLogDebug("starting process"); m_ExpectedRunningState = kStarted; - setSynergyState(synergyConnecting); + setBarrierState(barrierConnecting); QString app; QStringList args; @@ -577,7 +577,7 @@ void MainWindow::startSynergy() if (desktopMode) { - setSynergyProcess(new QProcess(this)); + setBarrierProcess(new QProcess(this)); } else { @@ -589,9 +589,9 @@ void MainWindow::startSynergy() // is switched; this is because we may need to elevate or not // based on which desk the user is in (login always needs // elevation, where as default desk does not). - // Note that this is only enabled when synergy is set to elevate + // Note that this is only enabled when barrier is set to elevate // 'as needed' (e.g. on a UAC dialog popup) in order to prevent - // unnecessary restarts when synergy was started elevated or + // unnecessary restarts when barrier was started elevated or // when it is not allowed to elevate. In these cases restarting // the server is fruitless. if (appConfig().elevateMode() == ElevateAsNeeded) { @@ -620,25 +620,25 @@ void MainWindow::startSynergy() args << "--profile-dir" << getProfileRootForArg(); #endif - if ((synergyType() == synergyClient && !clientArgs(args, app)) - || (synergyType() == synergyServer && !serverArgs(args, app))) + if ((barrierType() == barrierClient && !clientArgs(args, app)) + || (barrierType() == barrierServer && !serverArgs(args, app))) { - stopSynergy(); + stopBarrier(); return; } if (desktopMode) { - connect(synergyProcess(), SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(synergyFinished(int, QProcess::ExitStatus))); - connect(synergyProcess(), SIGNAL(readyReadStandardOutput()), this, SLOT(logOutput())); - connect(synergyProcess(), SIGNAL(readyReadStandardError()), this, SLOT(logError())); + connect(barrierProcess(), SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(barrierFinished(int, QProcess::ExitStatus))); + connect(barrierProcess(), SIGNAL(readyReadStandardOutput()), this, SLOT(logOutput())); + connect(barrierProcess(), SIGNAL(readyReadStandardError()), this, SLOT(logError())); } // put a space between last log output and new instance. if (!m_pLogOutput->toPlainText().isEmpty()) appendLogRaw(""); - appendLogInfo("starting " + QString(synergyType() == synergyServer ? "server" : "client")); + appendLogInfo("starting " + QString(barrierType() == barrierServer ? "server" : "client")); qDebug() << args; @@ -655,8 +655,8 @@ void MainWindow::startSynergy() if (desktopMode) { - synergyProcess()->start(app, args); - if (!synergyProcess()->waitForStarted()) + barrierProcess()->start(app, args); + if (!barrierProcess()->waitForStarted()) { show(); QMessageBox::warning(this, tr("Program can not be started"), QString(tr("The executable

%1

could not be successfully started, although it does exist. Please check if you have sufficient permissions to run this program.").arg(app))); @@ -683,13 +683,13 @@ MainWindow::sslToggled (bool enabled) bool MainWindow::clientArgs(QStringList& args, QString& app) { - app = appPath(appConfig().synergycName()); + app = appPath(appConfig().barriercName()); if (!QFile::exists(app)) { show(); - QMessageBox::warning(this, tr("Synergy client not found"), - tr("The executable for the synergy client does not exist.")); + QMessageBox::warning(this, tr("Barrier client not found"), + tr("The executable for the barrier client does not exist.")); return false; } @@ -718,7 +718,7 @@ bool MainWindow::clientArgs(QStringList& args, QString& app) show(); if (!m_SuppressEmptyServerWarning) { QMessageBox::warning(this, tr("Hostname is empty"), - tr("Please fill in a hostname for the synergy client to connect to.")); + tr("Please fill in a hostname for the barrier client to connect to.")); } return false; } @@ -738,7 +738,7 @@ QString MainWindow::configFilename() m_pTempConfigFile = new QTemporaryFile(); if (!m_pTempConfigFile->open()) { - QMessageBox::critical(this, tr("Cannot write configuration file"), tr("The temporary configuration file required to start synergy can not be written.")); + QMessageBox::critical(this, tr("Cannot write configuration file"), tr("The temporary configuration file required to start barrier can not be written.")); return ""; } @@ -752,7 +752,7 @@ QString MainWindow::configFilename() if (!QFile::exists(m_pLineEditConfigFile->text())) { if (QMessageBox::warning(this, tr("Configuration filename invalid"), - tr("You have not filled in a valid configuration file for the synergy server. " + tr("You have not filled in a valid configuration file for the barrier server. " "Do you want to browse for the configuration file now?"), QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes || !on_m_pButtonBrowseConfigFile_clicked()) return ""; @@ -771,17 +771,17 @@ QString MainWindow::address() QString MainWindow::appPath(const QString& name) { - return appConfig().synergyProgramDir() + name; + return appConfig().barrierProgramDir() + name; } bool MainWindow::serverArgs(QStringList& args, QString& app) { - app = appPath(appConfig().synergysName()); + app = appPath(appConfig().barriersName()); if (!QFile::exists(app)) { - QMessageBox::warning(this, tr("Synergy server not found"), - tr("The executable for the synergy server does not exist.")); + QMessageBox::warning(this, tr("Barrier server not found"), + tr("The executable for the barrier server does not exist.")); return false; } @@ -811,7 +811,7 @@ bool MainWindow::serverArgs(QStringList& args, QString& app) return true; } -void MainWindow::stopSynergy() +void MainWindow::stopBarrier() { appendLogDebug("stopping process"); @@ -826,7 +826,7 @@ void MainWindow::stopSynergy() stopDesktop(); } - setSynergyState(synergyDisconnected); + setBarrierState(barrierDisconnected); // HACK: deleting the object deletes the physical file, which is // bad, since it could be in use by the Windows service! @@ -848,21 +848,21 @@ void MainWindow::stopService() void MainWindow::stopDesktop() { QMutexLocker locker(&m_StopDesktopMutex); - if (!synergyProcess()) { + if (!barrierProcess()) { return; } - appendLogInfo("stopping synergy desktop process"); + appendLogInfo("stopping barrier desktop process"); - if (synergyProcess()->isOpen()) { - synergyProcess()->close(); + if (barrierProcess()->isOpen()) { + barrierProcess()->close(); } - delete synergyProcess(); - setSynergyProcess(NULL); + delete barrierProcess(); + setBarrierProcess(NULL); } -void MainWindow::synergyFinished(int exitCode, QProcess::ExitStatus) +void MainWindow::barrierFinished(int exitCode, QProcess::ExitStatus) { if (exitCode == 0) { appendLogInfo(QString("process exited normally")); @@ -872,45 +872,45 @@ void MainWindow::synergyFinished(int exitCode, QProcess::ExitStatus) } if (m_ExpectedRunningState == kStarted) { - QTimer::singleShot(1000, this, SLOT(startSynergy())); + QTimer::singleShot(1000, this, SLOT(startBarrier())); appendLogInfo(QString("detected process not running, auto restarting")); } else { - setSynergyState(synergyDisconnected); + setBarrierState(barrierDisconnected); } } -void MainWindow::setSynergyState(qSynergyState state) +void MainWindow::setBarrierState(qBarrierState state) { - if (synergyState() == state) + if (barrierState() == state) return; - if (state == synergyConnected || state == synergyConnecting) + if (state == barrierConnected || state == barrierConnecting) { - disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartSynergy, SLOT(trigger())); - connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopSynergy, SLOT(trigger())); + disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartBarrier, SLOT(trigger())); + connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopBarrier, SLOT(trigger())); m_pButtonToggleStart->setText(tr("&Stop")); m_pButtonApply->setEnabled(true); } - else if (state == synergyDisconnected) + else if (state == barrierDisconnected) { - disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopSynergy, SLOT(trigger())); - connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartSynergy, SLOT(trigger())); + disconnect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStopBarrier, SLOT(trigger())); + connect (m_pButtonToggleStart, SIGNAL(clicked()), m_pActionStartBarrier, SLOT(trigger())); m_pButtonToggleStart->setText(tr("&Start")); m_pButtonApply->setEnabled(false); } bool connected = false; - if (state == synergyConnected || state == synergyTransfering) { + if (state == barrierConnected || state == barrierTransfering) { connected = true; } - m_pActionStartSynergy->setEnabled(!connected); - m_pActionStopSynergy->setEnabled(connected); + m_pActionStartBarrier->setEnabled(!connected); + m_pActionStopBarrier->setEnabled(connected); switch (state) { - case synergyConnected: { + case barrierConnected: { if (m_AppConfig->getCryptoEnabled()) { m_pLabelPadlock->show(); } @@ -918,25 +918,25 @@ void MainWindow::setSynergyState(qSynergyState state) m_pLabelPadlock->hide(); } - setStatus(tr("Synergy is running.")); + setStatus(tr("Barrier is running.")); break; } - case synergyConnecting: + case barrierConnecting: m_pLabelPadlock->hide(); - setStatus(tr("Synergy is starting.")); + setStatus(tr("Barrier is starting.")); break; - case synergyDisconnected: + case barrierDisconnected: m_pLabelPadlock->hide(); - setStatus(tr("Synergy is not running.")); + setStatus(tr("Barrier is not running.")); break; - case synergyTransfering: + case barrierTransfering: break; } setIcon(state); - m_SynergyState = state; + m_BarrierState = state; } void MainWindow::setVisible(bool visible) @@ -1035,7 +1035,7 @@ void MainWindow::updateZeroconfService() m_pZeroconfService = NULL; } - if (m_AppConfig->autoConfig() || synergyType() == synergyServer) { + if (m_AppConfig->autoConfig() || barrierType() == barrierServer) { m_pZeroconfService = new ZeroconfService(this); } } @@ -1045,7 +1045,7 @@ void MainWindow::updateZeroconfService() void MainWindow::serverDetected(const QString name) { if (m_pComboServerList->findText(name) == -1) { - // Note: the first added item triggers startSynergy + // Note: the first added item triggers startBarrier m_pComboServerList->addItem(name); } @@ -1073,7 +1073,7 @@ void MainWindow::beginTrial(bool isExpiring) QString expiringNotice ("

%1 day%3 of " "your %2 trial remain%5. " + "\"https://symless.com/barrier/trial/thanks?id=%4\">" "Buy now!" "

"); @@ -1096,7 +1096,7 @@ void MainWindow::endTrial(bool isExpired) if (isExpired) { QString expiredNotice ( "

Your %1 trial has expired. " + "\"https://symless.com/barrier/trial/thanks?id=%2\">" "" "Buy now!

" ); @@ -1108,7 +1108,7 @@ void MainWindow::endTrial(bool isExpired) this->m_trialLabel->setText(expiredNotice); this->m_trialWidget->show(); - stopSynergy(); + stopBarrier(); m_AppConfig->activationHasRun(false); } else { this->m_trialWidget->hide(); @@ -1153,7 +1153,7 @@ void MainWindow::on_m_pGroupServer_toggled(bool on) bool MainWindow::on_m_pButtonBrowseConfigFile_clicked() { - QString fileName = QFileDialog::getOpenFileName(this, tr("Browse for a synergys config file"), QString(), synergyConfigFilter); + QString fileName = QFileDialog::getOpenFileName(this, tr("Browse for a barriers config file"), QString(), barrierConfigFilter); if (!fileName.isEmpty()) { @@ -1179,7 +1179,7 @@ bool MainWindow::on_m_pActionSave_triggered() void MainWindow::on_m_pActionAbout_triggered() { - AboutDialog dlg(this, appPath(appConfig().synergycName())); + AboutDialog dlg(this, appPath(appConfig().barriercName())); dlg.exec(); } @@ -1225,7 +1225,7 @@ void MainWindow::autoAddScreen(const QString name) } } else { - restartSynergy(); + restartBarrier(); } } } @@ -1249,7 +1249,7 @@ void MainWindow::on_m_pActivate_triggered() void MainWindow::on_m_pButtonApply_clicked() { - restartSynergy(); + restartBarrier(); } #if defined(Q_OS_WIN) @@ -1312,7 +1312,7 @@ void MainWindow::downloadBonjour() } else { QMessageBox::critical( - this, tr("Synergy"), + this, tr("Barrier"), tr("Failed to detect system architecture.")); return; } @@ -1326,7 +1326,7 @@ void MainWindow::downloadBonjour() if (m_DownloadMessageBox == NULL) { m_DownloadMessageBox = new QMessageBox(this); - m_DownloadMessageBox->setWindowTitle("Synergy"); + m_DownloadMessageBox->setWindowTitle("Barrier"); m_DownloadMessageBox->setIcon(QMessageBox::Information); m_DownloadMessageBox->setText("Installing Bonjour, please wait..."); m_DownloadMessageBox->setStandardButtons(0); @@ -1358,7 +1358,7 @@ void MainWindow::installBonjour() m_DownloadMessageBox->hide(); QMessageBox::warning( - this, "Synergy", + this, "Barrier", tr("Failed to download Bonjour installer to location: %1") .arg(tempLocation)); return; @@ -1395,7 +1395,7 @@ void MainWindow::promptAutoConfig() { if (!isBonjourRunning()) { int r = QMessageBox::question( - this, tr("Synergy"), + this, tr("Barrier"), tr("Do you want to enable auto config and install Bonjour?\n\n" "This feature helps you establish the connection."), QMessageBox::Yes | QMessageBox::No); @@ -1416,7 +1416,7 @@ void MainWindow::promptAutoConfig() void MainWindow::on_m_pComboServerList_currentIndexChanged(QString ) { if (m_pComboServerList->count() != 0) { - restartSynergy(); + restartBarrier(); } } @@ -1425,7 +1425,7 @@ void MainWindow::on_m_pCheckBoxAutoConfig_toggled(bool checked) if (!isBonjourRunning() && checked) { if (!m_SuppressAutoConfigWarning) { int r = QMessageBox::information( - this, tr("Synergy"), + this, tr("Barrier"), tr("Auto config feature requires Bonjour.\n\n" "Do you want to install Bonjour?"), QMessageBox::Yes | QMessageBox::No); @@ -1475,7 +1475,7 @@ int MainWindow::raiseActivationDialog() m_PendingClientNames.clear(); } if (result == QDialog::Accepted) { - restartSynergy(); + restartBarrier(); } return result; } @@ -1497,9 +1497,9 @@ QString MainWindow::getProfileRootForArg() // HACK: strip our app name since we're returning the root dir. #if defined(Q_OS_WIN) - dir.replace("\\Synergy", ""); + dir.replace("\\Barrier", ""); #else - dir.replace("/.synergy", ""); + dir.replace("/.barrier", ""); #endif return QString("\"%1\"").arg(dir); diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h index 75920caa..def85fe3 100644 --- a/src/gui/src/MainWindow.h +++ b/src/gui/src/MainWindow.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -52,7 +52,7 @@ class QMessageBox; class QAbstractButton; class LogDialog; -class QSynergyApplication; +class QBarrierApplication; class SetupWizard; class ZeroconfService; class DataDownloader; @@ -64,24 +64,24 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase { Q_OBJECT - friend class QSynergyApplication; + friend class QBarrierApplication; friend class SetupWizard; friend class ActivationDialog; friend class SettingsDialog; public: - enum qSynergyState + enum qBarrierState { - synergyDisconnected, - synergyConnecting, - synergyConnected, - synergyTransfering + barrierDisconnected, + barrierConnecting, + barrierConnected, + barrierTransfering }; - enum qSynergyType + enum qBarrierType { - synergyClient, - synergyServer + barrierClient, + barrierServer }; enum qLevel { @@ -101,8 +101,8 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase public: void setVisible(bool visible); - int synergyType() const { return m_pGroupClient->isChecked() ? synergyClient : synergyServer; } - int synergyState() const { return m_SynergyState; } + int barrierType() const { return m_pGroupClient->isChecked() ? barrierClient : barrierServer; } + int barrierState() const { return m_BarrierState; } QString hostname() const { return m_pLineEditHostname->text(); } QString configFilename(); QString address(); @@ -130,7 +130,7 @@ public slots: void appendLogInfo(const QString& text); void appendLogDebug(const QString& text); void appendLogError(const QString& text); - void startSynergy(); + void startBarrier(); protected slots: void sslToggled(bool enabled); @@ -142,9 +142,9 @@ public slots: void on_m_pActionAbout_triggered(); void on_m_pActionSettings_triggered(); void on_m_pActivate_triggered(); - void synergyFinished(int exitCode, QProcess::ExitStatus); + void barrierFinished(int exitCode, QProcess::ExitStatus); void trayActivated(QSystemTrayIcon::ActivationReason reason); - void stopSynergy(); + void stopBarrier(); void logOutput(); void logError(); void updateFound(const QString& version); @@ -153,16 +153,16 @@ public slots: protected: QSettings& settings() { return m_Settings; } AppConfig& appConfig() { return *m_AppConfig; } - QProcess* synergyProcess() { return m_pSynergy; } - void setSynergyProcess(QProcess* p) { m_pSynergy = p; } + QProcess* barrierProcess() { return m_pBarrier; } + void setBarrierProcess(QProcess* p) { m_pBarrier = p; } void initConnections(); void createMenuBar(); void createStatusBar(); void createTrayIcon(); void loadSettings(); void saveSettings(); - void setIcon(qSynergyState state); - void setSynergyState(qSynergyState state); + void setIcon(qBarrierState state); + void setBarrierState(qBarrierState state); bool checkForApp(int which, QString& app); bool clientArgs(QStringList& args, QString& app); bool serverArgs(QStringList& args, QString& app); @@ -189,7 +189,7 @@ public slots: void checkFingerprint(const QString& line); bool autoHide(); QString getTimeStamp(); - void restartSynergy(); + void restartBarrier(); void proofreadInfo(); void showEvent (QShowEvent*); @@ -198,8 +198,8 @@ public slots: QSettings& m_Settings; AppConfig* m_AppConfig; LicenseManager* m_LicenseManager; - QProcess* m_pSynergy; - int m_SynergyState; + QProcess* m_pBarrier; + int m_BarrierState; ServerConfig m_ServerConfig; QTemporaryFile* m_pTempConfigFile; QSystemTrayIcon* m_pTrayIcon; diff --git a/src/gui/src/MainWindowBase.ui b/src/gui/src/MainWindowBase.ui index 7069b8b2..36a93d24 100644 --- a/src/gui/src/MainWindowBase.ui +++ b/src/gui/src/MainWindowBase.ui @@ -23,7 +23,7 @@ - Synergy + Barrier @@ -48,14 +48,14 @@ - :/res/icons/16x16/warning.png + :/res/icons/16x16/warning.png - <html><head/><body><p><span style=" font-weight:600;">%1</span> days of your Synergy Pro trial remain. <a href="http://symless.com/pricing?src=gui"><span style=" text-decoration: underline; color:#0000ff;">Buy now!</span></a></p></body></html> + <html><head/><body><p><span style=" font-weight:600;">%1</span> days of your Barrier Pro trial remain. <a href="http://symless.com/pricing?src=gui"><span style=" text-decoration: underline; color:#0000ff;">Buy now!</span></a></p></body></html> true @@ -99,7 +99,7 @@ - :/res/icons/16x16/warning.png + :/res/icons/16x16/warning.png @@ -391,7 +391,7 @@ - :/res/icons/16x16/padlock.png + :/res/icons/16x16/padlock.png @@ -438,7 +438,7 @@ - &About Synergy... + &About Barrier... @@ -455,7 +455,7 @@ Ctrl+Q - + &Start @@ -466,7 +466,7 @@ Ctrl+S - + false @@ -542,7 +542,7 @@ - + @@ -596,7 +596,7 @@ m_pButtonToggleStart clicked() - m_pActionStartSynergy + m_pActionStartBarrier trigger() diff --git a/src/gui/src/NewScreenWidget.cpp b/src/gui/src/NewScreenWidget.cpp index 7873e8b1..18379c0b 100644 --- a/src/gui/src/NewScreenWidget.cpp +++ b/src/gui/src/NewScreenWidget.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/NewScreenWidget.h b/src/gui/src/NewScreenWidget.h index 67ff44f6..34f32696 100644 --- a/src/gui/src/NewScreenWidget.h +++ b/src/gui/src/NewScreenWidget.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ProcessorArch.h b/src/gui/src/ProcessorArch.h index cb2d30fc..dd686ce3 100644 --- a/src/gui/src/ProcessorArch.h +++ b/src/gui/src/ProcessorArch.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/QSynergyApplication.cpp b/src/gui/src/QBarrierApplication.cpp similarity index 75% rename from src/gui/src/QSynergyApplication.cpp rename to src/gui/src/QBarrierApplication.cpp index 969d2a4b..f2da3821 100644 --- a/src/gui/src/QSynergyApplication.cpp +++ b/src/gui/src/QBarrierApplication.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -16,27 +16,27 @@ * along with this program. If not, see . */ -#include "QSynergyApplication.h" +#include "QBarrierApplication.h" #include "MainWindow.h" #include #include -QSynergyApplication* QSynergyApplication::s_Instance = NULL; +QBarrierApplication* QBarrierApplication::s_Instance = NULL; -QSynergyApplication::QSynergyApplication(int& argc, char** argv) : +QBarrierApplication::QBarrierApplication(int& argc, char** argv) : QApplication(argc, argv), m_Translator(NULL) { s_Instance = this; } -QSynergyApplication::~QSynergyApplication() +QBarrierApplication::~QBarrierApplication() { delete m_Translator; } -void QSynergyApplication::commitData(QSessionManager&) +void QBarrierApplication::commitData(QSessionManager&) { foreach(QWidget* widget, topLevelWidgets()) { @@ -46,12 +46,12 @@ void QSynergyApplication::commitData(QSessionManager&) } } -QSynergyApplication* QSynergyApplication::getInstance() +QBarrierApplication* QBarrierApplication::getInstance() { return s_Instance; } -void QSynergyApplication::switchTranslator(QString lang) +void QBarrierApplication::switchTranslator(QString lang) { if (m_Translator != NULL) { @@ -65,7 +65,7 @@ void QSynergyApplication::switchTranslator(QString lang) installTranslator(m_Translator); } -void QSynergyApplication::setTranslator(QTranslator* translator) +void QBarrierApplication::setTranslator(QTranslator* translator) { m_Translator = translator; installTranslator(m_Translator); diff --git a/src/gui/src/QSynergyApplication.h b/src/gui/src/QBarrierApplication.h similarity index 73% rename from src/gui/src/QSynergyApplication.h rename to src/gui/src/QBarrierApplication.h index 26c3be5e..95729b2a 100644 --- a/src/gui/src/QSynergyApplication.h +++ b/src/gui/src/QBarrierApplication.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -16,31 +16,31 @@ * along with this program. If not, see . */ -#if !defined(QSYNERGYAPPLICATION__H) +#if !defined(QBARRIERAPPLICATION__H) -#define QSYNERGYAPPLICATION__H +#define QBARRIERAPPLICATION__H #include class QSessionManager; -class QSynergyApplication : public QApplication +class QBarrierApplication : public QApplication { public: - QSynergyApplication(int& argc, char** argv); - ~QSynergyApplication(); + QBarrierApplication(int& argc, char** argv); + ~QBarrierApplication(); public: void commitData(QSessionManager& manager); void switchTranslator(QString lang); void setTranslator(QTranslator* translator); - static QSynergyApplication* getInstance(); + static QBarrierApplication* getInstance(); private: QTranslator* m_Translator; - static QSynergyApplication* s_Instance; + static QBarrierApplication* s_Instance; }; #endif diff --git a/src/gui/src/QUtility.cpp b/src/gui/src/QUtility.cpp index 34c0db96..7757adfe 100644 --- a/src/gui/src/QUtility.cpp +++ b/src/gui/src/QUtility.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/QUtility.h b/src/gui/src/QUtility.h index 0738d96c..62a60825 100644 --- a/src/gui/src/QUtility.h +++ b/src/gui/src/QUtility.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/Screen.cpp b/src/gui/src/Screen.cpp index 3ec07caa..880e78ca 100644 --- a/src/gui/src/Screen.cpp +++ b/src/gui/src/Screen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/Screen.h b/src/gui/src/Screen.h index 8ae823fe..6d9c6680 100644 --- a/src/gui/src/Screen.h +++ b/src/gui/src/Screen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ScreenSettingsDialog.cpp b/src/gui/src/ScreenSettingsDialog.cpp index 740137a3..1e95a9c5 100644 --- a/src/gui/src/ScreenSettingsDialog.cpp +++ b/src/gui/src/ScreenSettingsDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ScreenSettingsDialog.h b/src/gui/src/ScreenSettingsDialog.h index 620acc84..1c525d22 100644 --- a/src/gui/src/ScreenSettingsDialog.h +++ b/src/gui/src/ScreenSettingsDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ScreenSetupModel.cpp b/src/gui/src/ScreenSetupModel.cpp index 40e93c87..fce1a8c6 100644 --- a/src/gui/src/ScreenSetupModel.cpp +++ b/src/gui/src/ScreenSetupModel.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -22,7 +22,7 @@ #include #include -const QString ScreenSetupModel::m_MimeType = "application/x-qsynergy-screen"; +const QString ScreenSetupModel::m_MimeType = "application/x-qbarrier-screen"; ScreenSetupModel::ScreenSetupModel(ScreenList& screens, int numColumns, int numRows) : QAbstractTableModel(NULL), diff --git a/src/gui/src/ScreenSetupModel.h b/src/gui/src/ScreenSetupModel.h index 726c6ed8..ba46af32 100644 --- a/src/gui/src/ScreenSetupModel.h +++ b/src/gui/src/ScreenSetupModel.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ScreenSetupView.cpp b/src/gui/src/ScreenSetupView.cpp index f26d9700..e42ae17e 100644 --- a/src/gui/src/ScreenSetupView.cpp +++ b/src/gui/src/ScreenSetupView.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ScreenSetupView.h b/src/gui/src/ScreenSetupView.h index 38eae2a4..a263a8d5 100644 --- a/src/gui/src/ScreenSetupView.h +++ b/src/gui/src/ScreenSetupView.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp index 8ced4148..6c19c0ec 100644 --- a/src/gui/src/ServerConfig.cpp +++ b/src/gui/src/ServerConfig.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ServerConfig.h b/src/gui/src/ServerConfig.h index e9b685c5..65cbbac7 100644 --- a/src/gui/src/ServerConfig.h +++ b/src/gui/src/ServerConfig.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ServerConfigDialog.cpp b/src/gui/src/ServerConfigDialog.cpp index 6fc10248..799cfc84 100644 --- a/src/gui/src/ServerConfigDialog.cpp +++ b/src/gui/src/ServerConfigDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ServerConfigDialog.h b/src/gui/src/ServerConfigDialog.h index 37543bda..1ef17d14 100644 --- a/src/gui/src/ServerConfigDialog.h +++ b/src/gui/src/ServerConfigDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/ServerConfigDialogBase.ui b/src/gui/src/ServerConfigDialogBase.ui index 5478f360..c3604201 100644 --- a/src/gui/src/ServerConfigDialogBase.ui +++ b/src/gui/src/ServerConfigDialogBase.ui @@ -44,7 +44,7 @@ - :/res/icons/64x64/user-trash.png + :/res/icons/64x64/user-trash.png @@ -57,7 +57,7 @@ - Configure the layout of your synergy server configuration. + Configure the layout of your barrier server configuration. Qt::AlignCenter @@ -82,7 +82,7 @@ - :/res/icons/64x64/video-display.png + :/res/icons/64x64/video-display.png @@ -662,7 +662,7 @@ Double click on a screen to edit its settings. - + diff --git a/src/gui/src/SettingsDialog.cpp b/src/gui/src/SettingsDialog.cpp index 109d2d06..491959a9 100644 --- a/src/gui/src/SettingsDialog.cpp +++ b/src/gui/src/SettingsDialog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -19,8 +19,8 @@ #include "SettingsDialog.h" #include "CoreInterface.h" -#include "SynergyLocale.h" -#include "QSynergyApplication.h" +#include "BarrierLocale.h" +#include "QBarrierApplication.h" #include "QUtility.h" #include "AppConfig.h" #include "SslCertificate.h" @@ -84,7 +84,7 @@ void SettingsDialog::accept() void SettingsDialog::reject() { if (appConfig().language() != m_pComboLanguage->itemData(m_pComboLanguage->currentIndex()).toString()) { - QSynergyApplication::getInstance()->switchTranslator(appConfig().language()); + QBarrierApplication::getInstance()->switchTranslator(appConfig().language()); } QDialog::reject(); @@ -138,7 +138,7 @@ void SettingsDialog::on_m_pButtonBrowseLog_clicked() void SettingsDialog::on_m_pComboLanguage_currentIndexChanged(int index) { QString ietfCode = m_pComboLanguage->itemData(index).toString(); - QSynergyApplication::getInstance()->switchTranslator(ietfCode); + QBarrierApplication::getInstance()->switchTranslator(ietfCode); } void SettingsDialog::on_m_pCheckBoxEnableCrypto_toggled(bool checked) diff --git a/src/gui/src/SettingsDialog.h b/src/gui/src/SettingsDialog.h index 298197aa..29400b95 100644 --- a/src/gui/src/SettingsDialog.h +++ b/src/gui/src/SettingsDialog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -22,7 +22,7 @@ #include #include "ui_SettingsDialogBase.h" -#include "SynergyLocale.h" +#include "BarrierLocale.h" #include "CoreInterface.h" class AppConfig; @@ -33,8 +33,8 @@ class SettingsDialog : public QDialog, public Ui::SettingsDialogBase public: SettingsDialog(QWidget* parent, AppConfig& config); - static QString browseForSynergyc(QWidget* parent, const QString& programDir, const QString& synergycName); - static QString browseForSynergys(QWidget* parent, const QString& programDir, const QString& synergysName); + static QString browseForBarrierc(QWidget* parent, const QString& programDir, const QString& barriercName); + static QString browseForBarriers(QWidget* parent, const QString& programDir, const QString& barriersName); protected: void accept(); @@ -44,7 +44,7 @@ class SettingsDialog : public QDialog, public Ui::SettingsDialogBase private: AppConfig& m_appConfig; - SynergyLocale m_Locale; + BarrierLocale m_Locale; CoreInterface m_CoreInterface; private slots: diff --git a/src/gui/src/SettingsDialogBase.ui b/src/gui/src/SettingsDialogBase.ui index f604cf7a..634b7375 100644 --- a/src/gui/src/SettingsDialogBase.ui +++ b/src/gui/src/SettingsDialogBase.ui @@ -124,7 +124,7 @@ - Specify when the Synergy service should run at an elevated privilege level + Specify when the Barrier service should run at an elevated privilege level 0 diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp index c7af2547..680aa716 100644 --- a/src/gui/src/SetupWizard.cpp +++ b/src/gui/src/SetupWizard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #include "WebClient.h" #include "ActivationNotifier.h" #include "LicenseManager.h" -#include "QSynergyApplication.h" +#include "QBarrierApplication.h" #include "QUtility.h" #include @@ -63,7 +63,7 @@ SetupWizard::~SetupWizard() bool SetupWizard::validateCurrentPage() { QMessageBox message; - message.setWindowTitle(tr("Setup Synergy")); + message.setWindowTitle(tr("Setup Barrier")); message.setIcon(QMessageBox::Information); if (currentPage() == m_pNodePage) @@ -134,7 +134,7 @@ void SetupWizard::accept() void SetupWizard::reject() { - QSynergyApplication::getInstance()->switchTranslator(m_MainWindow.appConfig().language()); + QBarrierApplication::getInstance()->switchTranslator(m_MainWindow.appConfig().language()); if (m_StartMain) { @@ -147,5 +147,5 @@ void SetupWizard::reject() void SetupWizard::on_m_pComboLanguage_currentIndexChanged(int index) { QString ietfCode = m_pComboLanguage->itemData(index).toString(); - QSynergyApplication::getInstance()->switchTranslator(ietfCode); + QBarrierApplication::getInstance()->switchTranslator(ietfCode); } diff --git a/src/gui/src/SetupWizard.h b/src/gui/src/SetupWizard.h index 5e3173ea..80e19e96 100644 --- a/src/gui/src/SetupWizard.h +++ b/src/gui/src/SetupWizard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ #pragma once #include "ui_SetupWizardBase.h" -#include "SynergyLocale.h" +#include "BarrierLocale.h" #include #include @@ -46,7 +46,7 @@ protected: private: MainWindow& m_MainWindow; bool m_StartMain; - SynergyLocale m_Locale; + BarrierLocale m_Locale; private slots: void on_m_pComboLanguage_currentIndexChanged(int index); diff --git a/src/gui/src/SetupWizardBase.ui b/src/gui/src/SetupWizardBase.ui index 8c089886..47de5639 100644 --- a/src/gui/src/SetupWizardBase.ui +++ b/src/gui/src/SetupWizardBase.ui @@ -23,7 +23,7 @@ - Setup Synergy + Setup Barrier @@ -36,7 +36,7 @@ - Thanks for installing Synergy! + Thanks for installing Barrier! true @@ -111,7 +111,7 @@ - Synergy lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Synergy is cross-platform (works on Windows, Mac OS X and Linux). + Barrier lets you easily share your mouse and keyboard between multiple computers on your desk, and it's Free and Open Source. Just move your mouse off the edge of one computer's screen on to another. You can even share all of your clipboards. All you need is a network connection. Barrier is cross-platform (works on Windows, Mac OS X and Linux). true diff --git a/src/gui/src/SslCertificate.cpp b/src/gui/src/SslCertificate.cpp index f8180a9a..e69ad02e 100644 --- a/src/gui/src/SslCertificate.cpp +++ b/src/gui/src/SslCertificate.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -24,14 +24,14 @@ #include static const char kCertificateLifetime[] = "365"; -static const char kCertificateSubjectInfo[] = "/CN=Synergy"; -static const char kCertificateFilename[] = "Synergy.pem"; +static const char kCertificateSubjectInfo[] = "/CN=Barrier"; +static const char kCertificateFilename[] = "Barrier.pem"; static const char kSslDir[] = "SSL"; static const char kUnixOpenSslCommand[] = "openssl"; #if defined(Q_OS_WIN) static const char kWinOpenSslBinary[] = "OpenSSL\\openssl.exe"; -static const char kConfigFile[] = "OpenSSL\\synergy.conf"; +static const char kConfigFile[] = "OpenSSL\\barrier.conf"; #endif SslCertificate::SslCertificate(QObject *parent) : diff --git a/src/gui/src/SslCertificate.h b/src/gui/src/SslCertificate.h index 6683269d..8acda4b2 100644 --- a/src/gui/src/SslCertificate.h +++ b/src/gui/src/SslCertificate.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/TrashScreenWidget.cpp b/src/gui/src/TrashScreenWidget.cpp index 9d980d97..42a9d56f 100644 --- a/src/gui/src/TrashScreenWidget.cpp +++ b/src/gui/src/TrashScreenWidget.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/TrashScreenWidget.h b/src/gui/src/TrashScreenWidget.h index 524b39ee..7ab887e7 100644 --- a/src/gui/src/TrashScreenWidget.h +++ b/src/gui/src/TrashScreenWidget.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * diff --git a/src/gui/src/VersionChecker.cpp b/src/gui/src/VersionChecker.cpp index 214f2ec5..6abd5c0b 100644 --- a/src/gui/src/VersionChecker.cpp +++ b/src/gui/src/VersionChecker.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/gui/src/VersionChecker.h b/src/gui/src/VersionChecker.h index 9f49cc37..daab09ae 100644 --- a/src/gui/src/VersionChecker.h +++ b/src/gui/src/VersionChecker.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/gui/src/WebClient.cpp b/src/gui/src/WebClient.cpp index 99ad1a13..8cded2cb 100644 --- a/src/gui/src/WebClient.cpp +++ b/src/gui/src/WebClient.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/WebClient.h b/src/gui/src/WebClient.h index 2280031e..9874bd58 100644 --- a/src/gui/src/WebClient.h +++ b/src/gui/src/WebClient.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/ZeroconfBrowser.cpp b/src/gui/src/ZeroconfBrowser.cpp index 00764ce5..35b44c1e 100644 --- a/src/gui/src/ZeroconfBrowser.cpp +++ b/src/gui/src/ZeroconfBrowser.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/ZeroconfBrowser.h b/src/gui/src/ZeroconfBrowser.h index c15a24bf..755907ea 100644 --- a/src/gui/src/ZeroconfBrowser.h +++ b/src/gui/src/ZeroconfBrowser.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/ZeroconfRecord.h b/src/gui/src/ZeroconfRecord.h index 0da155a1..eba77856 100644 --- a/src/gui/src/ZeroconfRecord.h +++ b/src/gui/src/ZeroconfRecord.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/ZeroconfRegister.cpp b/src/gui/src/ZeroconfRegister.cpp index 3e7e3c75..6d91a48a 100644 --- a/src/gui/src/ZeroconfRegister.cpp +++ b/src/gui/src/ZeroconfRegister.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/ZeroconfRegister.h b/src/gui/src/ZeroconfRegister.h index 05487e12..e4f3a782 100644 --- a/src/gui/src/ZeroconfRegister.h +++ b/src/gui/src/ZeroconfRegister.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/ZeroconfServer.cpp b/src/gui/src/ZeroconfServer.cpp index e4d6dfd8..40b97a50 100644 --- a/src/gui/src/ZeroconfServer.cpp +++ b/src/gui/src/ZeroconfServer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/ZeroconfServer.h b/src/gui/src/ZeroconfServer.h index 2f6c6f11..2e906d9a 100644 --- a/src/gui/src/ZeroconfServer.h +++ b/src/gui/src/ZeroconfServer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/ZeroconfService.cpp b/src/gui/src/ZeroconfService.cpp index 5ecc5773..56618e44 100644 --- a/src/gui/src/ZeroconfService.cpp +++ b/src/gui/src/ZeroconfService.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -33,8 +33,8 @@ static const QStringList preferedIPAddress( "10." << "172."); -const char* ZeroconfService:: m_ServerServiceName = "_synergyServerZeroconf._tcp"; -const char* ZeroconfService:: m_ClientServiceName = "_synergyClientZeroconf._tcp"; +const char* ZeroconfService:: m_ServerServiceName = "_barrierServerZeroconf._tcp"; +const char* ZeroconfService:: m_ClientServiceName = "_barrierClientZeroconf._tcp"; ZeroconfService::ZeroconfService(MainWindow* mainWindow) : m_pMainWindow(mainWindow), @@ -42,7 +42,7 @@ ZeroconfService::ZeroconfService(MainWindow* mainWindow) : m_pZeroconfRegister(0), m_ServiceRegistered(false) { - if (m_pMainWindow->synergyType() == MainWindow::synergyServer) { + if (m_pMainWindow->barrierType() == MainWindow::barrierServer) { if (registerService(true)) { m_pZeroconfBrowser = new ZeroconfBrowser(this); connect(m_pZeroconfBrowser, SIGNAL( @@ -137,7 +137,7 @@ bool ZeroconfService::registerService(bool server) if (server) { QString localIP = getLocalIPAddresses(); if (localIP.isEmpty()) { - QMessageBox::warning(m_pMainWindow, tr("Synergy"), + QMessageBox::warning(m_pMainWindow, tr("Barrier"), tr("Failed to get local IP address. " "Please manually type in server address " "on your clients")); diff --git a/src/gui/src/ZeroconfService.h b/src/gui/src/ZeroconfService.h index 17fe3bf7..929cd055 100644 --- a/src/gui/src/ZeroconfService.h +++ b/src/gui/src/ZeroconfService.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/ZeroconfThread.cpp b/src/gui/src/ZeroconfThread.cpp index 48e9fd8a..e9cea20a 100644 --- a/src/gui/src/ZeroconfThread.cpp +++ b/src/gui/src/ZeroconfThread.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/ZeroconfThread.h b/src/gui/src/ZeroconfThread.h index b2e7485e..aa488ad0 100644 --- a/src/gui/src/ZeroconfThread.h +++ b/src/gui/src/ZeroconfThread.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/gui/src/main.cpp b/src/gui/src/main.cpp index fe09ed3e..738892f6 100644 --- a/src/gui/src/main.cpp +++ b/src/gui/src/main.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -19,7 +19,7 @@ #define TRAY_RETRY_COUNT 10 #define TRAY_RETRY_WAIT 2000 -#include "QSynergyApplication.h" +#include "QBarrierApplication.h" #include "LicenseManager.h" #include "MainWindow.h" #include "AppConfig.h" @@ -59,18 +59,18 @@ int main(int argc, char* argv[]) /* Workaround for QTBUG-40332 - "High ping when QNetworkAccessManager is instantiated" */ ::setenv ("QT_BEARER_POLL_TIMEOUT", "-1", 1); #endif - QCoreApplication::setOrganizationName("Synergy"); - QCoreApplication::setOrganizationDomain("http://symless.com/"); - QCoreApplication::setApplicationName("Synergy"); + QCoreApplication::setOrganizationName("Barrier"); + QCoreApplication::setOrganizationDomain("http://github.com/"); + QCoreApplication::setApplicationName("Barrier"); - QSynergyApplication app(argc, argv); + QBarrierApplication app(argc, argv); #if defined(Q_OS_MAC) if (app.applicationDirPath().startsWith("/Volumes/")) { QMessageBox::information( - NULL, "Synergy", - "Please drag Synergy to the Applications folder, and open it from there."); + NULL, "Barrier", + "Please drag Barrier to the Applications folder, and open it from there."); return 1; } @@ -125,7 +125,7 @@ int waitForTray() if (++trayAttempts > TRAY_RETRY_COUNT) { - QMessageBox::critical(NULL, "Synergy", + QMessageBox::critical(NULL, "Barrier", QObject::tr("System tray is unavailable, don't close your window.")); return true; } @@ -143,7 +143,7 @@ bool checkMacAssistiveDevices() // new in mavericks, applications are trusted individually // with use of the accessibility api. this call will show a // prompt which can show the security/privacy/accessibility - // tab, with a list of allowed applications. synergy should + // tab, with a list of allowed applications. barrier should // show up there automatically, but will be unchecked. if (AXIsProcessTrusted()) { @@ -164,10 +164,10 @@ bool checkMacAssistiveDevices() bool result = AXAPIEnabled(); if (!result) { QMessageBox::information( - NULL, "Synergy", + NULL, "Barrier", "Please enable access to assistive devices " "System Preferences -> Security & Privacy -> " - "Privacy -> Accessibility, then re-open Synergy."); + "Privacy -> Accessibility, then re-open Barrier."); } return result; diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 7b78bc96..db6bf187 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -24,7 +24,7 @@ add_subdirectory(mt) add_subdirectory(net) add_subdirectory(platform) add_subdirectory(server) -add_subdirectory(synergy) +add_subdirectory(barrier) add_subdirectory(shared) if (WIN32) diff --git a/src/lib/arch/Arch.cpp b/src/lib/arch/Arch.cpp index 5eb0025d..0a3b3e56 100644 --- a/src/lib/arch/Arch.cpp +++ b/src/lib/arch/Arch.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/Arch.h b/src/lib/arch/Arch.h index 0b6740a6..42a73c2e 100644 --- a/src/lib/arch/Arch.h +++ b/src/lib/arch/Arch.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/ArchConsoleStd.cpp b/src/lib/arch/ArchConsoleStd.cpp index 44814ba8..f7f76918 100644 --- a/src/lib/arch/ArchConsoleStd.cpp +++ b/src/lib/arch/ArchConsoleStd.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/ArchConsoleStd.h b/src/lib/arch/ArchConsoleStd.h index 0bc7d2ef..8560fad3 100644 --- a/src/lib/arch/ArchConsoleStd.h +++ b/src/lib/arch/ArchConsoleStd.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/ArchDaemonNone.cpp b/src/lib/arch/ArchDaemonNone.cpp index 71210632..1222549a 100644 --- a/src/lib/arch/ArchDaemonNone.cpp +++ b/src/lib/arch/ArchDaemonNone.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/ArchDaemonNone.h b/src/lib/arch/ArchDaemonNone.h index decb5aa2..fd597587 100644 --- a/src/lib/arch/ArchDaemonNone.h +++ b/src/lib/arch/ArchDaemonNone.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/CMakeLists.txt b/src/lib/arch/CMakeLists.txt index e7b755be..8a06b41e 100644 --- a/src/lib/arch/CMakeLists.txt +++ b/src/lib/arch/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -17,7 +17,7 @@ file(GLOB headers "*.h") file(GLOB sources "*.cpp") -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() @@ -33,7 +33,7 @@ endif() list(APPEND sources ${arch_sources}) list(APPEND headers ${arch_headers}) -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/arch/IArchConsole.h b/src/lib/arch/IArchConsole.h index 3c009a2f..d115c50f 100644 --- a/src/lib/arch/IArchConsole.h +++ b/src/lib/arch/IArchConsole.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -24,7 +24,7 @@ //! Interface for architecture dependent console output /*! This interface defines the console operations required by -synergy. Each architecture must implement this interface. +barrier. Each architecture must implement this interface. */ class IArchConsole : public IInterface { public: diff --git a/src/lib/arch/IArchDaemon.h b/src/lib/arch/IArchDaemon.h index 5db49f10..a4983d38 100644 --- a/src/lib/arch/IArchDaemon.h +++ b/src/lib/arch/IArchDaemon.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,7 +23,7 @@ //! Interface for architecture dependent daemonizing /*! -This interface defines the operations required by synergy for installing +This interface defines the operations required by barrier for installing uninstalling daeamons and daemonizing a process. Each architecture must implement this interface. */ diff --git a/src/lib/arch/IArchFile.h b/src/lib/arch/IArchFile.h index 7a5ea6ad..5fdd2882 100644 --- a/src/lib/arch/IArchFile.h +++ b/src/lib/arch/IArchFile.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -25,7 +25,7 @@ //! Interface for architecture dependent file system operations /*! This interface defines the file system operations required by -synergy. Each architecture must implement this interface. +barrier. Each architecture must implement this interface. */ class IArchFile : public IInterface { public: @@ -53,7 +53,7 @@ public: //! Get installed directory /*! - Returns the directory in which Synergy is installed. + Returns the directory in which Barrier is installed. */ virtual std::string getInstalledDirectory() = 0; diff --git a/src/lib/arch/IArchLog.h b/src/lib/arch/IArchLog.h index 94197b88..165b1df8 100644 --- a/src/lib/arch/IArchLog.h +++ b/src/lib/arch/IArchLog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -24,7 +24,7 @@ //! Interface for architecture dependent logging /*! This interface defines the logging operations required by -synergy. Each architecture must implement this interface. +barrier. Each architecture must implement this interface. */ class IArchLog : public IInterface { public: diff --git a/src/lib/arch/IArchMultithread.h b/src/lib/arch/IArchMultithread.h index 9ad7a15b..e8d358b9 100644 --- a/src/lib/arch/IArchMultithread.h +++ b/src/lib/arch/IArchMultithread.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -66,7 +66,7 @@ typedef ArchThreadImpl* ArchThread; //! Interface for architecture dependent multithreading /*! This interface defines the multithreading operations required by -synergy. Each architecture must implement this interface. +barrier. Each architecture must implement this interface. */ class IArchMultithread : public IInterface { public: diff --git a/src/lib/arch/IArchNetwork.h b/src/lib/arch/IArchNetwork.h index d71f8d88..97e6e877 100644 --- a/src/lib/arch/IArchNetwork.h +++ b/src/lib/arch/IArchNetwork.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -56,7 +56,7 @@ typedef ArchNetAddressImpl* ArchNetAddress; //! Interface for architecture dependent networking /*! This interface defines the networking operations required by -synergy. Each architecture must implement this interface. +barrier. Each architecture must implement this interface. */ class IArchNetwork : public IInterface { public: diff --git a/src/lib/arch/IArchSleep.h b/src/lib/arch/IArchSleep.h index 4a18a041..9999d0ee 100644 --- a/src/lib/arch/IArchSleep.h +++ b/src/lib/arch/IArchSleep.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,7 +23,7 @@ //! Interface for architecture dependent sleeping /*! This interface defines the sleep operations required by -synergy. Each architecture must implement this interface. +barrier. Each architecture must implement this interface. */ class IArchSleep : public IInterface { public: diff --git a/src/lib/arch/IArchString.cpp b/src/lib/arch/IArchString.cpp index 57365363..13e1a83d 100644 --- a/src/lib/arch/IArchString.cpp +++ b/src/lib/arch/IArchString.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Chris Schoeneman * diff --git a/src/lib/arch/IArchString.h b/src/lib/arch/IArchString.h index 62ae5c0c..ea10b658 100644 --- a/src/lib/arch/IArchString.h +++ b/src/lib/arch/IArchString.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -26,7 +26,7 @@ //! Interface for architecture dependent string operations /*! This interface defines the string operations required by -synergy. Each architecture must implement this interface. +barrier. Each architecture must implement this interface. */ class IArchString : public IInterface { public: diff --git a/src/lib/arch/IArchSystem.h b/src/lib/arch/IArchSystem.h index dbff79be..94465053 100644 --- a/src/lib/arch/IArchSystem.h +++ b/src/lib/arch/IArchSystem.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -43,21 +43,21 @@ public: virtual std::string getPlatformName() const = 0; //@} - //! Get a Synergy setting + //! Get a Barrier setting /*! - Reads a Synergy setting from the system. + Reads a Barrier setting from the system. */ virtual std::string setting(const std::string& valueName) const = 0; //@} - //! Set a Synergy setting + //! Set a Barrier setting /*! - Writes a Synergy setting from the system. + Writes a Barrier setting from the system. */ virtual void setting(const std::string& valueName, const std::string& valueString) const = 0; //@} - //! Get the pathnames of the libraries used by Synergy + //! Get the pathnames of the libraries used by Barrier /* Returns a string containing the full path names of all loaded libraries at the point it is called. */ diff --git a/src/lib/arch/IArchTaskBar.h b/src/lib/arch/IArchTaskBar.h index abf48fd3..85a32d87 100644 --- a/src/lib/arch/IArchTaskBar.h +++ b/src/lib/arch/IArchTaskBar.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -25,7 +25,7 @@ class IArchTaskBarReceiver; //! Interface for architecture dependent task bar control /*! This interface defines the task bar icon operations required -by synergy. Each architecture must implement this interface +by barrier. Each architecture must implement this interface though each operation can be a no-op. */ class IArchTaskBar : public IInterface { diff --git a/src/lib/arch/IArchTaskBarReceiver.h b/src/lib/arch/IArchTaskBarReceiver.h index aa6fc7f5..8a925b41 100644 --- a/src/lib/arch/IArchTaskBarReceiver.h +++ b/src/lib/arch/IArchTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -27,7 +27,7 @@ class INode; //! Interface for architecture dependent task bar event handling /*! This interface defines the task bar icon event handlers required -by synergy. Each architecture must implement this interface +by barrier. Each architecture must implement this interface though each operation can be a no-op. */ class IArchTaskBarReceiver : public IInterface { diff --git a/src/lib/arch/IArchTime.h b/src/lib/arch/IArchTime.h index e59baf43..abb3cdd8 100644 --- a/src/lib/arch/IArchTime.h +++ b/src/lib/arch/IArchTime.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,7 +23,7 @@ //! Interface for architecture dependent time operations /*! This interface defines the time operations required by -synergy. Each architecture must implement this interface. +barrier. Each architecture must implement this interface. */ class IArchTime : public IInterface { public: diff --git a/src/lib/arch/XArch.h b/src/lib/arch/XArch.h index 62245270..457c620d 100644 --- a/src/lib/arch/XArch.h +++ b/src/lib/arch/XArch.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/multibyte.h b/src/lib/arch/multibyte.h index 3ab48a3a..4a4e0ecb 100644 --- a/src/lib/arch/multibyte.h +++ b/src/lib/arch/multibyte.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchConsoleUnix.cpp b/src/lib/arch/unix/ArchConsoleUnix.cpp index b5e20223..79a4634b 100644 --- a/src/lib/arch/unix/ArchConsoleUnix.cpp +++ b/src/lib/arch/unix/ArchConsoleUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchConsoleUnix.h b/src/lib/arch/unix/ArchConsoleUnix.h index 718c2dc6..8326ab55 100644 --- a/src/lib/arch/unix/ArchConsoleUnix.h +++ b/src/lib/arch/unix/ArchConsoleUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchDaemonUnix.cpp b/src/lib/arch/unix/ArchDaemonUnix.cpp index 9041e1a0..a03bf7a9 100644 --- a/src/lib/arch/unix/ArchDaemonUnix.cpp +++ b/src/lib/arch/unix/ArchDaemonUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -46,7 +46,7 @@ ArchDaemonUnix::~ArchDaemonUnix() #ifdef __APPLE__ // In Mac OS X, fork()'d child processes can't use most APIs (the frameworks -// that Synergy uses in fact prevent it and make the process just up and die), +// that Barrier uses in fact prevent it and make the process just up and die), // so need to exec a copy of the program that doesn't fork so isn't limited. int execSelfNonDaemonized() @@ -54,14 +54,14 @@ execSelfNonDaemonized() extern char** NXArgv; char** selfArgv = NXArgv; - setenv("_SYNERGY_DAEMONIZED", "", 1); + setenv("_BARRIER_DAEMONIZED", "", 1); execvp(selfArgv[0], selfArgv); return 0; } bool alreadyDaemonized() { - return getenv("_SYNERGY_DAEMONIZED") != NULL; + return getenv("_BARRIER_DAEMONIZED") != NULL; } #endif diff --git a/src/lib/arch/unix/ArchDaemonUnix.h b/src/lib/arch/unix/ArchDaemonUnix.h index 0098a090..530159aa 100644 --- a/src/lib/arch/unix/ArchDaemonUnix.h +++ b/src/lib/arch/unix/ArchDaemonUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -33,4 +33,4 @@ public: virtual int daemonize(const char* name, DaemonFunc func); }; -#define CONFIG_FILE "/etc/synergy/synergyd.conf" +#define CONFIG_FILE "/etc/barrier/barrierd.conf" diff --git a/src/lib/arch/unix/ArchFileUnix.cpp b/src/lib/arch/unix/ArchFileUnix.cpp index 4558720c..35ed0310 100644 --- a/src/lib/arch/unix/ArchFileUnix.cpp +++ b/src/lib/arch/unix/ArchFileUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -94,7 +94,7 @@ ArchFileUnix::getInstalledDirectory() #if WINAPI_XWINDOWS return "/usr/bin"; #else - return "/Applications/Synergy.app/Contents/MacOS"; + return "/Applications/Barrier.app/Contents/MacOS"; #endif } @@ -127,9 +127,9 @@ ArchFileUnix::getProfileDirectory() } else { #if WINAPI_XWINDOWS - dir = getUserDirectory().append("/.synergy"); + dir = getUserDirectory().append("/.barrier"); #else - dir = getUserDirectory().append("/Library/Synergy"); + dir = getUserDirectory().append("/Library/Barrier"); #endif } return dir; diff --git a/src/lib/arch/unix/ArchFileUnix.h b/src/lib/arch/unix/ArchFileUnix.h index fe58f802..86dea0c9 100644 --- a/src/lib/arch/unix/ArchFileUnix.h +++ b/src/lib/arch/unix/ArchFileUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchInternetUnix.cpp b/src/lib/arch/unix/ArchInternetUnix.cpp index 06326ed6..fd1e135b 100644 --- a/src/lib/arch/unix/ArchInternetUnix.cpp +++ b/src/lib/arch/unix/ArchInternetUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -94,7 +94,7 @@ CurlFacade::get(const String& url) curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, curlWriteCallback); std::stringstream userAgent; - userAgent << "Synergy "; + userAgent << "Barrier "; userAgent << kVersion; curl_easy_setopt(m_curl, CURLOPT_USERAGENT, userAgent.str().c_str()); diff --git a/src/lib/arch/unix/ArchInternetUnix.h b/src/lib/arch/unix/ArchInternetUnix.h index 6fcf2b59..2413d8fb 100644 --- a/src/lib/arch/unix/ArchInternetUnix.h +++ b/src/lib/arch/unix/ArchInternetUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/arch/unix/ArchLogUnix.cpp b/src/lib/arch/unix/ArchLogUnix.cpp index 070e0272..b1f9089c 100644 --- a/src/lib/arch/unix/ArchLogUnix.cpp +++ b/src/lib/arch/unix/ArchLogUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchLogUnix.h b/src/lib/arch/unix/ArchLogUnix.h index 08f04fd4..cdd733fb 100644 --- a/src/lib/arch/unix/ArchLogUnix.h +++ b/src/lib/arch/unix/ArchLogUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchMultithreadPosix.cpp b/src/lib/arch/unix/ArchMultithreadPosix.cpp index 23a348aa..ade6c513 100644 --- a/src/lib/arch/unix/ArchMultithreadPosix.cpp +++ b/src/lib/arch/unix/ArchMultithreadPosix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -38,7 +38,7 @@ #if !HAVE_PTHREAD_SIGNAL // boy, is this platform broken. forget about pthread signal - // handling and let signals through to every process. synergy + // handling and let signals through to every process. barrier // will not terminate cleanly when it gets SIGTERM or SIGINT. # define pthread_sigmask sigprocmask # define pthread_kill(tid_, sig_) kill(0, (sig_)) @@ -644,7 +644,7 @@ ArchMultithreadPosix::insert(ArchThreadImpl* thread) // set thread id. note that we don't worry about m_nextID // wrapping back to 0 and duplicating thread ID's since the - // likelihood of synergy running that long is vanishingly + // likelihood of barrier running that long is vanishingly // small. thread->m_id = ++m_nextID; diff --git a/src/lib/arch/unix/ArchMultithreadPosix.h b/src/lib/arch/unix/ArchMultithreadPosix.h index 983b7ff1..98b5eda3 100644 --- a/src/lib/arch/unix/ArchMultithreadPosix.h +++ b/src/lib/arch/unix/ArchMultithreadPosix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchNetworkBSD.cpp b/src/lib/arch/unix/ArchNetworkBSD.cpp index 5c80a7ad..c4429e8a 100644 --- a/src/lib/arch/unix/ArchNetworkBSD.cpp +++ b/src/lib/arch/unix/ArchNetworkBSD.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchNetworkBSD.h b/src/lib/arch/unix/ArchNetworkBSD.h index 32a22cfd..4c26ed06 100644 --- a/src/lib/arch/unix/ArchNetworkBSD.h +++ b/src/lib/arch/unix/ArchNetworkBSD.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchSleepUnix.cpp b/src/lib/arch/unix/ArchSleepUnix.cpp index ad093c30..48e26006 100644 --- a/src/lib/arch/unix/ArchSleepUnix.cpp +++ b/src/lib/arch/unix/ArchSleepUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchSleepUnix.h b/src/lib/arch/unix/ArchSleepUnix.h index 0027549b..3e307a50 100644 --- a/src/lib/arch/unix/ArchSleepUnix.h +++ b/src/lib/arch/unix/ArchSleepUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchStringUnix.cpp b/src/lib/arch/unix/ArchStringUnix.cpp index fbb3e098..591c8267 100644 --- a/src/lib/arch/unix/ArchStringUnix.cpp +++ b/src/lib/arch/unix/ArchStringUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchStringUnix.h b/src/lib/arch/unix/ArchStringUnix.h index ce5c5531..f7d00355 100644 --- a/src/lib/arch/unix/ArchStringUnix.h +++ b/src/lib/arch/unix/ArchStringUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchSystemUnix.cpp b/src/lib/arch/unix/ArchSystemUnix.cpp index e877f23e..f51e47f7 100644 --- a/src/lib/arch/unix/ArchSystemUnix.cpp +++ b/src/lib/arch/unix/ArchSystemUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchSystemUnix.h b/src/lib/arch/unix/ArchSystemUnix.h index f7c64218..aa9c5648 100644 --- a/src/lib/arch/unix/ArchSystemUnix.h +++ b/src/lib/arch/unix/ArchSystemUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchTaskBarXWindows.cpp b/src/lib/arch/unix/ArchTaskBarXWindows.cpp index 85d8fe79..c3577add 100644 --- a/src/lib/arch/unix/ArchTaskBarXWindows.cpp +++ b/src/lib/arch/unix/ArchTaskBarXWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchTaskBarXWindows.h b/src/lib/arch/unix/ArchTaskBarXWindows.h index 2bd7c569..f2c8977c 100644 --- a/src/lib/arch/unix/ArchTaskBarXWindows.h +++ b/src/lib/arch/unix/ArchTaskBarXWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchTimeUnix.cpp b/src/lib/arch/unix/ArchTimeUnix.cpp index cc5d7a38..24685aa3 100644 --- a/src/lib/arch/unix/ArchTimeUnix.cpp +++ b/src/lib/arch/unix/ArchTimeUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/ArchTimeUnix.h b/src/lib/arch/unix/ArchTimeUnix.h index 770bf32e..3c5c0f8c 100644 --- a/src/lib/arch/unix/ArchTimeUnix.h +++ b/src/lib/arch/unix/ArchTimeUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/XArchUnix.cpp b/src/lib/arch/unix/XArchUnix.cpp index 5178bbfe..fc7ff659 100644 --- a/src/lib/arch/unix/XArchUnix.cpp +++ b/src/lib/arch/unix/XArchUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/unix/XArchUnix.h b/src/lib/arch/unix/XArchUnix.h index 53c9f5b1..ae62f4c8 100644 --- a/src/lib/arch/unix/XArchUnix.h +++ b/src/lib/arch/unix/XArchUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/vsnprintf.h b/src/lib/arch/vsnprintf.h index f6216ee8..5a4e3dce 100644 --- a/src/lib/arch/vsnprintf.h +++ b/src/lib/arch/vsnprintf.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchConsoleWindows.cpp b/src/lib/arch/win32/ArchConsoleWindows.cpp index 6a1a5ff6..45145554 100644 --- a/src/lib/arch/win32/ArchConsoleWindows.cpp +++ b/src/lib/arch/win32/ArchConsoleWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchConsoleWindows.h b/src/lib/arch/win32/ArchConsoleWindows.h index 4342de30..f1f0cc94 100644 --- a/src/lib/arch/win32/ArchConsoleWindows.h +++ b/src/lib/arch/win32/ArchConsoleWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchDaemonWindows.cpp b/src/lib/arch/win32/ArchDaemonWindows.cpp index 9c29be35..fdd50c43 100644 --- a/src/lib/arch/win32/ArchDaemonWindows.cpp +++ b/src/lib/arch/win32/ArchDaemonWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -33,7 +33,7 @@ ArchDaemonWindows* ArchDaemonWindows::s_daemon = NULL; ArchDaemonWindows::ArchDaemonWindows() : m_daemonThreadID(0) { - m_quitMessage = RegisterWindowMessage("SynergyDaemonExit"); + m_quitMessage = RegisterWindowMessage("BarrierDaemonExit"); } ArchDaemonWindows::~ArchDaemonWindows() diff --git a/src/lib/arch/win32/ArchDaemonWindows.h b/src/lib/arch/win32/ArchDaemonWindows.h index a3be9a58..ad69779e 100644 --- a/src/lib/arch/win32/ArchDaemonWindows.h +++ b/src/lib/arch/win32/ArchDaemonWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -139,16 +139,16 @@ private: std::string m_commandLine; }; -#define DEFAULT_DAEMON_NAME _T("Synergy") -#define DEFAULT_DAEMON_INFO _T("Manages the Synergy foreground processes.") +#define DEFAULT_DAEMON_NAME _T("Barrier") +#define DEFAULT_DAEMON_INFO _T("Manages the Barrier foreground processes.") -#define LEGACY_SERVER_DAEMON_NAME _T("Synergy Server") -#define LEGACY_CLIENT_DAEMON_NAME _T("Synergy Client") +#define LEGACY_SERVER_DAEMON_NAME _T("Barrier Server") +#define LEGACY_CLIENT_DAEMON_NAME _T("Barrier Client") static const TCHAR* const g_daemonKeyPath[] = { _T("SOFTWARE"), - _T("The Synergy Project"), - _T("Synergy"), + _T("The Barrier Project"), + _T("Barrier"), _T("Service"), NULL }; diff --git a/src/lib/arch/win32/ArchFileWindows.cpp b/src/lib/arch/win32/ArchFileWindows.cpp index 38679c1b..53b4b594 100644 --- a/src/lib/arch/win32/ArchFileWindows.cpp +++ b/src/lib/arch/win32/ArchFileWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -169,7 +169,7 @@ ArchFileWindows::getProfileDirectory() } // HACK: append program name, this seems wrong. - dir.append("\\Synergy"); + dir.append("\\Barrier"); return dir; } diff --git a/src/lib/arch/win32/ArchFileWindows.h b/src/lib/arch/win32/ArchFileWindows.h index be1bdf81..4747b9c8 100644 --- a/src/lib/arch/win32/ArchFileWindows.h +++ b/src/lib/arch/win32/ArchFileWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchInternetWindows.cpp b/src/lib/arch/win32/ArchInternetWindows.cpp index 5844d15d..7f69c7fb 100644 --- a/src/lib/arch/win32/ArchInternetWindows.cpp +++ b/src/lib/arch/win32/ArchInternetWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -76,8 +76,8 @@ ArchInternetWindows::urlEncode(const String& url) // the win32 url encoding funcitons are pretty useless (to us) and only // escape "unsafe" chars, but not + or =, so we need to replace these // manually (and probably many other chars). - synergy::string::findReplaceAll(result, "+", "%2B"); - synergy::string::findReplaceAll(result, "=", "%3D"); + barrier::string::findReplaceAll(result, "+", "%2B"); + barrier::string::findReplaceAll(result, "=", "%3D"); return result; } @@ -146,7 +146,7 @@ void WinINetRequest::openSession() { std::stringstream userAgent; - userAgent << "Synergy "; + userAgent << "Barrier "; userAgent << kVersion; m_session = InternetOpen( diff --git a/src/lib/arch/win32/ArchInternetWindows.h b/src/lib/arch/win32/ArchInternetWindows.h index 3fda3334..bab8d3c6 100644 --- a/src/lib/arch/win32/ArchInternetWindows.h +++ b/src/lib/arch/win32/ArchInternetWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/arch/win32/ArchLogWindows.cpp b/src/lib/arch/win32/ArchLogWindows.cpp index f9b24bd0..bc17abf8 100644 --- a/src/lib/arch/win32/ArchLogWindows.cpp +++ b/src/lib/arch/win32/ArchLogWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchLogWindows.h b/src/lib/arch/win32/ArchLogWindows.h index 68e1ab05..3a997f1d 100644 --- a/src/lib/arch/win32/ArchLogWindows.h +++ b/src/lib/arch/win32/ArchLogWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchMiscWindows.cpp b/src/lib/arch/win32/ArchMiscWindows.cpp index 782d21e8..924afa2d 100644 --- a/src/lib/arch/win32/ArchMiscWindows.cpp +++ b/src/lib/arch/win32/ArchMiscWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchMiscWindows.h b/src/lib/arch/win32/ArchMiscWindows.h index 7758abaf..0ecd79d7 100644 --- a/src/lib/arch/win32/ArchMiscWindows.h +++ b/src/lib/arch/win32/ArchMiscWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchMultithreadWindows.cpp b/src/lib/arch/win32/ArchMultithreadWindows.cpp index 063f44f0..3124f4d8 100644 --- a/src/lib/arch/win32/ArchMultithreadWindows.cpp +++ b/src/lib/arch/win32/ArchMultithreadWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchMultithreadWindows.h b/src/lib/arch/win32/ArchMultithreadWindows.h index ac4daa57..99aa6401 100644 --- a/src/lib/arch/win32/ArchMultithreadWindows.h +++ b/src/lib/arch/win32/ArchMultithreadWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchNetworkWinsock.cpp b/src/lib/arch/win32/ArchNetworkWinsock.cpp index 65a5b320..b6bf2397 100644 --- a/src/lib/arch/win32/ArchNetworkWinsock.cpp +++ b/src/lib/arch/win32/ArchNetworkWinsock.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchNetworkWinsock.h b/src/lib/arch/win32/ArchNetworkWinsock.h index 4c2e8573..55ae1a6d 100644 --- a/src/lib/arch/win32/ArchNetworkWinsock.h +++ b/src/lib/arch/win32/ArchNetworkWinsock.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchSleepWindows.cpp b/src/lib/arch/win32/ArchSleepWindows.cpp index 67e48784..69648a7b 100644 --- a/src/lib/arch/win32/ArchSleepWindows.cpp +++ b/src/lib/arch/win32/ArchSleepWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchSleepWindows.h b/src/lib/arch/win32/ArchSleepWindows.h index d78cf6ed..d673caf2 100644 --- a/src/lib/arch/win32/ArchSleepWindows.h +++ b/src/lib/arch/win32/ArchSleepWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchStringWindows.cpp b/src/lib/arch/win32/ArchStringWindows.cpp index 85ab66ca..deaf5367 100644 --- a/src/lib/arch/win32/ArchStringWindows.cpp +++ b/src/lib/arch/win32/ArchStringWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchStringWindows.h b/src/lib/arch/win32/ArchStringWindows.h index c273cd67..23812dc5 100644 --- a/src/lib/arch/win32/ArchStringWindows.h +++ b/src/lib/arch/win32/ArchStringWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchSystemWindows.cpp b/src/lib/arch/win32/ArchSystemWindows.cpp index d63ba336..654c92d1 100644 --- a/src/lib/arch/win32/ArchSystemWindows.cpp +++ b/src/lib/arch/win32/ArchSystemWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -28,7 +28,7 @@ static const char* s_settingsKeyNames[] = { _T("SOFTWARE"), - _T("Synergy"), + _T("Barrier"), NULL }; diff --git a/src/lib/arch/win32/ArchSystemWindows.h b/src/lib/arch/win32/ArchSystemWindows.h index 0d3df4ac..3d45ee64 100644 --- a/src/lib/arch/win32/ArchSystemWindows.h +++ b/src/lib/arch/win32/ArchSystemWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchTaskBarWindows.cpp b/src/lib/arch/win32/ArchTaskBarWindows.cpp index 61376674..731dc59b 100644 --- a/src/lib/arch/win32/ArchTaskBarWindows.cpp +++ b/src/lib/arch/win32/ArchTaskBarWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -21,7 +21,7 @@ #include "arch/IArchTaskBarReceiver.h" #include "arch/Arch.h" #include "arch/XArch.h" -#include "synergy/win32/AppUtilWindows.h" +#include "barrier/win32/AppUtilWindows.h" #include #include @@ -447,7 +447,7 @@ ArchTaskBarWindows::threadMainLoop() m_taskBarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); // register a window class - LPCTSTR className = TEXT("SynergyTaskBar"); + LPCTSTR className = TEXT("BarrierTaskBar"); WNDCLASSEX classInfo; classInfo.cbSize = sizeof(classInfo); classInfo.style = CS_NOCLOSE; @@ -466,7 +466,7 @@ ArchTaskBarWindows::threadMainLoop() // create window m_hwnd = CreateWindowEx(WS_EX_TOOLWINDOW, className, - TEXT("Synergy Task Bar"), + TEXT("Barrier Task Bar"), WS_POPUP, 0, 0, 1, 1, NULL, diff --git a/src/lib/arch/win32/ArchTaskBarWindows.h b/src/lib/arch/win32/ArchTaskBarWindows.h index 2df7f46d..0edddf89 100644 --- a/src/lib/arch/win32/ArchTaskBarWindows.h +++ b/src/lib/arch/win32/ArchTaskBarWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchTimeWindows.cpp b/src/lib/arch/win32/ArchTimeWindows.cpp index 389e07a4..568a483a 100644 --- a/src/lib/arch/win32/ArchTimeWindows.cpp +++ b/src/lib/arch/win32/ArchTimeWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/ArchTimeWindows.h b/src/lib/arch/win32/ArchTimeWindows.h index 5a6336c5..42351a1a 100644 --- a/src/lib/arch/win32/ArchTimeWindows.h +++ b/src/lib/arch/win32/ArchTimeWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/arch/win32/XArchWindows.cpp b/src/lib/arch/win32/XArchWindows.cpp index d4ec26be..eeec0e1f 100644 --- a/src/lib/arch/win32/XArchWindows.cpp +++ b/src/lib/arch/win32/XArchWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -38,7 +38,7 @@ XArchEvalWindows::eval() const throw() 0, NULL) == 0) { cmsg = NULL; - return synergy::string::sprintf("Unknown error, code %d", m_error); + return barrier::string::sprintf("Unknown error, code %d", m_error); } std::string smsg(cmsg); LocalFree(cmsg); diff --git a/src/lib/arch/win32/XArchWindows.h b/src/lib/arch/win32/XArchWindows.h index 29351259..10106b16 100644 --- a/src/lib/arch/win32/XArchWindows.h +++ b/src/lib/arch/win32/XArchWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/App.cpp b/src/lib/barrier/App.cpp similarity index 97% rename from src/lib/synergy/App.cpp rename to src/lib/barrier/App.cpp index 4c8c1808..1f4eda32 100644 --- a/src/lib/synergy/App.cpp +++ b/src/lib/barrier/App.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,17 +16,17 @@ * along with this program. If not, see . */ -#include "synergy/App.h" +#include "barrier/App.h" #include "base/Log.h" #include "common/Version.h" -#include "synergy/protocol_types.h" +#include "barrier/protocol_types.h" #include "arch/Arch.h" #include "base/XBase.h" #include "arch/XArch.h" #include "base/log_outputters.h" -#include "synergy/XSynergy.h" -#include "synergy/ArgsBase.h" +#include "barrier/XBarrier.h" +#include "barrier/ArgsBase.h" #include "ipc/IpcServerProxy.h" #include "base/TMethodEventJob.h" #include "ipc/IpcMessage.h" @@ -294,7 +294,7 @@ MinimalApp::foregroundStartup(int argc, char** argv) return 0; } -synergy::Screen* +barrier::Screen* MinimalApp::createScreen() { return NULL; diff --git a/src/lib/synergy/App.h b/src/lib/barrier/App.h similarity index 96% rename from src/lib/synergy/App.h rename to src/lib/barrier/App.h index 078786f9..dccf6a67 100644 --- a/src/lib/synergy/App.h +++ b/src/lib/barrier/App.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,23 +19,23 @@ #pragma once #include "ipc/IpcClient.h" -#include "synergy/IApp.h" +#include "barrier/IApp.h" #include "base/String.h" #include "base/Log.h" #include "base/EventQueue.h" #include "common/common.h" #if SYSAPI_WIN32 -#include "synergy/win32/AppUtilWindows.h" +#include "barrier/win32/AppUtilWindows.h" #elif SYSAPI_UNIX -#include "synergy/unix/AppUtilUnix.h" +#include "barrier/unix/AppUtilUnix.h" #endif class IArchTaskBarReceiver; class BufferedLogOutputter; class ILogOutputter; class FileLogOutputter; -namespace synergy { class Screen; } +namespace barrier { class Screen; } class IEventQueue; class SocketMultiplexer; @@ -133,7 +133,7 @@ public: virtual void startNode(); virtual int mainLoop(); virtual int foregroundStartup(int argc, char** argv); - virtual synergy::Screen* + virtual barrier::Screen* createScreen(); virtual void loadConfig(); virtual bool loadConfig(const String& pathname); diff --git a/src/lib/synergy/AppUtil.cpp b/src/lib/barrier/AppUtil.cpp similarity index 93% rename from src/lib/synergy/AppUtil.cpp rename to src/lib/barrier/AppUtil.cpp index c1f9bb56..3298d7bc 100644 --- a/src/lib/synergy/AppUtil.cpp +++ b/src/lib/barrier/AppUtil.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/AppUtil.h" +#include "barrier/AppUtil.h" AppUtil* AppUtil::s_instance = nullptr; diff --git a/src/lib/synergy/AppUtil.h b/src/lib/barrier/AppUtil.h similarity index 91% rename from src/lib/synergy/AppUtil.h rename to src/lib/barrier/AppUtil.h index dedece90..6f5f0734 100644 --- a/src/lib/synergy/AppUtil.h +++ b/src/lib/barrier/AppUtil.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,8 +18,8 @@ #pragma once -#include "synergy/IAppUtil.h" -#include "synergy/XSynergy.h" +#include "barrier/IAppUtil.h" +#include "barrier/XBarrier.h" class AppUtil : public IAppUtil { public: diff --git a/src/lib/synergy/ArgParser.cpp b/src/lib/barrier/ArgParser.cpp similarity index 96% rename from src/lib/synergy/ArgParser.cpp rename to src/lib/barrier/ArgParser.cpp index c9da4e55..9d5cb71e 100644 --- a/src/lib/synergy/ArgParser.cpp +++ b/src/lib/barrier/ArgParser.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,14 +15,14 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" +#include "barrier/ArgParser.h" -#include "synergy/StreamChunker.h" -#include "synergy/App.h" -#include "synergy/ServerArgs.h" -#include "synergy/ClientArgs.h" -#include "synergy/ToolArgs.h" -#include "synergy/ArgsBase.h" +#include "barrier/StreamChunker.h" +#include "barrier/App.h" +#include "barrier/ServerArgs.h" +#include "barrier/ClientArgs.h" +#include "barrier/ToolArgs.h" +#include "barrier/ArgsBase.h" #include "base/Log.h" #include "base/String.h" @@ -55,7 +55,7 @@ ArgParser::parseServerArgs(ServerArgs& args, int argc, const char* const* argv) } else if (isArg(i, argc, argv, "-a", "--address", 1)) { // save listen address - args.m_synergyAddress = argv[++i]; + args.m_barrierAddress = argv[++i]; } else if (isArg(i, argc, argv, "-c", "--config", 1)) { // save configuration file path @@ -106,7 +106,7 @@ ArgParser::parseClientArgs(ClientArgs& args, int argc, const char* const* argv) } else { if (i + 1 == argc) { - args.m_synergyAddress = argv[i]; + args.m_barrierAddress = argv[i]; return true; } @@ -134,7 +134,7 @@ ArgParser::parsePlatformArg(ArgsBase& argsBase, const int& argc, const char* con { #if WINAPI_MSWINDOWS if (isArg(i, argc, argv, NULL, "--service")) { - LOG((CLOG_WARN "obsolete argument --service, use synergyd instead.")); + LOG((CLOG_WARN "obsolete argument --service, use barrierd instead.")); argsBase.m_shouldExit = true; } else if (isArg(i, argc, argv, NULL, "--exit-pause")) { @@ -266,10 +266,10 @@ ArgParser::parseGenericArgs(int argc, const char* const* argv, int& i) argsBase().m_enableIpc = true; } else if (isArg(i, argc, argv, NULL, "--server")) { - // HACK: stop error happening when using portable (synergyp) + // HACK: stop error happening when using portable (barrierp) } else if (isArg(i, argc, argv, NULL, "--client")) { - // HACK: stop error happening when using portable (synergyp) + // HACK: stop error happening when using portable (barrierp) } else if (isArg(i, argc, argv, NULL, "--enable-drag-drop")) { bool useDragDrop = true; diff --git a/src/lib/synergy/ArgParser.h b/src/lib/barrier/ArgParser.h similarity index 98% rename from src/lib/synergy/ArgParser.h rename to src/lib/barrier/ArgParser.h index 4fc8a263..5fc2649c 100644 --- a/src/lib/synergy/ArgParser.h +++ b/src/lib/barrier/ArgParser.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/synergy/ArgsBase.cpp b/src/lib/barrier/ArgsBase.cpp similarity index 93% rename from src/lib/synergy/ArgsBase.cpp rename to src/lib/barrier/ArgsBase.cpp index a2d70f5b..eedb3124 100644 --- a/src/lib/synergy/ArgsBase.cpp +++ b/src/lib/barrier/ArgsBase.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/ArgsBase.h" +#include "barrier/ArgsBase.h" ArgsBase::ArgsBase() : #if SYSAPI_WIN32 @@ -41,7 +41,7 @@ m_disableTray(false), m_enableIpc(false), m_enableDragDrop(false), m_shouldExit(false), -m_synergyAddress(), +m_barrierAddress(), m_enableCrypto(false), m_profileDirectory(""), m_pluginDirectory("") diff --git a/src/lib/synergy/ArgsBase.h b/src/lib/barrier/ArgsBase.h similarity index 94% rename from src/lib/synergy/ArgsBase.h rename to src/lib/barrier/ArgsBase.h index 6ae0e3d0..1f49984d 100644 --- a/src/lib/synergy/ArgsBase.h +++ b/src/lib/barrier/ArgsBase.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -47,7 +47,7 @@ public: bool m_disableXInitThreads; #endif bool m_shouldExit; - String m_synergyAddress; + String m_barrierAddress; bool m_enableCrypto; String m_profileDirectory; String m_pluginDirectory; diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/barrier/CMakeLists.txt similarity index 94% rename from src/lib/synergy/CMakeLists.txt rename to src/lib/barrier/CMakeLists.txt index 91008696..6978aefb 100644 --- a/src/lib/synergy/CMakeLists.txt +++ b/src/lib/barrier/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -29,7 +29,7 @@ endif() list(APPEND sources ${arch_sources}) list(APPEND headers ${arch_headers}) -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/synergy/Chunk.cpp b/src/lib/barrier/Chunk.cpp similarity index 91% rename from src/lib/synergy/Chunk.cpp rename to src/lib/barrier/Chunk.cpp index 71464f70..f11bff54 100644 --- a/src/lib/synergy/Chunk.cpp +++ b/src/lib/barrier/Chunk.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/Chunk.h" +#include "barrier/Chunk.h" #include "base/String.h" Chunk::Chunk(size_t size): m_dataSize(0) diff --git a/src/lib/synergy/Chunk.h b/src/lib/barrier/Chunk.h similarity index 94% rename from src/lib/synergy/Chunk.h rename to src/lib/barrier/Chunk.h index 8a6f21f2..42b85bfc 100644 --- a/src/lib/synergy/Chunk.h +++ b/src/lib/barrier/Chunk.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/synergy/ClientApp.cpp b/src/lib/barrier/ClientApp.cpp similarity index 93% rename from src/lib/synergy/ClientApp.cpp rename to src/lib/barrier/ClientApp.cpp index 1accbad3..1da57cab 100644 --- a/src/lib/synergy/ClientApp.cpp +++ b/src/lib/barrier/ClientApp.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -#include "synergy/ClientApp.h" +#include "barrier/ClientApp.h" #include "client/Client.h" -#include "synergy/ArgParser.h" -#include "synergy/protocol_types.h" -#include "synergy/Screen.h" -#include "synergy/XScreen.h" -#include "synergy/ClientArgs.h" +#include "barrier/ArgParser.h" +#include "barrier/protocol_types.h" +#include "barrier/Screen.h" +#include "barrier/XScreen.h" +#include "barrier/ClientArgs.h" #include "net/NetworkAddress.h" #include "net/TCPSocketFactory.h" #include "net/SocketMultiplexer.h" @@ -85,9 +85,9 @@ ClientApp::parseArgs(int argc, const char* const* argv) } else { // save server address - if (!args().m_synergyAddress.empty()) { + if (!args().m_barrierAddress.empty()) { try { - *m_serverAddress = NetworkAddress(args().m_synergyAddress, kDefaultPort); + *m_serverAddress = NetworkAddress(args().m_barrierAddress, kDefaultPort); m_serverAddress->resolve(); } catch (XSocketAddress& e) { @@ -129,7 +129,7 @@ ClientApp::help() HELP_COMMON_ARGS " " "\n\n" - "Connect to a synergy mouse/keyboard sharing server.\n" + "Connect to a barrier mouse/keyboard sharing server.\n" "\n" HELP_COMMON_INFO_1 WINAPI_INFO @@ -153,9 +153,9 @@ const char* ClientApp::daemonName() const { #if SYSAPI_WIN32 - return "Synergy Client"; + return "Barrier Client"; #elif SYSAPI_UNIX - return "synergyc"; + return "barrierc"; #endif } @@ -169,18 +169,18 @@ ClientApp::daemonInfo() const #endif } -synergy::Screen* +barrier::Screen* ClientApp::createScreen() { #if WINAPI_MSWINDOWS - return new synergy::Screen(new MSWindowsScreen( + return new barrier::Screen(new MSWindowsScreen( false, args().m_noHooks, args().m_stopOnDeskSwitch, m_events), m_events); #elif WINAPI_XWINDOWS - return new synergy::Screen(new XWindowsScreen( + return new barrier::Screen(new XWindowsScreen( args().m_display, false, args().m_disableXInitThreads, args().m_yscroll, m_events), m_events); #elif WINAPI_CARBON - return new synergy::Screen(new OSXScreen(m_events, false), m_events); + return new barrier::Screen(new OSXScreen(m_events, false), m_events); #endif } @@ -240,10 +240,10 @@ ClientApp::handleScreenError(const Event&, void*) } -synergy::Screen* +barrier::Screen* ClientApp::openClientScreen() { - synergy::Screen* screen = createScreen(); + barrier::Screen* screen = createScreen(); screen->setEnableDragDrop(argsBase().m_enableDragDrop); m_events->adoptHandler(m_events->forIScreen().error(), screen->getEventTarget(), @@ -254,7 +254,7 @@ ClientApp::openClientScreen() void -ClientApp::closeClientScreen(synergy::Screen* screen) +ClientApp::closeClientScreen(barrier::Screen* screen) { if (screen != NULL) { m_events->removeHandler(m_events->forIScreen().error(), @@ -333,7 +333,7 @@ ClientApp::handleClientDisconnected(const Event&, void*) Client* ClientApp::openClient(const String& name, const NetworkAddress& address, - synergy::Screen* screen) + barrier::Screen* screen) { Client* client = new Client( m_events, @@ -394,7 +394,7 @@ bool ClientApp::startClient() { double retryTime; - synergy::Screen* clientScreen = NULL; + barrier::Screen* clientScreen = NULL; try { if (m_clientScreen == NULL) { clientScreen = openClientScreen(); diff --git a/src/lib/synergy/ClientApp.h b/src/lib/barrier/ClientApp.h similarity index 88% rename from src/lib/synergy/ClientApp.h rename to src/lib/barrier/ClientApp.h index 24fa20c3..777f3d36 100644 --- a/src/lib/synergy/ClientApp.h +++ b/src/lib/barrier/ClientApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,9 +18,9 @@ #pragma once -#include "synergy/App.h" +#include "barrier/App.h" -namespace synergy { class Screen; } +namespace barrier { class Screen; } class Event; class Client; class NetworkAddress; @@ -51,21 +51,21 @@ public: int foregroundStartup(int argc, char** argv); int standardStartup(int argc, char** argv); int runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc startup); - synergy::Screen* createScreen(); + barrier::Screen* createScreen(); void updateStatus(); void updateStatus(const String& msg); void resetRestartTimeout(); double nextRestartTimeout(); void handleScreenError(const Event&, void*); - synergy::Screen* openClientScreen(); - void closeClientScreen(synergy::Screen* screen); + barrier::Screen* openClientScreen(); + void closeClientScreen(barrier::Screen* screen); void handleClientRestart(const Event&, void* vtimer); void scheduleClientRestart(double retryTime); void handleClientConnected(const Event&, void*); void handleClientFailed(const Event& e, void*); void handleClientDisconnected(const Event&, void*); Client* openClient(const String& name, const NetworkAddress& address, - synergy::Screen* screen); + barrier::Screen* screen); void closeClient(Client* client); bool startClient(); void stopClient(); @@ -78,6 +78,6 @@ public: private: Client* m_client; - synergy::Screen*m_clientScreen; + barrier::Screen*m_clientScreen; NetworkAddress* m_serverAddress; }; diff --git a/src/lib/synergy/ClientArgs.cpp b/src/lib/barrier/ClientArgs.cpp similarity index 89% rename from src/lib/synergy/ClientArgs.cpp rename to src/lib/barrier/ClientArgs.cpp index 03ffd746..5c9ed88b 100644 --- a/src/lib/synergy/ClientArgs.cpp +++ b/src/lib/barrier/ClientArgs.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/ClientArgs.h" +#include "barrier/ClientArgs.h" ClientArgs::ClientArgs() : m_yscroll(0) diff --git a/src/lib/synergy/ClientArgs.h b/src/lib/barrier/ClientArgs.h similarity index 90% rename from src/lib/synergy/ClientArgs.h rename to src/lib/barrier/ClientArgs.h index 93a7307a..70285fad 100644 --- a/src/lib/synergy/ClientArgs.h +++ b/src/lib/barrier/ClientArgs.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ #pragma once -#include "synergy/ArgsBase.h" +#include "barrier/ArgsBase.h" class NetworkAddress; diff --git a/src/lib/synergy/ClientTaskBarReceiver.cpp b/src/lib/barrier/ClientTaskBarReceiver.cpp similarity index 88% rename from src/lib/synergy/ClientTaskBarReceiver.cpp rename to src/lib/barrier/ClientTaskBarReceiver.cpp index d49175da..2ea6566a 100644 --- a/src/lib/synergy/ClientTaskBarReceiver.cpp +++ b/src/lib/barrier/ClientTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/ClientTaskBarReceiver.h" +#include "barrier/ClientTaskBarReceiver.h" #include "client/Client.h" #include "mt/Lock.h" #include "base/String.h" @@ -117,22 +117,22 @@ ClientTaskBarReceiver::getToolTip() const { switch (m_state) { case kNotRunning: - return synergy::string::sprintf("%s: Not running", kAppVersion); + return barrier::string::sprintf("%s: Not running", kAppVersion); case kNotWorking: - return synergy::string::sprintf("%s: %s", + return barrier::string::sprintf("%s: %s", kAppVersion, m_errorMessage.c_str()); case kNotConnected: - return synergy::string::sprintf("%s: Not connected: %s", + return barrier::string::sprintf("%s: Not connected: %s", kAppVersion, m_errorMessage.c_str()); case kConnecting: - return synergy::string::sprintf("%s: Connecting to %s...", + return barrier::string::sprintf("%s: Connecting to %s...", kAppVersion, m_server.c_str()); case kConnected: - return synergy::string::sprintf("%s: Connected to %s", + return barrier::string::sprintf("%s: Connected to %s", kAppVersion, m_server.c_str()); default: diff --git a/src/lib/synergy/ClientTaskBarReceiver.h b/src/lib/barrier/ClientTaskBarReceiver.h similarity index 95% rename from src/lib/synergy/ClientTaskBarReceiver.h rename to src/lib/barrier/ClientTaskBarReceiver.h index eae8e3b0..da151545 100644 --- a/src/lib/synergy/ClientTaskBarReceiver.h +++ b/src/lib/barrier/ClientTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -26,7 +26,7 @@ class IEventQueue; -//! Implementation of IArchTaskBarReceiver for the synergy server +//! Implementation of IArchTaskBarReceiver for the barrier server class ClientTaskBarReceiver : public IArchTaskBarReceiver { public: ClientTaskBarReceiver(IEventQueue* events); diff --git a/src/lib/synergy/Clipboard.cpp b/src/lib/barrier/Clipboard.cpp similarity index 96% rename from src/lib/synergy/Clipboard.cpp rename to src/lib/barrier/Clipboard.cpp index 86bd37b6..a6a166d7 100644 --- a/src/lib/synergy/Clipboard.cpp +++ b/src/lib/barrier/Clipboard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/Clipboard.h" +#include "barrier/Clipboard.h" // // Clipboard diff --git a/src/lib/synergy/Clipboard.h b/src/lib/barrier/Clipboard.h similarity index 96% rename from src/lib/synergy/Clipboard.h rename to src/lib/barrier/Clipboard.h index 81f07000..23bea75b 100644 --- a/src/lib/synergy/Clipboard.h +++ b/src/lib/barrier/Clipboard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/IClipboard.h" +#include "barrier/IClipboard.h" //! Memory buffer clipboard /*! diff --git a/src/lib/synergy/ClipboardChunk.cpp b/src/lib/barrier/ClipboardChunk.cpp similarity index 92% rename from src/lib/synergy/ClipboardChunk.cpp rename to src/lib/barrier/ClipboardChunk.cpp index 0cf0ffbc..bc714716 100644 --- a/src/lib/synergy/ClipboardChunk.cpp +++ b/src/lib/barrier/ClipboardChunk.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -#include "synergy/ClipboardChunk.h" +#include "barrier/ClipboardChunk.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/protocol_types.h" +#include "barrier/ProtocolUtil.h" +#include "barrier/protocol_types.h" #include "io/IStream.h" #include "base/Log.h" #include @@ -84,7 +84,7 @@ ClipboardChunk::end(ClipboardID id, UInt32 sequence) } int -ClipboardChunk::assemble(synergy::IStream* stream, +ClipboardChunk::assemble(barrier::IStream* stream, String& dataCached, ClipboardID& id, UInt32& sequence) @@ -97,7 +97,7 @@ ClipboardChunk::assemble(synergy::IStream* stream, } if (mark == kDataStart) { - s_expectedSize = synergy::string::stringToSizeType(data); + s_expectedSize = barrier::string::stringToSizeType(data); LOG((CLOG_DEBUG "start receiving clipboard data")); dataCached.clear(); return kStart; @@ -123,7 +123,7 @@ ClipboardChunk::assemble(synergy::IStream* stream, } void -ClipboardChunk::send(synergy::IStream* stream, void* data) +ClipboardChunk::send(barrier::IStream* stream, void* data) { ClipboardChunk* clipboardData = static_cast(data); diff --git a/src/lib/synergy/ClipboardChunk.h b/src/lib/barrier/ClipboardChunk.h similarity index 86% rename from src/lib/synergy/ClipboardChunk.h rename to src/lib/barrier/ClipboardChunk.h index 9bf4b7a4..6402aca8 100644 --- a/src/lib/synergy/ClipboardChunk.h +++ b/src/lib/barrier/ClipboardChunk.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,14 +17,14 @@ #pragma once -#include "synergy/Chunk.h" -#include "synergy/clipboard_types.h" +#include "barrier/Chunk.h" +#include "barrier/clipboard_types.h" #include "base/String.h" #include "common/basic_types.h" #define CLIPBOARD_CHUNK_META_SIZE 7 -namespace synergy { +namespace barrier { class IStream; }; @@ -46,12 +46,12 @@ public: end(ClipboardID id, UInt32 sequence); static int assemble( - synergy::IStream* stream, + barrier::IStream* stream, String& dataCached, ClipboardID& id, UInt32& sequence); - static void send(synergy::IStream* stream, void* data); + static void send(barrier::IStream* stream, void* data); static size_t getExpectedSize() { return s_expectedSize; } diff --git a/src/lib/synergy/DaemonApp.cpp b/src/lib/barrier/DaemonApp.cpp similarity index 96% rename from src/lib/synergy/DaemonApp.cpp rename to src/lib/barrier/DaemonApp.cpp index 84f2a784..28f883de 100644 --- a/src/lib/synergy/DaemonApp.cpp +++ b/src/lib/barrier/DaemonApp.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -19,12 +19,12 @@ // TODO: split this class into windows and unix to get rid // of all the #ifdefs! -#include "synergy/DaemonApp.h" +#include "barrier/DaemonApp.h" -#include "synergy/App.h" -#include "synergy/ArgParser.h" -#include "synergy/ServerArgs.h" -#include "synergy/ClientArgs.h" +#include "barrier/App.h" +#include "barrier/ArgParser.h" +#include "barrier/ServerArgs.h" +#include "barrier/ClientArgs.h" #include "ipc/IpcClientProxy.h" #include "ipc/IpcMessage.h" #include "ipc/IpcLogOutputter.h" @@ -41,7 +41,7 @@ #include "arch/win32/ArchMiscWindows.h" #include "arch/win32/XArchWindows.h" -#include "synergy/Screen.h" +#include "barrier/Screen.h" #include "platform/MSWindowsScreen.h" #include "platform/MSWindowsDebugOutputter.h" #include "platform/MSWindowsWatchdog.h" @@ -159,9 +159,9 @@ DaemonApp::run(int argc, char** argv) } else { #if SYSAPI_WIN32 - arch.daemonize("Synergy", winMainLoopStatic); + arch.daemonize("Barrier", winMainLoopStatic); #elif SYSAPI_UNIX - arch.daemonize("Synergy", unixMainLoopStatic); + arch.daemonize("Barrier", unixMainLoopStatic); #endif } @@ -267,7 +267,7 @@ void DaemonApp::foregroundError(const char* message) { #if SYSAPI_WIN32 - MessageBox(NULL, message, "Synergy Service", MB_OK | MB_ICONERROR); + MessageBox(NULL, message, "Barrier Service", MB_OK | MB_ICONERROR); #elif SYSAPI_UNIX cerr << message << endl; #endif @@ -311,7 +311,7 @@ DaemonApp::handleIpcMessage(const Event& e, void*) ServerArgs serverArgs; ClientArgs clientArgs; int argc = static_cast(argsArray.size()); - bool server = argsArray[0].find("synergys") != String::npos ? true : false; + bool server = argsArray[0].find("barriers") != String::npos ? true : false; ArgsBase* argBase = NULL; if (server) { diff --git a/src/lib/synergy/DaemonApp.h b/src/lib/barrier/DaemonApp.h similarity index 94% rename from src/lib/synergy/DaemonApp.h rename to src/lib/barrier/DaemonApp.h index 511c6d53..e6118ef1 100644 --- a/src/lib/synergy/DaemonApp.h +++ b/src/lib/barrier/DaemonApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -59,4 +59,4 @@ private: FileLogOutputter* m_fileLogOutputter; }; -#define LOG_FILENAME "synergyd.log" +#define LOG_FILENAME "barrierd.log" diff --git a/src/lib/synergy/DragInformation.cpp b/src/lib/barrier/DragInformation.cpp similarity index 97% rename from src/lib/synergy/DragInformation.cpp rename to src/lib/barrier/DragInformation.cpp index 59136516..db28f3da 100644 --- a/src/lib/synergy/DragInformation.cpp +++ b/src/lib/barrier/DragInformation.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/DragInformation.h" +#include "barrier/DragInformation.h" #include "base/Log.h" #include diff --git a/src/lib/synergy/DragInformation.h b/src/lib/barrier/DragInformation.h similarity index 97% rename from src/lib/synergy/DragInformation.h rename to src/lib/barrier/DragInformation.h index 470146ce..b985bd17 100644 --- a/src/lib/synergy/DragInformation.h +++ b/src/lib/barrier/DragInformation.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/synergy/DropHelper.cpp b/src/lib/barrier/DropHelper.cpp similarity index 95% rename from src/lib/synergy/DropHelper.cpp rename to src/lib/barrier/DropHelper.cpp index a99d9f8a..ee5e5ee5 100644 --- a/src/lib/synergy/DropHelper.cpp +++ b/src/lib/barrier/DropHelper.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/DropHelper.h" +#include "barrier/DropHelper.h" #include "base/Log.h" diff --git a/src/lib/synergy/DropHelper.h b/src/lib/barrier/DropHelper.h similarity index 90% rename from src/lib/synergy/DropHelper.h rename to src/lib/barrier/DropHelper.h index 021f2cc9..67facbb7 100644 --- a/src/lib/synergy/DropHelper.h +++ b/src/lib/barrier/DropHelper.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ #pragma once -#include "synergy/DragInformation.h" +#include "barrier/DragInformation.h" #include "base/String.h" class DropHelper { diff --git a/src/lib/synergy/FileChunk.cpp b/src/lib/barrier/FileChunk.cpp similarity index 92% rename from src/lib/synergy/FileChunk.cpp rename to src/lib/barrier/FileChunk.cpp index 490112df..3a985687 100644 --- a/src/lib/synergy/FileChunk.cpp +++ b/src/lib/barrier/FileChunk.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -#include "synergy/FileChunk.h" +#include "barrier/FileChunk.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/protocol_types.h" +#include "barrier/ProtocolUtil.h" +#include "barrier/protocol_types.h" #include "io/IStream.h" #include "base/Stopwatch.h" #include "base/Log.h" @@ -68,7 +68,7 @@ FileChunk::end() } int -FileChunk::assemble(synergy::IStream* stream, String& dataReceived, size_t& expectedSize) +FileChunk::assemble(barrier::IStream* stream, String& dataReceived, size_t& expectedSize) { // parse UInt8 mark = 0; @@ -84,7 +84,7 @@ FileChunk::assemble(synergy::IStream* stream, String& dataReceived, size_t& expe switch (mark) { case kDataStart: dataReceived.clear(); - expectedSize = synergy::string::stringToSizeType(content); + expectedSize = barrier::string::stringToSizeType(content); receivedDataSize = 0; elapsedTime = 0; stopwatch.reset(); @@ -134,7 +134,7 @@ FileChunk::assemble(synergy::IStream* stream, String& dataReceived, size_t& expe } void -FileChunk::send(synergy::IStream* stream, UInt8 mark, char* data, size_t dataSize) +FileChunk::send(barrier::IStream* stream, UInt8 mark, char* data, size_t dataSize) { String chunk(data, dataSize); diff --git a/src/lib/synergy/FileChunk.h b/src/lib/barrier/FileChunk.h similarity index 86% rename from src/lib/synergy/FileChunk.h rename to src/lib/barrier/FileChunk.h index 12d02f9c..bdc2f648 100644 --- a/src/lib/synergy/FileChunk.h +++ b/src/lib/barrier/FileChunk.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,13 +17,13 @@ #pragma once -#include "synergy/Chunk.h" +#include "barrier/Chunk.h" #include "base/String.h" #include "common/basic_types.h" #define FILE_CHUNK_META_SIZE 2 -namespace synergy { +namespace barrier { class IStream; }; @@ -35,11 +35,11 @@ public: static FileChunk* data(UInt8* data, size_t dataSize); static FileChunk* end(); static int assemble( - synergy::IStream* stream, + barrier::IStream* stream, String& dataCached, size_t& expectedSize); static void send( - synergy::IStream* stream, + barrier::IStream* stream, UInt8 mark, char* data, size_t dataSize); diff --git a/src/lib/synergy/IApp.h b/src/lib/barrier/IApp.h similarity index 92% rename from src/lib/synergy/IApp.h rename to src/lib/barrier/IApp.h index 6dc6f844..3a8cd568 100644 --- a/src/lib/synergy/IApp.h +++ b/src/lib/barrier/IApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -25,7 +25,7 @@ typedef int (*StartupFunc)(int, char**); class ILogOutputter; class ArgsBase; class IArchTaskBarReceiver; -namespace synergy { class Screen; } +namespace barrier { class Screen; } class IEventQueue; class IApp : public IInterface @@ -42,6 +42,6 @@ public: virtual void initApp(int argc, const char** argv) = 0; virtual const char* daemonName() const = 0; virtual int foregroundStartup(int argc, char** argv) = 0; - virtual synergy::Screen* createScreen() = 0; + virtual barrier::Screen* createScreen() = 0; virtual IEventQueue* getEvents() const = 0; }; diff --git a/src/lib/synergy/IAppUtil.h b/src/lib/barrier/IAppUtil.h similarity index 92% rename from src/lib/synergy/IAppUtil.h rename to src/lib/barrier/IAppUtil.h index 5f94e82d..39df65d9 100644 --- a/src/lib/synergy/IAppUtil.h +++ b/src/lib/barrier/IAppUtil.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,7 +19,7 @@ #pragma once #include "common/IInterface.h" -#include "synergy/IApp.h" +#include "barrier/IApp.h" class IAppUtil : public IInterface { public: diff --git a/src/lib/synergy/IClient.h b/src/lib/barrier/IClient.h similarity index 96% rename from src/lib/synergy/IClient.h rename to src/lib/barrier/IClient.h index 0a296bf3..d9b2194e 100644 --- a/src/lib/synergy/IClient.h +++ b/src/lib/barrier/IClient.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,11 +18,11 @@ #pragma once -#include "synergy/clipboard_types.h" -#include "synergy/IScreen.h" -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" -#include "synergy/option_types.h" +#include "barrier/clipboard_types.h" +#include "barrier/IScreen.h" +#include "barrier/key_types.h" +#include "barrier/mouse_types.h" +#include "barrier/option_types.h" #include "base/String.h" //! Client interface diff --git a/src/lib/synergy/IClipboard.cpp b/src/lib/barrier/IClipboard.cpp similarity index 98% rename from src/lib/synergy/IClipboard.cpp rename to src/lib/barrier/IClipboard.cpp index a554c9c1..19b4b56c 100644 --- a/src/lib/synergy/IClipboard.cpp +++ b/src/lib/barrier/IClipboard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/IClipboard.h" +#include "barrier/IClipboard.h" #include "common/stdvector.h" // diff --git a/src/lib/synergy/IClipboard.h b/src/lib/barrier/IClipboard.h similarity index 99% rename from src/lib/synergy/IClipboard.h rename to src/lib/barrier/IClipboard.h index 13522634..e11b264e 100644 --- a/src/lib/synergy/IClipboard.h +++ b/src/lib/barrier/IClipboard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/IKeyState.cpp b/src/lib/barrier/IKeyState.cpp similarity index 98% rename from src/lib/synergy/IKeyState.cpp rename to src/lib/barrier/IKeyState.cpp index a46fb64f..5d1114c1 100644 --- a/src/lib/synergy/IKeyState.cpp +++ b/src/lib/barrier/IKeyState.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/IKeyState.h" +#include "barrier/IKeyState.h" #include "base/EventQueue.h" #include diff --git a/src/lib/synergy/IKeyState.h b/src/lib/barrier/IKeyState.h similarity index 98% rename from src/lib/synergy/IKeyState.h rename to src/lib/barrier/IKeyState.h index 249f4e8f..b9d4706c 100644 --- a/src/lib/synergy/IKeyState.h +++ b/src/lib/barrier/IKeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/key_types.h" +#include "barrier/key_types.h" #include "base/Event.h" #include "base/String.h" #include "base/IEventQueue.h" diff --git a/src/lib/synergy/INode.h b/src/lib/barrier/INode.h similarity index 93% rename from src/lib/synergy/INode.h rename to src/lib/barrier/INode.h index 15951844..2e78f7c7 100644 --- a/src/lib/synergy/INode.h +++ b/src/lib/barrier/INode.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/IPlatformScreen.cpp b/src/lib/barrier/IPlatformScreen.cpp similarity index 89% rename from src/lib/synergy/IPlatformScreen.cpp rename to src/lib/barrier/IPlatformScreen.cpp index 844b34cc..d1d9f788 100644 --- a/src/lib/synergy/IPlatformScreen.cpp +++ b/src/lib/barrier/IPlatformScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/IPlatformScreen.h" +#include "barrier/IPlatformScreen.h" bool IPlatformScreen::fakeMediaKey(KeyID id) diff --git a/src/lib/synergy/IPlatformScreen.h b/src/lib/barrier/IPlatformScreen.h similarity index 96% rename from src/lib/synergy/IPlatformScreen.h rename to src/lib/barrier/IPlatformScreen.h index 71eed1d0..440e2181 100644 --- a/src/lib/synergy/IPlatformScreen.h +++ b/src/lib/barrier/IPlatformScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,13 +18,13 @@ #pragma once -#include "synergy/DragInformation.h" -#include "synergy/clipboard_types.h" -#include "synergy/IScreen.h" -#include "synergy/IPrimaryScreen.h" -#include "synergy/ISecondaryScreen.h" -#include "synergy/IKeyState.h" -#include "synergy/option_types.h" +#include "barrier/DragInformation.h" +#include "barrier/clipboard_types.h" +#include "barrier/IScreen.h" +#include "barrier/IPrimaryScreen.h" +#include "barrier/ISecondaryScreen.h" +#include "barrier/IKeyState.h" +#include "barrier/option_types.h" class IClipboard; diff --git a/src/lib/synergy/IPrimaryScreen.cpp b/src/lib/barrier/IPrimaryScreen.cpp similarity index 96% rename from src/lib/synergy/IPrimaryScreen.cpp rename to src/lib/barrier/IPrimaryScreen.cpp index 94c58b72..4954e4ff 100644 --- a/src/lib/synergy/IPrimaryScreen.cpp +++ b/src/lib/barrier/IPrimaryScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/IPrimaryScreen.h" +#include "barrier/IPrimaryScreen.h" #include "base/EventQueue.h" #include diff --git a/src/lib/synergy/IPrimaryScreen.h b/src/lib/barrier/IPrimaryScreen.h similarity index 97% rename from src/lib/synergy/IPrimaryScreen.h rename to src/lib/barrier/IPrimaryScreen.h index c4ec04d3..7f3fa9cf 100644 --- a/src/lib/synergy/IPrimaryScreen.h +++ b/src/lib/barrier/IPrimaryScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,8 +18,8 @@ #pragma once -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" +#include "barrier/key_types.h" +#include "barrier/mouse_types.h" #include "base/Event.h" #include "base/EventTypes.h" #include "common/IInterface.h" diff --git a/src/lib/synergy/IScreen.h b/src/lib/barrier/IScreen.h similarity index 95% rename from src/lib/synergy/IScreen.h rename to src/lib/barrier/IScreen.h index a55a238c..47d65784 100644 --- a/src/lib/synergy/IScreen.h +++ b/src/lib/barrier/IScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/clipboard_types.h" +#include "barrier/clipboard_types.h" #include "base/Event.h" #include "base/EventTypes.h" #include "common/IInterface.h" diff --git a/src/lib/synergy/IScreenSaver.h b/src/lib/barrier/IScreenSaver.h similarity index 97% rename from src/lib/synergy/IScreenSaver.h rename to src/lib/barrier/IScreenSaver.h index 1908c23d..fc21ac59 100644 --- a/src/lib/synergy/IScreenSaver.h +++ b/src/lib/barrier/IScreenSaver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/ISecondaryScreen.h b/src/lib/barrier/ISecondaryScreen.h similarity index 95% rename from src/lib/synergy/ISecondaryScreen.h rename to src/lib/barrier/ISecondaryScreen.h index 1f4e25d5..527ca2e0 100644 --- a/src/lib/synergy/ISecondaryScreen.h +++ b/src/lib/barrier/ISecondaryScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/mouse_types.h" +#include "barrier/mouse_types.h" #include "base/Event.h" #include "base/EventTypes.h" #include "common/IInterface.h" diff --git a/src/lib/synergy/KeyMap.cpp b/src/lib/barrier/KeyMap.cpp similarity index 99% rename from src/lib/synergy/KeyMap.cpp rename to src/lib/barrier/KeyMap.cpp index e2d3edb2..fd68204d 100644 --- a/src/lib/synergy/KeyMap.cpp +++ b/src/lib/barrier/KeyMap.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2005 Chris Schoeneman * @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -#include "synergy/KeyMap.h" -#include "synergy/key_types.h" +#include "barrier/KeyMap.h" +#include "barrier/key_types.h" #include "base/Log.h" #include #include #include -namespace synergy { +namespace barrier { KeyMap::NameToKeyMap* KeyMap::s_nameToKeyMap = NULL; KeyMap::NameToModifierMap* KeyMap::s_nameToModifierMap = NULL; @@ -1173,7 +1173,7 @@ KeyMap::formatKey(KeyID key, KeyModifierMask mask) x += (char)key; } else { - x += synergy::string::sprintf("\\u%04x", key); + x += barrier::string::sprintf("\\u%04x", key); } } else if (!x.empty()) { diff --git a/src/lib/synergy/KeyMap.h b/src/lib/barrier/KeyMap.h similarity index 98% rename from src/lib/synergy/KeyMap.h rename to src/lib/barrier/KeyMap.h index 8ed82ebc..b6eb8658 100644 --- a/src/lib/synergy/KeyMap.h +++ b/src/lib/barrier/KeyMap.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2005 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/key_types.h" +#include "barrier/key_types.h" #include "base/String.h" #include "common/stdmap.h" #include "common/stdset.h" @@ -26,7 +26,7 @@ #include -namespace synergy { +namespace barrier { //! Key map /*! @@ -481,9 +481,9 @@ private: // Key maps for parsing/formatting typedef std::map NameToKeyMap; + barrier::string::CaselessCmp> NameToKeyMap; typedef std::map NameToModifierMap; + barrier::string::CaselessCmp> NameToModifierMap; typedef std::map KeyToNameMap; typedef std::map ModifierToNameMap; @@ -496,7 +496,7 @@ private: bool m_composeAcrossGroups; // half-duplex info - KeyButtonSet m_halfDuplex; // half-duplex set by synergy + KeyButtonSet m_halfDuplex; // half-duplex set by barrier KeySet m_halfDuplexMods; // half-duplex set by user // dummy KeyItem for changing modifiers diff --git a/src/lib/synergy/KeyState.cpp b/src/lib/barrier/KeyState.cpp similarity index 98% rename from src/lib/synergy/KeyState.cpp rename to src/lib/barrier/KeyState.cpp index 73ffe727..fc5579d4 100644 --- a/src/lib/synergy/KeyState.cpp +++ b/src/lib/barrier/KeyState.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/KeyState.h" +#include "barrier/KeyState.h" #include "base/Log.h" #include @@ -385,7 +385,7 @@ static const KeyID s_numpadTable[] = { KeyState::KeyState(IEventQueue* events) : IKeyState(events), - m_keyMapPtr(new synergy::KeyMap()), + m_keyMapPtr(new barrier::KeyMap()), m_keyMap(*m_keyMapPtr), m_mask(0), m_events(events) @@ -393,7 +393,7 @@ KeyState::KeyState(IEventQueue* events) : init(); } -KeyState::KeyState(IEventQueue* events, synergy::KeyMap& keyMap) : +KeyState::KeyState(IEventQueue* events, barrier::KeyMap& keyMap) : IKeyState(events), m_keyMapPtr(0), m_keyMap(keyMap), @@ -479,7 +479,7 @@ void KeyState::updateKeyMap() { // get the current keyboard map - synergy::KeyMap keyMap; + barrier::KeyMap keyMap; getKeyMap(keyMap); m_keyMap.swap(keyMap); m_keyMap.finish(); @@ -521,7 +521,7 @@ KeyState::updateKeyState() void KeyState::addActiveModifierCB(KeyID, SInt32 group, - synergy::KeyMap::KeyItem& keyItem, void* vcontext) + barrier::KeyMap::KeyItem& keyItem, void* vcontext) { AddActiveModifierContext* context = static_cast(vcontext); @@ -567,7 +567,7 @@ KeyState::fakeKeyDown(KeyID id, KeyModifierMask mask, KeyButton serverID) // get keys for key press Keystrokes keys; ModifierToKeys oldActiveModifiers = m_activeModifiers; - const synergy::KeyMap::KeyItem* keyItem = + const barrier::KeyMap::KeyItem* keyItem = m_keyMap.mapKey(keys, id, pollActiveGroup(), m_activeModifiers, getActiveModifiersRValue(), mask, false); if (keyItem == NULL) { @@ -615,7 +615,7 @@ KeyState::fakeKeyRepeat( // get keys for key repeat Keystrokes keys; ModifierToKeys oldActiveModifiers = m_activeModifiers; - const synergy::KeyMap::KeyItem* keyItem = + const barrier::KeyMap::KeyItem* keyItem = m_keyMap.mapKey(keys, id, pollActiveGroup(), m_activeModifiers, getActiveModifiersRValue(), mask, true); if (keyItem == NULL) { @@ -770,7 +770,7 @@ KeyState::isIgnoredKey(KeyID key, KeyModifierMask) const KeyButton KeyState::getButton(KeyID id, SInt32 group) const { - const synergy::KeyMap::KeyItemList* items = + const barrier::KeyMap::KeyItemList* items = m_keyMap.findCompatibleKey(id, group, 0, 0); if (items == NULL) { return 0; @@ -882,7 +882,7 @@ KeyState::updateModifierKeyState(KeyButton button, const ModifierToKeys& newModifiers) { // get the pressed modifier buttons before and after - synergy::KeyMap::ButtonToKeyMap oldKeys, newKeys; + barrier::KeyMap::ButtonToKeyMap oldKeys, newKeys; for (ModifierToKeys::const_iterator i = oldModifiers.begin(); i != oldModifiers.end(); ++i) { oldKeys.insert(std::make_pair(i->second.m_button, &i->second)); @@ -893,7 +893,7 @@ KeyState::updateModifierKeyState(KeyButton button, } // get the modifier buttons that were pressed or released - synergy::KeyMap::ButtonToKeyMap pressed, released; + barrier::KeyMap::ButtonToKeyMap pressed, released; std::set_difference(oldKeys.begin(), oldKeys.end(), newKeys.begin(), newKeys.end(), std::inserter(released, released.end()), @@ -904,14 +904,14 @@ KeyState::updateModifierKeyState(KeyButton button, ButtonToKeyLess()); // update state - for (synergy::KeyMap::ButtonToKeyMap::const_iterator i = released.begin(); + for (barrier::KeyMap::ButtonToKeyMap::const_iterator i = released.begin(); i != released.end(); ++i) { if (i->first != button) { m_keys[i->first] = 0; m_syntheticKeys[i->first] = 0; } } - for (synergy::KeyMap::ButtonToKeyMap::const_iterator i = pressed.begin(); + for (barrier::KeyMap::ButtonToKeyMap::const_iterator i = pressed.begin(); i != pressed.end(); ++i) { if (i->first != button) { m_keys[i->first] = 1; diff --git a/src/lib/synergy/KeyState.h b/src/lib/barrier/KeyState.h similarity index 91% rename from src/lib/synergy/KeyState.h rename to src/lib/barrier/KeyState.h index 45282ee5..737d5156 100644 --- a/src/lib/synergy/KeyState.h +++ b/src/lib/barrier/KeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -18,8 +18,8 @@ #pragma once -#include "synergy/IKeyState.h" -#include "synergy/KeyMap.h" +#include "barrier/IKeyState.h" +#include "barrier/KeyMap.h" //! Core key state /*! @@ -29,7 +29,7 @@ platform specific methods. class KeyState : public IKeyState { public: KeyState(IEventQueue* events); - KeyState(IEventQueue* events, synergy::KeyMap& keyMap); + KeyState(IEventQueue* events, barrier::KeyMap& keyMap); virtual ~KeyState(); //! @name manipulators @@ -86,7 +86,7 @@ public: SInt32 getKeyState(KeyButton keyButton) { return m_keys[keyButton]; } protected: - typedef synergy::KeyMap::Keystroke Keystroke; + typedef barrier::KeyMap::Keystroke Keystroke; //! @name protected manipulators //@{ @@ -95,7 +95,7 @@ protected: /*! Fills \p keyMap with the current keyboard map. */ - virtual void getKeyMap(synergy::KeyMap& keyMap) = 0; + virtual void getKeyMap(barrier::KeyMap& keyMap) = 0; //! Fake a key event /*! @@ -138,8 +138,8 @@ protected: //@} private: - typedef synergy::KeyMap::Keystrokes Keystrokes; - typedef synergy::KeyMap::ModifierToKeys ModifierToKeys; + typedef barrier::KeyMap::Keystrokes Keystrokes; + typedef barrier::KeyMap::ModifierToKeys ModifierToKeys; public: struct AddActiveModifierContext { public: @@ -160,8 +160,8 @@ private: class ButtonToKeyLess { public: - bool operator()(const synergy::KeyMap::ButtonToKeyMap::value_type& a, - const synergy::KeyMap::ButtonToKeyMap::value_type b) const + bool operator()(const barrier::KeyMap::ButtonToKeyMap::value_type& a, + const barrier::KeyMap::ButtonToKeyMap::value_type b) const { return (a.first < b.first); } @@ -195,14 +195,14 @@ private: // active modifiers collection callback static void addActiveModifierCB(KeyID id, SInt32 group, - synergy::KeyMap::KeyItem& keyItem, void* vcontext); + barrier::KeyMap::KeyItem& keyItem, void* vcontext); private: // must be declared before m_keyMap. used when this class owns the key map. - synergy::KeyMap* m_keyMapPtr; + barrier::KeyMap* m_keyMapPtr; // the keyboard map - synergy::KeyMap& m_keyMap; + barrier::KeyMap& m_keyMap; // current modifier state KeyModifierMask m_mask; diff --git a/src/lib/synergy/PacketStreamFilter.cpp b/src/lib/barrier/PacketStreamFilter.cpp similarity index 95% rename from src/lib/synergy/PacketStreamFilter.cpp rename to src/lib/barrier/PacketStreamFilter.cpp index ba109dbc..16f0fe76 100644 --- a/src/lib/synergy/PacketStreamFilter.cpp +++ b/src/lib/barrier/PacketStreamFilter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/PacketStreamFilter.h" +#include "barrier/PacketStreamFilter.h" #include "base/IEventQueue.h" #include "mt/Lock.h" #include "base/TMethodEventJob.h" @@ -28,7 +28,7 @@ // PacketStreamFilter // -PacketStreamFilter::PacketStreamFilter(IEventQueue* events, synergy::IStream* stream, bool adoptStream) : +PacketStreamFilter::PacketStreamFilter(IEventQueue* events, barrier::IStream* stream, bool adoptStream) : StreamFilter(events, stream, adoptStream), m_size(0), m_inputShutdown(false), diff --git a/src/lib/synergy/PacketStreamFilter.h b/src/lib/barrier/PacketStreamFilter.h similarity index 93% rename from src/lib/synergy/PacketStreamFilter.h rename to src/lib/barrier/PacketStreamFilter.h index e196235f..bcbd604b 100644 --- a/src/lib/synergy/PacketStreamFilter.h +++ b/src/lib/barrier/PacketStreamFilter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -30,7 +30,7 @@ Filters a stream to read and write packets. */ class PacketStreamFilter : public StreamFilter { public: - PacketStreamFilter(IEventQueue* events, synergy::IStream* stream, bool adoptStream = true); + PacketStreamFilter(IEventQueue* events, barrier::IStream* stream, bool adoptStream = true); ~PacketStreamFilter(); // IStream overrides diff --git a/src/lib/synergy/PlatformScreen.cpp b/src/lib/barrier/PlatformScreen.cpp similarity index 94% rename from src/lib/synergy/PlatformScreen.cpp rename to src/lib/barrier/PlatformScreen.cpp index e94b7755..b0fdc758 100644 --- a/src/lib/synergy/PlatformScreen.cpp +++ b/src/lib/barrier/PlatformScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -#include "synergy/PlatformScreen.h" -#include "synergy/App.h" -#include "synergy/ArgsBase.h" +#include "barrier/PlatformScreen.h" +#include "barrier/App.h" +#include "barrier/ArgsBase.h" PlatformScreen::PlatformScreen(IEventQueue* events) : IPlatformScreen(events), diff --git a/src/lib/synergy/PlatformScreen.h b/src/lib/barrier/PlatformScreen.h similarity index 95% rename from src/lib/synergy/PlatformScreen.h rename to src/lib/barrier/PlatformScreen.h index 16dc904a..82cbfaa6 100644 --- a/src/lib/synergy/PlatformScreen.h +++ b/src/lib/barrier/PlatformScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -18,8 +18,8 @@ #pragma once -#include "synergy/IPlatformScreen.h" -#include "synergy/DragInformation.h" +#include "barrier/IPlatformScreen.h" +#include "barrier/DragInformation.h" #include "common/stdexcept.h" //! Base screen implementation diff --git a/src/lib/synergy/PortableTaskBarReceiver.cpp b/src/lib/barrier/PortableTaskBarReceiver.cpp similarity index 89% rename from src/lib/synergy/PortableTaskBarReceiver.cpp rename to src/lib/barrier/PortableTaskBarReceiver.cpp index d103960a..384cacd2 100644 --- a/src/lib/synergy/PortableTaskBarReceiver.cpp +++ b/src/lib/barrier/PortableTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/PortableTaskBarReceiver.h" +#include "barrier/PortableTaskBarReceiver.h" #include "mt/Lock.h" #include "base/String.h" #include "base/IEventQueue.h" @@ -106,14 +106,14 @@ PortableTaskBarReceiver::getToolTip() const { switch (m_state) { case kNotRunning: - return synergy::string::sprintf("%s: Not running", kAppVersion); + return barrier::string::sprintf("%s: Not running", kAppVersion); case kNotWorking: - return synergy::string::sprintf("%s: %s", + return barrier::string::sprintf("%s: %s", kAppVersion, m_errorMessage.c_str()); case kNotConnected: - return synergy::string::sprintf("%s: Unknown", kAppVersion); + return barrier::string::sprintf("%s: Unknown", kAppVersion); default: return ""; diff --git a/src/lib/synergy/PortableTaskBarReceiver.h b/src/lib/barrier/PortableTaskBarReceiver.h similarity index 94% rename from src/lib/synergy/PortableTaskBarReceiver.h rename to src/lib/barrier/PortableTaskBarReceiver.h index ab8e6c0c..d335e449 100644 --- a/src/lib/synergy/PortableTaskBarReceiver.h +++ b/src/lib/barrier/PortableTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/INode.h" +#include "barrier/INode.h" #include "arch/IArchTaskBarReceiver.h" #include "base/log_outputters.h" #include "base/EventTypes.h" @@ -28,7 +28,7 @@ class IEventQueue; -//! Implementation of IArchTaskBarReceiver for the synergy server +//! Implementation of IArchTaskBarReceiver for the barrier server class PortableTaskBarReceiver : public IArchTaskBarReceiver { public: PortableTaskBarReceiver(IEventQueue* events); diff --git a/src/lib/synergy/ProtocolUtil.cpp b/src/lib/barrier/ProtocolUtil.cpp similarity index 97% rename from src/lib/synergy/ProtocolUtil.cpp rename to src/lib/barrier/ProtocolUtil.cpp index d9f5dc32..42fe69c8 100644 --- a/src/lib/synergy/ProtocolUtil.cpp +++ b/src/lib/barrier/ProtocolUtil.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/ProtocolUtil.h" +#include "barrier/ProtocolUtil.h" #include "io/IStream.h" #include "base/Log.h" #include "common/stdvector.h" @@ -29,7 +29,7 @@ // void -ProtocolUtil::writef(synergy::IStream* stream, const char* fmt, ...) +ProtocolUtil::writef(barrier::IStream* stream, const char* fmt, ...) { assert(stream != NULL); assert(fmt != NULL); @@ -45,7 +45,7 @@ ProtocolUtil::writef(synergy::IStream* stream, const char* fmt, ...) } bool -ProtocolUtil::readf(synergy::IStream* stream, const char* fmt, ...) +ProtocolUtil::readf(barrier::IStream* stream, const char* fmt, ...) { assert(stream != NULL); assert(fmt != NULL); @@ -66,7 +66,7 @@ ProtocolUtil::readf(synergy::IStream* stream, const char* fmt, ...) } void -ProtocolUtil::vwritef(synergy::IStream* stream, +ProtocolUtil::vwritef(barrier::IStream* stream, const char* fmt, UInt32 size, va_list args) { assert(stream != NULL); @@ -95,7 +95,7 @@ ProtocolUtil::vwritef(synergy::IStream* stream, } void -ProtocolUtil::vreadf(synergy::IStream* stream, const char* fmt, va_list args) +ProtocolUtil::vreadf(barrier::IStream* stream, const char* fmt, va_list args) { assert(stream != NULL); assert(fmt != NULL); @@ -510,7 +510,7 @@ ProtocolUtil::eatLength(const char** pfmt) } void -ProtocolUtil::read(synergy::IStream* stream, void* vbuffer, UInt32 count) +ProtocolUtil::read(barrier::IStream* stream, void* vbuffer, UInt32 count) { assert(stream != NULL); assert(vbuffer != NULL); diff --git a/src/lib/synergy/ProtocolUtil.h b/src/lib/barrier/ProtocolUtil.h similarity index 87% rename from src/lib/synergy/ProtocolUtil.h rename to src/lib/barrier/ProtocolUtil.h index b7e43836..78bb5ca5 100644 --- a/src/lib/synergy/ProtocolUtil.h +++ b/src/lib/barrier/ProtocolUtil.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,11 +23,11 @@ #include -namespace synergy { class IStream; } +namespace barrier { class IStream; } -//! Synergy protocol utilities +//! Barrier protocol utilities /*! -This class provides various functions for implementing the synergy +This class provides various functions for implementing the barrier protocol. */ class ProtocolUtil { @@ -50,7 +50,7 @@ public: - \%s -- converts String* to stream of bytes - \%S -- converts integer N and const UInt8* to stream of N bytes */ - static void writef(synergy::IStream*, + static void writef(barrier::IStream*, const char* fmt, ...); //! Read formatted data @@ -69,19 +69,19 @@ public: - \%4I -- reads NBO 4 byte integers; arg is std::vector* - \%s -- reads bytes; argument must be a String*, \b not a char* */ - static bool readf(synergy::IStream*, + static bool readf(barrier::IStream*, const char* fmt, ...); private: - static void vwritef(synergy::IStream*, + static void vwritef(barrier::IStream*, const char* fmt, UInt32 size, va_list); - static void vreadf(synergy::IStream*, + static void vreadf(barrier::IStream*, const char* fmt, va_list); static UInt32 getLength(const char* fmt, va_list); static void writef(void*, const char* fmt, va_list); static UInt32 eatLength(const char** fmt); - static void read(synergy::IStream*, void*, UInt32); + static void read(barrier::IStream*, void*, UInt32); }; //! Mismatched read exception diff --git a/src/lib/synergy/Screen.cpp b/src/lib/barrier/Screen.cpp similarity index 98% rename from src/lib/synergy/Screen.cpp rename to src/lib/barrier/Screen.cpp index 57cb865b..32442f6a 100644 --- a/src/lib/synergy/Screen.cpp +++ b/src/lib/barrier/Screen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -#include "synergy/Screen.h" -#include "synergy/IPlatformScreen.h" -#include "synergy/protocol_types.h" +#include "barrier/Screen.h" +#include "barrier/IPlatformScreen.h" +#include "barrier/protocol_types.h" #include "base/Log.h" #include "base/IEventQueue.h" #include "server/ClientProxy.h" #include "base/TMethodEventJob.h" -namespace synergy { +namespace barrier { // // Screen diff --git a/src/lib/synergy/Screen.h b/src/lib/barrier/Screen.h similarity index 97% rename from src/lib/synergy/Screen.h rename to src/lib/barrier/Screen.h index 9c45a482..b16feff4 100644 --- a/src/lib/synergy/Screen.h +++ b/src/lib/barrier/Screen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,19 +18,19 @@ #pragma once -#include "synergy/DragInformation.h" -#include "synergy/clipboard_types.h" -#include "synergy/IScreen.h" -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" -#include "synergy/option_types.h" +#include "barrier/DragInformation.h" +#include "barrier/clipboard_types.h" +#include "barrier/IScreen.h" +#include "barrier/key_types.h" +#include "barrier/mouse_types.h" +#include "barrier/option_types.h" #include "base/String.h" class IClipboard; class IPlatformScreen; class IEventQueue; -namespace synergy { +namespace barrier { //! Platform independent screen /*! diff --git a/src/lib/synergy/ServerApp.cpp b/src/lib/barrier/ServerApp.cpp similarity index 94% rename from src/lib/synergy/ServerApp.cpp rename to src/lib/barrier/ServerApp.cpp index 5d49239a..78292590 100644 --- a/src/lib/synergy/ServerApp.cpp +++ b/src/lib/barrier/ServerApp.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,17 +16,17 @@ * along with this program. If not, see . */ -#include "synergy/ServerApp.h" +#include "barrier/ServerApp.h" #include "server/Server.h" #include "server/ClientListener.h" #include "server/ClientProxy.h" #include "server/PrimaryClient.h" -#include "synergy/ArgParser.h" -#include "synergy/Screen.h" -#include "synergy/XScreen.h" -#include "synergy/ServerTaskBarReceiver.h" -#include "synergy/ServerArgs.h" +#include "barrier/ArgParser.h" +#include "barrier/Screen.h" +#include "barrier/XScreen.h" +#include "barrier/ServerTaskBarReceiver.h" +#include "barrier/ServerArgs.h" #include "net/SocketMultiplexer.h" #include "net/TCPSocketFactory.h" #include "net/XSocket.h" @@ -72,7 +72,7 @@ ServerApp::ServerApp(IEventQueue* events, CreateTaskBarReceiverFunc createTaskBa m_primaryClient(NULL), m_listener(NULL), m_timer(NULL), - m_synergyAddress(NULL) + m_barrierAddress(NULL) { } @@ -90,11 +90,11 @@ ServerApp::parseArgs(int argc, const char* const* argv) m_bye(kExitArgs); } else { - if (!args().m_synergyAddress.empty()) { + if (!args().m_barrierAddress.empty()) { try { - *m_synergyAddress = NetworkAddress(args().m_synergyAddress, + *m_barrierAddress = NetworkAddress(args().m_barrierAddress, kDefaultPort); - m_synergyAddress->resolve(); + m_barrierAddress->resolve(); } catch (XSocketAddress& e) { LOG((CLOG_PRINT "%s: %s" BYE, @@ -130,7 +130,7 @@ ServerApp::help() HELP_SYS_ARGS HELP_COMMON_ARGS "\n\n" - "Start the synergy mouse/keyboard sharing server.\n" + "Start the barrier mouse/keyboard sharing server.\n" "\n" " -a, --address
listen for clients on the given address.\n" " -c, --config use the named configuration file instead.\n" @@ -359,7 +359,7 @@ ServerApp::closePrimaryClient(PrimaryClient* primaryClient) } void -ServerApp::closeServerScreen(synergy::Screen* screen) +ServerApp::closeServerScreen(barrier::Screen* screen) { if (screen != NULL) { m_events->removeHandler(m_events->forIScreen().error(), @@ -447,7 +447,7 @@ bool ServerApp::initServer() } double retryTime; - synergy::Screen* serverScreen = NULL; + barrier::Screen* serverScreen = NULL; PrimaryClient* primaryClient = NULL; try { String name = args().m_config->getCanonicalName(args().m_name); @@ -495,10 +495,10 @@ bool ServerApp::initServer() } } -synergy::Screen* +barrier::Screen* ServerApp::openServerScreen() { - synergy::Screen* screen = createScreen(); + barrier::Screen* screen = createScreen(); screen->setEnableDragDrop(argsBase().m_enableDragDrop); m_events->adoptHandler(m_events->forIScreen().error(), screen->getEventTarget(), @@ -540,7 +540,7 @@ ServerApp::startServer() double retryTime; ClientListener* listener = NULL; try { - listener = openClientListener(args().m_config->getSynergyAddress()); + listener = openClientListener(args().m_config->getBarrierAddress()); m_server = openServer(*args().m_config, m_primaryClient); listener->setServer(m_server); m_server->setListener(listener); @@ -578,22 +578,22 @@ ServerApp::startServer() } } -synergy::Screen* +barrier::Screen* ServerApp::createScreen() { #if WINAPI_MSWINDOWS - return new synergy::Screen(new MSWindowsScreen( + return new barrier::Screen(new MSWindowsScreen( true, args().m_noHooks, args().m_stopOnDeskSwitch, m_events), m_events); #elif WINAPI_XWINDOWS - return new synergy::Screen(new XWindowsScreen( + return new barrier::Screen(new XWindowsScreen( args().m_display, true, args().m_disableXInitThreads, 0, m_events), m_events); #elif WINAPI_CARBON - return new synergy::Screen(new OSXScreen(m_events, true), m_events); + return new barrier::Screen(new OSXScreen(m_events, true), m_events); #endif } PrimaryClient* -ServerApp::openPrimaryClient(const String& name, synergy::Screen* screen) +ServerApp::openPrimaryClient(const String& name, barrier::Screen* screen) { LOG((CLOG_DEBUG1 "creating primary screen")); return new PrimaryClient(name, screen); @@ -693,11 +693,11 @@ ServerApp::mainLoop() // set the contact address, if provided, in the config. // otherwise, if the config doesn't have an address, use // the default. - if (m_synergyAddress->isValid()) { - args().m_config->setSynergyAddress(*m_synergyAddress); + if (m_barrierAddress->isValid()) { + args().m_config->setBarrierAddress(*m_barrierAddress); } - else if (!args().m_config->getSynergyAddress().isValid()) { - args().m_config->setSynergyAddress(NetworkAddress(kDefaultPort)); + else if (!args().m_config->getBarrierAddress().isValid()) { + args().m_config->setBarrierAddress(NetworkAddress(kDefaultPort)); } // canonicalize the primary screen name @@ -729,7 +729,7 @@ ServerApp::mainLoop() new TMethodEventJob(this, &ServerApp::forceReconnect)); // to work around the sticky meta keys problem, we'll give users - // the option to reset the state of synergys + // the option to reset the state of barriers m_events->adoptHandler(m_events->forServerApp().resetServer(), m_events->getSystemTarget(), new TMethodEventJob(this, &ServerApp::resetServer)); @@ -787,7 +787,7 @@ int ServerApp::runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc startup) { // general initialization - m_synergyAddress = new NetworkAddress; + m_barrierAddress = new NetworkAddress; args().m_config = new Config(m_events); args().m_pname = ARCH->getBasename(argv[0]); @@ -806,7 +806,7 @@ ServerApp::runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc } delete args().m_config; - delete m_synergyAddress; + delete m_barrierAddress; return result; } @@ -841,9 +841,9 @@ const char* ServerApp::daemonName() const { #if SYSAPI_WIN32 - return "Synergy Server"; + return "Barrier Server"; #elif SYSAPI_UNIX - return "synergys"; + return "barriers"; #endif } diff --git a/src/lib/synergy/ServerApp.h b/src/lib/barrier/ServerApp.h similarity index 85% rename from src/lib/synergy/ServerApp.h rename to src/lib/barrier/ServerApp.h index 59f9f65a..528aa24c 100644 --- a/src/lib/synergy/ServerApp.h +++ b/src/lib/barrier/ServerApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,14 +18,14 @@ #pragma once -#include "synergy/ArgsBase.h" -#include "synergy/App.h" +#include "barrier/ArgsBase.h" +#include "barrier/App.h" #include "base/String.h" #include "server/Config.h" #include "net/NetworkAddress.h" #include "arch/Arch.h" #include "arch/IArchMultithread.h" -#include "synergy/ArgsBase.h" +#include "barrier/ArgsBase.h" #include "base/EventTypes.h" #include @@ -40,7 +40,7 @@ enum EServerState { }; class Server; -namespace synergy { class Screen; } +namespace barrier { class Screen; } class ClientListener; class EventQueueTimer; class ILogOutputter; @@ -81,13 +81,13 @@ public: void closeClientListener(ClientListener* listen); void stopServer(); void closePrimaryClient(PrimaryClient* primaryClient); - void closeServerScreen(synergy::Screen* screen); + void closeServerScreen(barrier::Screen* screen); void cleanupServer(); bool initServer(); void retryHandler(const Event&, void*); - synergy::Screen* openServerScreen(); - synergy::Screen* createScreen(); - PrimaryClient* openPrimaryClient(const String& name, synergy::Screen* screen); + barrier::Screen* openServerScreen(); + barrier::Screen* createScreen(); + PrimaryClient* openPrimaryClient(const String& name, barrier::Screen* screen); void handleScreenError(const Event&, void*); void handleSuspend(const Event&, void*); void handleResume(const Event&, void*); @@ -107,11 +107,11 @@ public: Server* m_server; EServerState m_serverState; - synergy::Screen* m_serverScreen; + barrier::Screen* m_serverScreen; PrimaryClient* m_primaryClient; ClientListener* m_listener; EventQueueTimer* m_timer; - NetworkAddress* m_synergyAddress; + NetworkAddress* m_barrierAddress; private: void handleScreenSwitched(const Event&, void* data); @@ -119,9 +119,9 @@ private: // configuration file name #if SYSAPI_WIN32 -#define USR_CONFIG_NAME "synergy.sgc" -#define SYS_CONFIG_NAME "synergy.sgc" +#define USR_CONFIG_NAME "barrier.sgc" +#define SYS_CONFIG_NAME "barrier.sgc" #elif SYSAPI_UNIX -#define USR_CONFIG_NAME ".synergy.conf" -#define SYS_CONFIG_NAME "synergy.conf" +#define USR_CONFIG_NAME ".barrier.conf" +#define SYS_CONFIG_NAME "barrier.conf" #endif diff --git a/src/lib/synergy/ServerArgs.cpp b/src/lib/barrier/ServerArgs.cpp similarity index 90% rename from src/lib/synergy/ServerArgs.cpp rename to src/lib/barrier/ServerArgs.cpp index 9d8052c6..91e50916 100644 --- a/src/lib/synergy/ServerArgs.cpp +++ b/src/lib/barrier/ServerArgs.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/ServerArgs.h" +#include "barrier/ServerArgs.h" ServerArgs::ServerArgs() : m_configFile(), diff --git a/src/lib/synergy/ServerArgs.h b/src/lib/barrier/ServerArgs.h similarity index 92% rename from src/lib/synergy/ServerArgs.h rename to src/lib/barrier/ServerArgs.h index 4c91e568..b0146468 100644 --- a/src/lib/synergy/ServerArgs.h +++ b/src/lib/barrier/ServerArgs.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ #pragma once -#include "synergy/ArgsBase.h" +#include "barrier/ArgsBase.h" #include "shared/SerialKey.h" class NetworkAddress; diff --git a/src/lib/synergy/ServerTaskBarReceiver.cpp b/src/lib/barrier/ServerTaskBarReceiver.cpp similarity index 89% rename from src/lib/synergy/ServerTaskBarReceiver.cpp rename to src/lib/barrier/ServerTaskBarReceiver.cpp index 8a53dc2a..b427cd19 100644 --- a/src/lib/synergy/ServerTaskBarReceiver.cpp +++ b/src/lib/barrier/ServerTaskBarReceiver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/ServerTaskBarReceiver.h" +#include "barrier/ServerTaskBarReceiver.h" #include "server/Server.h" #include "mt/Lock.h" #include "base/String.h" @@ -120,17 +120,17 @@ ServerTaskBarReceiver::getToolTip() const { switch (m_state) { case kNotRunning: - return synergy::string::sprintf("%s: Not running", kAppVersion); + return barrier::string::sprintf("%s: Not running", kAppVersion); case kNotWorking: - return synergy::string::sprintf("%s: %s", + return barrier::string::sprintf("%s: %s", kAppVersion, m_errorMessage.c_str()); case kNotConnected: - return synergy::string::sprintf("%s: Waiting for clients", kAppVersion); + return barrier::string::sprintf("%s: Waiting for clients", kAppVersion); case kConnected: - return synergy::string::sprintf("%s: Connected", kAppVersion); + return barrier::string::sprintf("%s: Connected", kAppVersion); default: return ""; diff --git a/src/lib/synergy/ServerTaskBarReceiver.h b/src/lib/barrier/ServerTaskBarReceiver.h similarity index 94% rename from src/lib/synergy/ServerTaskBarReceiver.h rename to src/lib/barrier/ServerTaskBarReceiver.h index 274fd54e..3cef9c02 100644 --- a/src/lib/synergy/ServerTaskBarReceiver.h +++ b/src/lib/barrier/ServerTaskBarReceiver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -19,7 +19,7 @@ #pragma once #include "server/Server.h" -#include "synergy/ServerApp.h" +#include "barrier/ServerApp.h" #include "arch/IArchTaskBarReceiver.h" #include "base/EventTypes.h" #include "base/String.h" @@ -28,7 +28,7 @@ class IEventQueue; -//! Implementation of IArchTaskBarReceiver for the synergy server +//! Implementation of IArchTaskBarReceiver for the barrier server class ServerTaskBarReceiver : public IArchTaskBarReceiver { public: ServerTaskBarReceiver(IEventQueue* events); diff --git a/src/lib/synergy/StreamChunker.cpp b/src/lib/barrier/StreamChunker.cpp similarity index 93% rename from src/lib/synergy/StreamChunker.cpp rename to src/lib/barrier/StreamChunker.cpp index da5ba414..73689187 100644 --- a/src/lib/synergy/StreamChunker.cpp +++ b/src/lib/barrier/StreamChunker.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -#include "synergy/StreamChunker.h" +#include "barrier/StreamChunker.h" #include "mt/Lock.h" #include "mt/Mutex.h" -#include "synergy/FileChunk.h" -#include "synergy/ClipboardChunk.h" -#include "synergy/protocol_types.h" +#include "barrier/FileChunk.h" +#include "barrier/ClipboardChunk.h" +#include "barrier/protocol_types.h" #include "base/EventTypes.h" #include "base/Event.h" #include "base/IEventQueue.h" @@ -60,7 +60,7 @@ StreamChunker::sendFile( size_t size = (size_t)file.tellg(); // send first message (file size) - String fileSize = synergy::string::sizeTypeToString(size); + String fileSize = barrier::string::sizeTypeToString(size); FileChunk* sizeMessage = FileChunk::start(fileSize); events->addEvent(Event(events->forFile().fileChunkSending(), eventTarget, sizeMessage)); @@ -120,7 +120,7 @@ StreamChunker::sendClipboard( void* eventTarget) { // send first message (data size) - String dataSize = synergy::string::sizeTypeToString(size); + String dataSize = barrier::string::sizeTypeToString(size); ClipboardChunk* sizeMessage = ClipboardChunk::start(id, sequence, dataSize); events->addEvent(Event(events->forClipboard().clipboardSending(), eventTarget, sizeMessage)); diff --git a/src/lib/synergy/StreamChunker.h b/src/lib/barrier/StreamChunker.h similarity index 94% rename from src/lib/synergy/StreamChunker.h rename to src/lib/barrier/StreamChunker.h index a67d3777..ab57c7e1 100644 --- a/src/lib/synergy/StreamChunker.h +++ b/src/lib/barrier/StreamChunker.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ #pragma once -#include "synergy/clipboard_types.h" +#include "barrier/clipboard_types.h" #include "base/String.h" class IEventQueue; diff --git a/src/lib/synergy/ToolApp.cpp b/src/lib/barrier/ToolApp.cpp similarity index 90% rename from src/lib/synergy/ToolApp.cpp rename to src/lib/barrier/ToolApp.cpp index 8a9e1faf..f76786b7 100644 --- a/src/lib/synergy/ToolApp.cpp +++ b/src/lib/barrier/ToolApp.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -#include "synergy/ToolApp.h" +#include "barrier/ToolApp.h" -#include "synergy/ArgParser.h" +#include "barrier/ArgParser.h" #include "arch/Arch.h" #include "base/Log.h" #include "base/String.h" @@ -63,7 +63,7 @@ ToolApp::run(int argc, char** argv) return kExitFailed; } else { - String output = synergy::string::sprintf("activeDesktop:%s", name.c_str()); + String output = barrier::string::sprintf("activeDesktop:%s", name.c_str()); LOG((CLOG_INFO "%s", output.c_str())); } #endif @@ -87,7 +87,7 @@ ToolApp::run(int argc, char** argv) notifyActivation(); } else { - throw XSynergy("Nothing to do"); + throw XBarrier("Nothing to do"); } } catch (std::exception& e) { @@ -118,7 +118,7 @@ ToolApp::loginAuth() String credentials; std::cin >> credentials; - std::vector parts = synergy::string::splitString(credentials, ':'); + std::vector parts = barrier::string::splitString(credentials, ':'); size_t count = parts.size(); if (count == 2 ) { @@ -133,7 +133,7 @@ ToolApp::loginAuth() std::cout << ARCH->internet().get(ss.str()) << std::endl; } else { - throw XSynergy("Invalid credentials."); + throw XBarrier("Invalid credentials."); } } @@ -143,7 +143,7 @@ ToolApp::notifyUpdate() String data; std::cin >> data; - std::vector parts = synergy::string::splitString(data, ':'); + std::vector parts = barrier::string::splitString(data, ':'); size_t count = parts.size(); if (count == 3) { @@ -156,7 +156,7 @@ ToolApp::notifyUpdate() std::cout << ARCH->internet().get(ss.str()) << std::endl; } else { - throw XSynergy("Invalid update data."); + throw XBarrier("Invalid update data."); } } @@ -166,7 +166,7 @@ ToolApp::notifyActivation() String info; std::cin >> info; - std::vector parts = synergy::string::splitString(info, ':'); + std::vector parts = barrier::string::splitString(info, ':'); size_t count = parts.size(); if (count == 3 || count == 4) { diff --git a/src/lib/synergy/ToolApp.h b/src/lib/barrier/ToolApp.h similarity index 90% rename from src/lib/synergy/ToolApp.h rename to src/lib/barrier/ToolApp.h index d0eb6cb4..5cb9a7c4 100644 --- a/src/lib/synergy/ToolApp.h +++ b/src/lib/barrier/ToolApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,8 +17,8 @@ #pragma once -#include "synergy/App.h" -#include "synergy/ToolArgs.h" +#include "barrier/App.h" +#include "barrier/ToolArgs.h" #include "common/basic_types.h" class ToolApp : public MinimalApp diff --git a/src/lib/synergy/ToolArgs.cpp b/src/lib/barrier/ToolArgs.cpp similarity index 91% rename from src/lib/synergy/ToolArgs.cpp rename to src/lib/barrier/ToolArgs.cpp index 07c3aa22..634a7843 100644 --- a/src/lib/synergy/ToolArgs.cpp +++ b/src/lib/barrier/ToolArgs.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/ToolArgs.h" +#include "barrier/ToolArgs.h" ToolArgs::ToolArgs() : m_printActiveDesktopName(false), diff --git a/src/lib/synergy/ToolArgs.h b/src/lib/barrier/ToolArgs.h similarity index 95% rename from src/lib/synergy/ToolArgs.h rename to src/lib/barrier/ToolArgs.h index 43928dd4..36b4be3e 100644 --- a/src/lib/synergy/ToolArgs.h +++ b/src/lib/barrier/ToolArgs.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/synergy/XSynergy.cpp b/src/lib/barrier/XBarrier.cpp similarity index 89% rename from src/lib/synergy/XSynergy.cpp rename to src/lib/barrier/XBarrier.cpp index 77d04477..49a015ec 100644 --- a/src/lib/synergy/XSynergy.cpp +++ b/src/lib/barrier/XBarrier.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/XSynergy.h" +#include "barrier/XBarrier.h" #include "base/String.h" // @@ -57,8 +57,8 @@ String XIncompatibleClient::getWhat() const throw() { return format("XIncompatibleClient", "incompatible client %{1}.%{2}", - synergy::string::sprintf("%d", m_major).c_str(), - synergy::string::sprintf("%d", m_minor).c_str()); + barrier::string::sprintf("%d", m_major).c_str(), + barrier::string::sprintf("%d", m_minor).c_str()); } @@ -129,5 +129,5 @@ XExitApp::getWhat() const throw() { return format( "XExitApp", "exiting with code %{1}", - synergy::string::sprintf("%d", m_code).c_str()); + barrier::string::sprintf("%d", m_code).c_str()); } diff --git a/src/lib/synergy/XSynergy.h b/src/lib/barrier/XBarrier.h similarity index 88% rename from src/lib/synergy/XSynergy.h rename to src/lib/barrier/XBarrier.h index 20a97424..fdf52133 100644 --- a/src/lib/synergy/XSynergy.h +++ b/src/lib/barrier/XBarrier.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -20,26 +20,26 @@ #include "base/XBase.h" -//! Generic synergy exception -XBASE_SUBCLASS(XSynergy, XBase); +//! Generic barrier exception +XBASE_SUBCLASS(XBarrier, XBase); //! Subscription error /*! Thrown when there is a problem with the subscription. */ -XBASE_SUBCLASS(XSubscription, XSynergy); +XBASE_SUBCLASS(XSubscription, XBarrier); //! Client error exception /*! Thrown when the client fails to follow the protocol. */ -XBASE_SUBCLASS_WHAT(XBadClient, XSynergy); +XBASE_SUBCLASS_WHAT(XBadClient, XBarrier); //! Incompatible client exception /*! Thrown when a client attempting to connect has an incompatible version. */ -class XIncompatibleClient : public XSynergy { +class XIncompatibleClient : public XBarrier { public: XIncompatibleClient(int major, int minor); @@ -66,7 +66,7 @@ private: Thrown when a client attempting to connect is using the same name as a client that is already connected. */ -class XDuplicateClient : public XSynergy { +class XDuplicateClient : public XBarrier { public: XDuplicateClient(const String& name); virtual ~XDuplicateClient() _NOEXCEPT { } @@ -92,7 +92,7 @@ private: Thrown when a client attempting to connect is using a name that is unknown to the server. */ -class XUnknownClient : public XSynergy { +class XUnknownClient : public XBarrier { public: XUnknownClient(const String& name); virtual ~XUnknownClient() _NOEXCEPT { } @@ -119,7 +119,7 @@ Thrown when we want to abort, with the opportunity to clean up. This is a little bit of a hack, but it's a better way of exiting, than just calling exit(int). */ -class XExitApp : public XSynergy { +class XExitApp : public XBarrier { public: XExitApp(int code); virtual ~XExitApp() _NOEXCEPT { } diff --git a/src/lib/synergy/XScreen.cpp b/src/lib/barrier/XScreen.cpp similarity index 94% rename from src/lib/synergy/XScreen.cpp rename to src/lib/barrier/XScreen.cpp index 5e34ef63..a2022405 100644 --- a/src/lib/synergy/XScreen.cpp +++ b/src/lib/barrier/XScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/XScreen.h" +#include "barrier/XScreen.h" // // XScreenOpenFailure diff --git a/src/lib/synergy/XScreen.h b/src/lib/barrier/XScreen.h similarity index 97% rename from src/lib/synergy/XScreen.h rename to src/lib/barrier/XScreen.h index 6b508316..0cb511e9 100644 --- a/src/lib/synergy/XScreen.h +++ b/src/lib/barrier/XScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/clipboard_types.h b/src/lib/barrier/clipboard_types.h similarity index 96% rename from src/lib/synergy/clipboard_types.h rename to src/lib/barrier/clipboard_types.h index d8275d1b..54f2732b 100644 --- a/src/lib/synergy/clipboard_types.h +++ b/src/lib/barrier/clipboard_types.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/key_types.cpp b/src/lib/barrier/key_types.cpp similarity index 98% rename from src/lib/synergy/key_types.cpp rename to src/lib/barrier/key_types.cpp index e82feaae..902670d8 100644 --- a/src/lib/synergy/key_types.cpp +++ b/src/lib/barrier/key_types.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/key_types.h" +#include "barrier/key_types.h" const KeyNameMapEntry kKeyNameMap[] = { { "AltGr", kKeyAltGr }, diff --git a/src/lib/synergy/key_types.h b/src/lib/barrier/key_types.h similarity index 99% rename from src/lib/synergy/key_types.h rename to src/lib/barrier/key_types.h index f45cea24..7a8ea537 100644 --- a/src/lib/synergy/key_types.h +++ b/src/lib/barrier/key_types.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/mouse_types.h b/src/lib/barrier/mouse_types.h similarity index 96% rename from src/lib/synergy/mouse_types.h rename to src/lib/barrier/mouse_types.h index 61c2c5a2..cf860c00 100644 --- a/src/lib/synergy/mouse_types.h +++ b/src/lib/barrier/mouse_types.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/option_types.h b/src/lib/barrier/option_types.h similarity index 98% rename from src/lib/synergy/option_types.h rename to src/lib/barrier/option_types.h index 9c92dc7e..6323e379 100644 --- a/src/lib/synergy/option_types.h +++ b/src/lib/barrier/option_types.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/synergy/protocol_types.cpp b/src/lib/barrier/protocol_types.cpp similarity index 92% rename from src/lib/synergy/protocol_types.cpp rename to src/lib/barrier/protocol_types.cpp index e4834fce..07acf61e 100644 --- a/src/lib/synergy/protocol_types.cpp +++ b/src/lib/barrier/protocol_types.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -#include "synergy/protocol_types.h" +#include "barrier/protocol_types.h" -const char* kMsgHello = "Synergy%2i%2i"; -const char* kMsgHelloBack = "Synergy%2i%2i%s"; +const char* kMsgHello = "Barrier%2i%2i"; +const char* kMsgHelloBack = "Barrier%2i%2i%s"; const char* kMsgCNoop = "CNOP"; const char* kMsgCClose = "CBYE"; const char* kMsgCEnter = "CINN%2i%2i%4i%2i"; diff --git a/src/lib/synergy/protocol_types.h b/src/lib/barrier/protocol_types.h similarity index 98% rename from src/lib/synergy/protocol_types.h rename to src/lib/barrier/protocol_types.h index e3f7f42c..bc5e0377 100644 --- a/src/lib/synergy/protocol_types.h +++ b/src/lib/barrier/protocol_types.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -29,7 +29,7 @@ // 1.4: adds crypto support // 1.5: adds file transfer and removes home brew crypto // 1.6: adds clipboard streaming -// NOTE: with new version, synergy minor version should increment +// NOTE: with new version, barrier minor version should increment static const SInt16 kProtocolMajorVersion = 1; static const SInt16 kProtocolMinorVersion = 6; diff --git a/src/lib/synergy/unix/AppUtilUnix.cpp b/src/lib/barrier/unix/AppUtilUnix.cpp similarity index 90% rename from src/lib/synergy/unix/AppUtilUnix.cpp rename to src/lib/barrier/unix/AppUtilUnix.cpp index a052bfd9..a1548d88 100644 --- a/src/lib/synergy/unix/AppUtilUnix.cpp +++ b/src/lib/barrier/unix/AppUtilUnix.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#include "synergy/unix/AppUtilUnix.h" -#include "synergy/ArgsBase.h" +#include "barrier/unix/AppUtilUnix.h" +#include "barrier/ArgsBase.h" AppUtilUnix::AppUtilUnix(IEventQueue* events) { diff --git a/src/lib/synergy/unix/AppUtilUnix.h b/src/lib/barrier/unix/AppUtilUnix.h similarity index 92% rename from src/lib/synergy/unix/AppUtilUnix.h rename to src/lib/barrier/unix/AppUtilUnix.h index ba235dcc..fefcfea4 100644 --- a/src/lib/synergy/unix/AppUtilUnix.h +++ b/src/lib/barrier/unix/AppUtilUnix.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/AppUtil.h" +#include "barrier/AppUtil.h" #define ARCH_APP_UTIL AppUtilUnix diff --git a/src/lib/synergy/win32/AppUtilWindows.cpp b/src/lib/barrier/win32/AppUtilWindows.cpp similarity index 94% rename from src/lib/synergy/win32/AppUtilWindows.cpp rename to src/lib/barrier/win32/AppUtilWindows.cpp index bfe3740a..560b029c 100644 --- a/src/lib/synergy/win32/AppUtilWindows.cpp +++ b/src/lib/barrier/win32/AppUtilWindows.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -#include "synergy/win32/AppUtilWindows.h" -#include "synergy/Screen.h" -#include "synergy/ArgsBase.h" -#include "synergy/App.h" -#include "synergy/XSynergy.h" +#include "barrier/win32/AppUtilWindows.h" +#include "barrier/Screen.h" +#include "barrier/ArgsBase.h" +#include "barrier/App.h" +#include "barrier/XBarrier.h" #include "platform/MSWindowsScreen.h" #include "arch/win32/XArchWindows.h" #include "arch/win32/ArchMiscWindows.h" @@ -135,7 +135,7 @@ int AppUtilWindows::run(int argc, char** argv) { if (!IsWindowsXPSP3OrGreater()) { - throw std::runtime_error("Synergy only supports Windows XP SP3 and above."); + throw std::runtime_error("Barrier only supports Windows XP SP3 and above."); } // record window instance for tray icon, etc diff --git a/src/lib/synergy/win32/AppUtilWindows.h b/src/lib/barrier/win32/AppUtilWindows.h similarity index 94% rename from src/lib/synergy/win32/AppUtilWindows.h rename to src/lib/barrier/win32/AppUtilWindows.h index 04b6d424..c5da2289 100644 --- a/src/lib/synergy/win32/AppUtilWindows.h +++ b/src/lib/barrier/win32/AppUtilWindows.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/AppUtil.h" +#include "barrier/AppUtil.h" #include "base/String.h" #define WIN32_LEAN_AND_MEAN diff --git a/src/lib/base/CMakeLists.txt b/src/lib/base/CMakeLists.txt index 30d0e932..66ba5a6f 100644 --- a/src/lib/base/CMakeLists.txt +++ b/src/lib/base/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -17,7 +17,7 @@ file(GLOB headers "*.h") file(GLOB sources "*.cpp") -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/base/ELevel.h b/src/lib/base/ELevel.h index 89c1a223..ec0f94f3 100644 --- a/src/lib/base/ELevel.h +++ b/src/lib/base/ELevel.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Chris Schoeneman * diff --git a/src/lib/base/Event.cpp b/src/lib/base/Event.cpp index 9e12664c..f2c1a12d 100644 --- a/src/lib/base/Event.cpp +++ b/src/lib/base/Event.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/Event.h b/src/lib/base/Event.h index 7e6c292c..27418139 100644 --- a/src/lib/base/Event.h +++ b/src/lib/base/Event.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/EventQueue.cpp b/src/lib/base/EventQueue.cpp index dfdebe20..0a22c9dd 100644 --- a/src/lib/base/EventQueue.cpp +++ b/src/lib/base/EventQueue.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/EventQueue.h b/src/lib/base/EventQueue.h index 4a390b8d..d4fb6ffd 100644 --- a/src/lib/base/EventQueue.h +++ b/src/lib/base/EventQueue.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/EventTypes.cpp b/src/lib/base/EventTypes.cpp index 6f1370fe..9a3e46c6 100644 --- a/src/lib/base/EventTypes.cpp +++ b/src/lib/base/EventTypes.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/base/EventTypes.h b/src/lib/base/EventTypes.h index 1d0b61e8..d044c86f 100644 --- a/src/lib/base/EventTypes.h +++ b/src/lib/base/EventTypes.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/base/FunctionEventJob.cpp b/src/lib/base/FunctionEventJob.cpp index 88ea35c6..705e058e 100644 --- a/src/lib/base/FunctionEventJob.cpp +++ b/src/lib/base/FunctionEventJob.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/FunctionEventJob.h b/src/lib/base/FunctionEventJob.h index 05f30cab..4b2c2fc2 100644 --- a/src/lib/base/FunctionEventJob.h +++ b/src/lib/base/FunctionEventJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/FunctionJob.cpp b/src/lib/base/FunctionJob.cpp index 10b06c44..859010ea 100644 --- a/src/lib/base/FunctionJob.cpp +++ b/src/lib/base/FunctionJob.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/FunctionJob.h b/src/lib/base/FunctionJob.h index 1f8aea97..9cdfa9dd 100644 --- a/src/lib/base/FunctionJob.h +++ b/src/lib/base/FunctionJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/IEventJob.h b/src/lib/base/IEventJob.h index 8d3c5ed3..3e4a4202 100644 --- a/src/lib/base/IEventJob.h +++ b/src/lib/base/IEventJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/IEventQueue.h b/src/lib/base/IEventQueue.h index 82b27108..cd4f0b3c 100644 --- a/src/lib/base/IEventQueue.h +++ b/src/lib/base/IEventQueue.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/IEventQueueBuffer.h b/src/lib/base/IEventQueueBuffer.h index 67132e88..b5944367 100644 --- a/src/lib/base/IEventQueueBuffer.h +++ b/src/lib/base/IEventQueueBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/IJob.h b/src/lib/base/IJob.h index 4a276797..f966ec00 100644 --- a/src/lib/base/IJob.h +++ b/src/lib/base/IJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/ILogOutputter.h b/src/lib/base/ILogOutputter.h index 28563a24..ab218fc9 100644 --- a/src/lib/base/ILogOutputter.h +++ b/src/lib/base/ILogOutputter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/Log.cpp b/src/lib/base/Log.cpp index 3a8351b8..e0ada2f0 100644 --- a/src/lib/base/Log.cpp +++ b/src/lib/base/Log.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -228,7 +228,7 @@ Log::insert(ILogOutputter* outputter, bool alwaysAtHead) // don't show log unless user requests it, as some users find this // feature irritating (i.e. when they lose network connectivity). // in windows the log window can be displayed by selecting "show log" - // from the synergy system tray icon. + // from the barrier system tray icon. // if this causes problems for other architectures, then a different // work around should be attempted. //outputter->show(false); diff --git a/src/lib/base/Log.h b/src/lib/base/Log.h index b54e82f5..1d09be22 100644 --- a/src/lib/base/Log.h +++ b/src/lib/base/Log.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/PriorityQueue.h b/src/lib/base/PriorityQueue.h index 31f68794..d2ca70ed 100644 --- a/src/lib/base/PriorityQueue.h +++ b/src/lib/base/PriorityQueue.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * diff --git a/src/lib/base/SimpleEventQueueBuffer.cpp b/src/lib/base/SimpleEventQueueBuffer.cpp index b8603403..b55fe556 100644 --- a/src/lib/base/SimpleEventQueueBuffer.cpp +++ b/src/lib/base/SimpleEventQueueBuffer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/SimpleEventQueueBuffer.h b/src/lib/base/SimpleEventQueueBuffer.h index 863c3c17..4aa76d38 100644 --- a/src/lib/base/SimpleEventQueueBuffer.h +++ b/src/lib/base/SimpleEventQueueBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/Stopwatch.cpp b/src/lib/base/Stopwatch.cpp index f5dee045..b9ceb859 100644 --- a/src/lib/base/Stopwatch.cpp +++ b/src/lib/base/Stopwatch.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/Stopwatch.h b/src/lib/base/Stopwatch.h index 49ec627c..dda74ea1 100644 --- a/src/lib/base/Stopwatch.h +++ b/src/lib/base/Stopwatch.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/String.cpp b/src/lib/base/String.cpp index 8349715b..97b8997b 100644 --- a/src/lib/base/String.cpp +++ b/src/lib/base/String.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -32,7 +32,7 @@ #include #include -namespace synergy { +namespace barrier { namespace string { String @@ -276,7 +276,7 @@ CaselessCmp::less(const String& a, const String& b) return std::lexicographical_compare( a.begin(), a.end(), b.begin(), b.end(), - &synergy::string::CaselessCmp::cmpLess); + &barrier::string::CaselessCmp::cmpLess); } bool diff --git a/src/lib/base/String.h b/src/lib/base/String.h index 92d70712..36614617 100644 --- a/src/lib/base/String.h +++ b/src/lib/base/String.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -27,7 +27,7 @@ // use standard C++ string class for our string class typedef std::string String; -namespace synergy { +namespace barrier { //! String utilities /*! diff --git a/src/lib/base/TMethodEventJob.h b/src/lib/base/TMethodEventJob.h index f50270e3..a65f8c92 100644 --- a/src/lib/base/TMethodEventJob.h +++ b/src/lib/base/TMethodEventJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/base/TMethodJob.h b/src/lib/base/TMethodJob.h index 6d38ce04..ec88f05d 100644 --- a/src/lib/base/TMethodJob.h +++ b/src/lib/base/TMethodJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/Unicode.cpp b/src/lib/base/Unicode.cpp index ea814eae..6a077e79 100644 --- a/src/lib/base/Unicode.cpp +++ b/src/lib/base/Unicode.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/Unicode.h b/src/lib/base/Unicode.h index b92b665b..1391c1e7 100644 --- a/src/lib/base/Unicode.h +++ b/src/lib/base/Unicode.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/XBase.cpp b/src/lib/base/XBase.cpp index ee4b5665..29ae9271 100644 --- a/src/lib/base/XBase.cpp +++ b/src/lib/base/XBase.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -65,7 +65,7 @@ XBase::format(const char* /*id*/, const char* fmt, ...) const throw() va_list args; va_start(args, fmt); try { - result = synergy::string::vformat(fmt, args); + result = barrier::string::vformat(fmt, args); } catch (...) { // ignore diff --git a/src/lib/base/XBase.h b/src/lib/base/XBase.h index 33da3bc4..3064b6c0 100644 --- a/src/lib/base/XBase.h +++ b/src/lib/base/XBase.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/base/log_outputters.cpp b/src/lib/base/log_outputters.cpp index 514e0fa3..8e56c26c 100644 --- a/src/lib/base/log_outputters.cpp +++ b/src/lib/base/log_outputters.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -272,7 +272,7 @@ FileLogOutputter::write(ELevel level, const char *message) m_handle.close(); if (moveFile) { - String oldLogFilename = synergy::string::sprintf("%s.1", m_fileName.c_str()); + String oldLogFilename = barrier::string::sprintf("%s.1", m_fileName.c_str()); remove(oldLogFilename.c_str()); rename(m_fileName.c_str(), oldLogFilename.c_str()); } diff --git a/src/lib/base/log_outputters.h b/src/lib/base/log_outputters.h index fb94c02e..c4940aac 100644 --- a/src/lib/base/log_outputters.h +++ b/src/lib/base/log_outputters.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/client/CMakeLists.txt b/src/lib/client/CMakeLists.txt index 3e8dc7fc..97dc9dbf 100644 --- a/src/lib/client/CMakeLists.txt +++ b/src/lib/client/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -17,7 +17,7 @@ file(GLOB headers "*.h") file(GLOB sources "*.cpp") -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp index c744ec2b..5b61c4ff 100644 --- a/src/lib/client/Client.cpp +++ b/src/lib/client/Client.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,15 +19,15 @@ #include "client/Client.h" #include "client/ServerProxy.h" -#include "synergy/Screen.h" -#include "synergy/FileChunk.h" -#include "synergy/DropHelper.h" -#include "synergy/PacketStreamFilter.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/protocol_types.h" -#include "synergy/XSynergy.h" -#include "synergy/StreamChunker.h" -#include "synergy/IPlatformScreen.h" +#include "barrier/Screen.h" +#include "barrier/FileChunk.h" +#include "barrier/DropHelper.h" +#include "barrier/PacketStreamFilter.h" +#include "barrier/ProtocolUtil.h" +#include "barrier/protocol_types.h" +#include "barrier/XBarrier.h" +#include "barrier/StreamChunker.h" +#include "barrier/IPlatformScreen.h" #include "mt/Thread.h" #include "net/TCPSocket.h" #include "net/IDataSocket.h" @@ -53,7 +53,7 @@ Client::Client( IEventQueue* events, const String& name, const NetworkAddress& address, ISocketFactory* socketFactory, - synergy::Screen* screen, + barrier::Screen* screen, ClientArgs const& args) : m_mock(false), m_name(name), diff --git a/src/lib/client/Client.h b/src/lib/client/Client.h index 02b5fa9a..7ac515dc 100644 --- a/src/lib/client/Client.h +++ b/src/lib/client/Client.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,29 +18,29 @@ #pragma once -#include "synergy/IClient.h" +#include "barrier/IClient.h" -#include "synergy/Clipboard.h" -#include "synergy/DragInformation.h" -#include "synergy/INode.h" -#include "synergy/ClientArgs.h" +#include "barrier/Clipboard.h" +#include "barrier/DragInformation.h" +#include "barrier/INode.h" +#include "barrier/ClientArgs.h" #include "net/NetworkAddress.h" #include "base/EventTypes.h" #include "mt/CondVar.h" class EventQueueTimer; -namespace synergy { class Screen; } +namespace barrier { class Screen; } class ServerProxy; class IDataSocket; class ISocketFactory; -namespace synergy { class IStream; } +namespace barrier { class IStream; } class IEventQueue; class Thread; class TCPSocket; -//! Synergy client +//! Barrier client /*! -This class implements the top-level client algorithms for synergy. +This class implements the top-level client algorithms for barrier. */ class Client : public IClient, public INode { public: @@ -59,7 +59,7 @@ public: */ Client(IEventQueue* events, const String& name, const NetworkAddress& address, ISocketFactory* socketFactory, - synergy::Screen* screen, ClientArgs const& args); + barrier::Screen* screen, ClientArgs const& args); ~Client(); @@ -201,8 +201,8 @@ private: String m_name; NetworkAddress m_serverAddress; ISocketFactory* m_socketFactory; - synergy::Screen* m_screen; - synergy::IStream* m_stream; + barrier::Screen* m_screen; + barrier::IStream* m_stream; EventQueueTimer* m_timer; ServerProxy* m_server; bool m_ready; diff --git a/src/lib/client/ServerProxy.cpp b/src/lib/client/ServerProxy.cpp index ae5d9fc5..9224db6a 100644 --- a/src/lib/client/ServerProxy.cpp +++ b/src/lib/client/ServerProxy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,13 +19,13 @@ #include "client/ServerProxy.h" #include "client/Client.h" -#include "synergy/FileChunk.h" -#include "synergy/ClipboardChunk.h" -#include "synergy/StreamChunker.h" -#include "synergy/Clipboard.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/option_types.h" -#include "synergy/protocol_types.h" +#include "barrier/FileChunk.h" +#include "barrier/ClipboardChunk.h" +#include "barrier/StreamChunker.h" +#include "barrier/Clipboard.h" +#include "barrier/ProtocolUtil.h" +#include "barrier/option_types.h" +#include "barrier/protocol_types.h" #include "io/IStream.h" #include "base/Log.h" #include "base/IEventQueue.h" @@ -38,7 +38,7 @@ // ServerProxy // -ServerProxy::ServerProxy(Client* client, synergy::IStream* stream, IEventQueue* events) : +ServerProxy::ServerProxy(Client* client, barrier::IStream* stream, IEventQueue* events) : m_client(client), m_stream(stream), m_seqNum(0), diff --git a/src/lib/client/ServerProxy.h b/src/lib/client/ServerProxy.h index a9f217a1..2ad711a2 100644 --- a/src/lib/client/ServerProxy.h +++ b/src/lib/client/ServerProxy.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,8 +18,8 @@ #pragma once -#include "synergy/clipboard_types.h" -#include "synergy/key_types.h" +#include "barrier/clipboard_types.h" +#include "barrier/key_types.h" #include "base/Event.h" #include "base/Stopwatch.h" #include "base/String.h" @@ -28,7 +28,7 @@ class Client; class ClientInfo; class EventQueueTimer; class IClipboard; -namespace synergy { class IStream; } +namespace barrier { class IStream; } class IEventQueue; //! Proxy for server @@ -42,7 +42,7 @@ public: Process messages from the server on \p stream and forward to \p client. */ - ServerProxy(Client* client, synergy::IStream* stream, IEventQueue* events); + ServerProxy(Client* client, barrier::IStream* stream, IEventQueue* events); ~ServerProxy(); //! @name manipulators @@ -112,7 +112,7 @@ private: typedef EResult (ServerProxy::*MessageParser)(const UInt8*); Client* m_client; - synergy::IStream* m_stream; + barrier::IStream* m_stream; UInt32 m_seqNum; diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index e068ac20..56d9fc96 100644 --- a/src/lib/common/CMakeLists.txt +++ b/src/lib/common/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -17,7 +17,7 @@ file(GLOB headers "*.h") file(GLOB sources "*.cpp") -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/common/IInterface.h b/src/lib/common/IInterface.h index 606c21f1..84a76a93 100644 --- a/src/lib/common/IInterface.h +++ b/src/lib/common/IInterface.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/MacOSXPrecomp.h b/src/lib/common/MacOSXPrecomp.h index cb49b743..7dbc8d02 100644 --- a/src/lib/common/MacOSXPrecomp.h +++ b/src/lib/common/MacOSXPrecomp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/Version.cpp b/src/lib/common/Version.cpp index d6449067..94d6c5d6 100644 --- a/src/lib/common/Version.cpp +++ b/src/lib/common/Version.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -18,11 +18,12 @@ #include "common/Version.h" -const char* kApplication = "Synergy"; -const char* kCopyright = "Copyright (C) 2012-2016 Symless Ltd.\n" +const char* kApplication = "Barrier"; +const char* kCopyright = "Copyright (C) 2018 Debauchee Open Source Group\n" + "Copyright (C) 2012-2016 Symless Ltd.\n" "Copyright (C) 2008-2014 Nick Bolton\n" "Copyright (C) 2002-2014 Chris Schoeneman"; -const char* kContact = "Email: engineering@symless.com"; -const char* kWebsite = "https://symless.com/"; -const char* kVersion = SYNERGY_VERSION; -const char* kAppVersion = "Synergy " SYNERGY_VERSION; +const char* kContact = "Email: todo@mail.com"; +const char* kWebsite = "https://github.com/debauchee/barrier/"; +const char* kVersion = BARRIER_VERSION; +const char* kAppVersion = "Barrier " BARRIER_VERSION; diff --git a/src/lib/common/Version.h b/src/lib/common/Version.h index 9ba0a66e..66bb2e29 100644 --- a/src/lib/common/Version.h +++ b/src/lib/common/Version.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -21,7 +21,7 @@ #include "common/common.h" // set version macro if not set yet -#if !defined(SYNERGY_VERSION) +#if !defined(BARRIER_VERSION) #error Version was not set (should be passed to compiler). #endif diff --git a/src/lib/common/basic_types.h b/src/lib/common/basic_types.h index 38c03998..f84550c9 100644 --- a/src/lib/common/basic_types.h +++ b/src/lib/common/basic_types.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/common.h b/src/lib/common/common.h index 33d36f07..5ea215fa 100644 --- a/src/lib/common/common.h +++ b/src/lib/common/common.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdbitset.h b/src/lib/common/stdbitset.h index 103a48a3..10962497 100644 --- a/src/lib/common/stdbitset.h +++ b/src/lib/common/stdbitset.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stddeque.h b/src/lib/common/stddeque.h index 1fabe682..ffaed244 100644 --- a/src/lib/common/stddeque.h +++ b/src/lib/common/stddeque.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdexcept.h b/src/lib/common/stdexcept.h index 5be8049d..2bd96b37 100644 --- a/src/lib/common/stdexcept.h +++ b/src/lib/common/stdexcept.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/common/stdfstream.h b/src/lib/common/stdfstream.h index 459c1f4d..e9aa2632 100644 --- a/src/lib/common/stdfstream.h +++ b/src/lib/common/stdfstream.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdistream.h b/src/lib/common/stdistream.h index 86f29f77..b19e2abd 100644 --- a/src/lib/common/stdistream.h +++ b/src/lib/common/stdistream.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdlist.h b/src/lib/common/stdlist.h index 9e0b3274..d530e576 100644 --- a/src/lib/common/stdlist.h +++ b/src/lib/common/stdlist.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdmap.h b/src/lib/common/stdmap.h index 1b4c5a46..23510741 100644 --- a/src/lib/common/stdmap.h +++ b/src/lib/common/stdmap.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdostream.h b/src/lib/common/stdostream.h index d51cafbd..bb822856 100644 --- a/src/lib/common/stdostream.h +++ b/src/lib/common/stdostream.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdpost.h b/src/lib/common/stdpost.h index 80ea6c00..8046da01 100644 --- a/src/lib/common/stdpost.h +++ b/src/lib/common/stdpost.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdpre.h b/src/lib/common/stdpre.h index 3a028b60..8ccd308e 100644 --- a/src/lib/common/stdpre.h +++ b/src/lib/common/stdpre.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdset.h b/src/lib/common/stdset.h index 2bf2b6e2..1c989715 100644 --- a/src/lib/common/stdset.h +++ b/src/lib/common/stdset.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdsstream.h b/src/lib/common/stdsstream.h index 8011ba98..43671ffe 100644 --- a/src/lib/common/stdsstream.h +++ b/src/lib/common/stdsstream.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdstring.h b/src/lib/common/stdstring.h index 20ce67ef..f320ca8b 100644 --- a/src/lib/common/stdstring.h +++ b/src/lib/common/stdstring.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/common/stdvector.h b/src/lib/common/stdvector.h index 75a33298..ab4b853c 100644 --- a/src/lib/common/stdvector.h +++ b/src/lib/common/stdvector.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/io/CMakeLists.txt b/src/lib/io/CMakeLists.txt index e8c55f79..32ae7ec7 100644 --- a/src/lib/io/CMakeLists.txt +++ b/src/lib/io/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -17,7 +17,7 @@ file(GLOB headers "*.h") file(GLOB sources "*.cpp") -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/io/IStream.h b/src/lib/io/IStream.h index 905004a6..cf93ac4f 100644 --- a/src/lib/io/IStream.h +++ b/src/lib/io/IStream.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -25,7 +25,7 @@ class IEventQueue; -namespace synergy { +namespace barrier { //! Bidirectional stream interface /*! diff --git a/src/lib/io/StreamBuffer.cpp b/src/lib/io/StreamBuffer.cpp index f8b3b010..61f05ba9 100644 --- a/src/lib/io/StreamBuffer.cpp +++ b/src/lib/io/StreamBuffer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/io/StreamBuffer.h b/src/lib/io/StreamBuffer.h index db218cc0..49b666bc 100644 --- a/src/lib/io/StreamBuffer.h +++ b/src/lib/io/StreamBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/io/StreamFilter.cpp b/src/lib/io/StreamFilter.cpp index ceefb89e..170e2374 100644 --- a/src/lib/io/StreamFilter.cpp +++ b/src/lib/io/StreamFilter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -24,7 +24,7 @@ // StreamFilter // -StreamFilter::StreamFilter(IEventQueue* events, synergy::IStream* stream, bool adoptStream) : +StreamFilter::StreamFilter(IEventQueue* events, barrier::IStream* stream, bool adoptStream) : m_stream(stream), m_adopted(adoptStream), m_events(events) @@ -98,7 +98,7 @@ StreamFilter::getSize() const return getStream()->getSize(); } -synergy::IStream* +barrier::IStream* StreamFilter::getStream() const { return m_stream; diff --git a/src/lib/io/StreamFilter.h b/src/lib/io/StreamFilter.h index bf820ad7..e578e0ce 100644 --- a/src/lib/io/StreamFilter.h +++ b/src/lib/io/StreamFilter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -26,14 +26,14 @@ This class wraps a stream. Subclasses provide indirect access to the wrapped stream, typically performing some filtering. */ -class StreamFilter : public synergy::IStream { +class StreamFilter : public barrier::IStream { public: /*! Create a wrapper around \c stream. Iff \c adoptStream is true then this object takes ownership of the stream and will delete it in the d'tor. */ - StreamFilter(IEventQueue* events, synergy::IStream* stream, bool adoptStream = true); + StreamFilter(IEventQueue* events, barrier::IStream* stream, bool adoptStream = true); virtual ~StreamFilter(); // IStream overrides @@ -53,7 +53,7 @@ public: /*! Returns the stream passed to the c'tor. */ - synergy::IStream* getStream() const; + barrier::IStream* getStream() const; protected: //! Handle events from source stream @@ -67,7 +67,7 @@ private: void handleUpstreamEvent(const Event&, void*); private: - synergy::IStream* m_stream; + barrier::IStream* m_stream; bool m_adopted; IEventQueue* m_events; }; diff --git a/src/lib/io/XIO.cpp b/src/lib/io/XIO.cpp index 5ff04fc4..1299d237 100644 --- a/src/lib/io/XIO.cpp +++ b/src/lib/io/XIO.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/io/XIO.h b/src/lib/io/XIO.h index fe7ad203..4964441a 100644 --- a/src/lib/io/XIO.h +++ b/src/lib/io/XIO.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/ipc/CMakeLists.txt b/src/lib/ipc/CMakeLists.txt index 8615a50d..3c7302a7 100644 --- a/src/lib/ipc/CMakeLists.txt +++ b/src/lib/ipc/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -17,7 +17,7 @@ file(GLOB headers "*.h") file(GLOB sources "*.cpp") -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/ipc/Ipc.cpp b/src/lib/ipc/Ipc.cpp index c0667714..78b84078 100644 --- a/src/lib/ipc/Ipc.cpp +++ b/src/lib/ipc/Ipc.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/Ipc.h b/src/lib/ipc/Ipc.h index b4a4e201..bc69c086 100644 --- a/src/lib/ipc/Ipc.h +++ b/src/lib/ipc/Ipc.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -35,18 +35,18 @@ enum EIpcClientType { }; // handshake: node/gui -> daemon -// $1 = type, the client identifies it's self as gui or node (synergyc/s). +// $1 = type, the client identifies it's self as gui or node (barrierc/s). extern const char* kIpcMsgHello; // log line: daemon -> gui -// $1 = aggregate log lines collected from synergys/c or the daemon itself. +// $1 = aggregate log lines collected from barriers/c or the daemon itself. extern const char* kIpcMsgLogLine; // command: gui -> daemon // $1 = command; the command for the daemon to launch, typically the full -// path to synergys/c. $2 = true when process must be elevated on ms windows. +// path to barriers/c. $2 = true when process must be elevated on ms windows. extern const char* kIpcMsgCommand; // shutdown: daemon -> node -// the daemon tells synergys/c to shut down gracefully. +// the daemon tells barriers/c to shut down gracefully. extern const char* kIpcMsgShutdown; diff --git a/src/lib/ipc/IpcClient.cpp b/src/lib/ipc/IpcClient.cpp index 22726abc..04c04141 100644 --- a/src/lib/ipc/IpcClient.cpp +++ b/src/lib/ipc/IpcClient.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcClient.h b/src/lib/ipc/IpcClient.h index fb31a26d..1e9bca60 100644 --- a/src/lib/ipc/IpcClient.h +++ b/src/lib/ipc/IpcClient.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcClientProxy.cpp b/src/lib/ipc/IpcClientProxy.cpp index bbebf9a8..af85ecab 100644 --- a/src/lib/ipc/IpcClientProxy.cpp +++ b/src/lib/ipc/IpcClientProxy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -20,7 +20,7 @@ #include "ipc/Ipc.h" #include "ipc/IpcMessage.h" -#include "synergy/ProtocolUtil.h" +#include "barrier/ProtocolUtil.h" #include "io/IStream.h" #include "arch/Arch.h" #include "base/TMethodEventJob.h" @@ -30,7 +30,7 @@ // IpcClientProxy // -IpcClientProxy::IpcClientProxy(synergy::IStream& stream, IEventQueue* events) : +IpcClientProxy::IpcClientProxy(barrier::IStream& stream, IEventQueue* events) : m_stream(stream), m_clientType(kIpcClientUnknown), m_disconnecting(false), diff --git a/src/lib/ipc/IpcClientProxy.h b/src/lib/ipc/IpcClientProxy.h index d9a22e13..eaa12c78 100644 --- a/src/lib/ipc/IpcClientProxy.h +++ b/src/lib/ipc/IpcClientProxy.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -23,7 +23,7 @@ #include "base/EventTypes.h" #include "base/Event.h" -namespace synergy { class IStream; } +namespace barrier { class IStream; } class IpcMessage; class IpcCommandMessage; class IpcHelloMessage; @@ -33,7 +33,7 @@ class IpcClientProxy { friend class IpcServer; public: - IpcClientProxy(synergy::IStream& stream, IEventQueue* events); + IpcClientProxy(barrier::IStream& stream, IEventQueue* events); virtual ~IpcClientProxy(); private: @@ -46,7 +46,7 @@ private: void disconnect(); private: - synergy::IStream& m_stream; + barrier::IStream& m_stream; EIpcClientType m_clientType; bool m_disconnecting; ArchMutex m_readMutex; diff --git a/src/lib/ipc/IpcLogOutputter.cpp b/src/lib/ipc/IpcLogOutputter.cpp index 120fd66f..984793e4 100644 --- a/src/lib/ipc/IpcLogOutputter.cpp +++ b/src/lib/ipc/IpcLogOutputter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcLogOutputter.h b/src/lib/ipc/IpcLogOutputter.h index b6b285b8..461f022d 100644 --- a/src/lib/ipc/IpcLogOutputter.h +++ b/src/lib/ipc/IpcLogOutputter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcMessage.cpp b/src/lib/ipc/IpcMessage.cpp index f8162ce1..deef22da 100644 --- a/src/lib/ipc/IpcMessage.cpp +++ b/src/lib/ipc/IpcMessage.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcMessage.h b/src/lib/ipc/IpcMessage.h index 5407c562..5cc3d791 100644 --- a/src/lib/ipc/IpcMessage.h +++ b/src/lib/ipc/IpcMessage.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcServer.cpp b/src/lib/ipc/IpcServer.cpp index 791595f2..bc778c73 100644 --- a/src/lib/ipc/IpcServer.cpp +++ b/src/lib/ipc/IpcServer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -96,7 +96,7 @@ IpcServer::listen() void IpcServer::handleClientConnecting(const Event&, void*) { - synergy::IStream* stream = m_socket->accept(); + barrier::IStream* stream = m_socket->accept(); if (stream == NULL) { return; } diff --git a/src/lib/ipc/IpcServer.h b/src/lib/ipc/IpcServer.h index b6477f8a..d9bbe3e8 100644 --- a/src/lib/ipc/IpcServer.h +++ b/src/lib/ipc/IpcServer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/ipc/IpcServerProxy.cpp b/src/lib/ipc/IpcServerProxy.cpp index 3cf59f7b..820e1ab7 100644 --- a/src/lib/ipc/IpcServerProxy.cpp +++ b/src/lib/ipc/IpcServerProxy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -20,7 +20,7 @@ #include "ipc/IpcMessage.h" #include "ipc/Ipc.h" -#include "synergy/ProtocolUtil.h" +#include "barrier/ProtocolUtil.h" #include "io/IStream.h" #include "base/TMethodEventJob.h" #include "base/Log.h" @@ -29,7 +29,7 @@ // IpcServerProxy // -IpcServerProxy::IpcServerProxy(synergy::IStream& stream, IEventQueue* events) : +IpcServerProxy::IpcServerProxy(barrier::IStream& stream, IEventQueue* events) : m_stream(stream), m_events(events) { diff --git a/src/lib/ipc/IpcServerProxy.h b/src/lib/ipc/IpcServerProxy.h index dc9459a9..f2218a41 100644 --- a/src/lib/ipc/IpcServerProxy.h +++ b/src/lib/ipc/IpcServerProxy.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * @@ -21,7 +21,7 @@ #include "base/Event.h" #include "base/EventTypes.h" -namespace synergy { class IStream; } +namespace barrier { class IStream; } class IpcMessage; class IpcLogLineMessage; class IEventQueue; @@ -30,7 +30,7 @@ class IpcServerProxy { friend class IpcClient; public: - IpcServerProxy(synergy::IStream& stream, IEventQueue* events); + IpcServerProxy(barrier::IStream& stream, IEventQueue* events); virtual ~IpcServerProxy(); private: @@ -41,6 +41,6 @@ private: void disconnect(); private: - synergy::IStream& m_stream; + barrier::IStream& m_stream; IEventQueue* m_events; }; diff --git a/src/lib/mt/CMakeLists.txt b/src/lib/mt/CMakeLists.txt index de72b480..9ee5ea48 100644 --- a/src/lib/mt/CMakeLists.txt +++ b/src/lib/mt/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -17,7 +17,7 @@ file(GLOB headers "*.h") file(GLOB sources "*.cpp") -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/mt/CondVar.cpp b/src/lib/mt/CondVar.cpp index 99ebf267..11318f92 100644 --- a/src/lib/mt/CondVar.cpp +++ b/src/lib/mt/CondVar.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/CondVar.h b/src/lib/mt/CondVar.h index 8e5f1ec0..0ab956bd 100644 --- a/src/lib/mt/CondVar.h +++ b/src/lib/mt/CondVar.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/Lock.cpp b/src/lib/mt/Lock.cpp index a9970ebe..80721b9f 100644 --- a/src/lib/mt/Lock.cpp +++ b/src/lib/mt/Lock.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/Lock.h b/src/lib/mt/Lock.h index 1c07d0ed..4a3f3116 100644 --- a/src/lib/mt/Lock.h +++ b/src/lib/mt/Lock.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/Mutex.cpp b/src/lib/mt/Mutex.cpp index beed6aa3..e9a62e8e 100644 --- a/src/lib/mt/Mutex.cpp +++ b/src/lib/mt/Mutex.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/Mutex.h b/src/lib/mt/Mutex.h index b8ef5a00..51a96497 100644 --- a/src/lib/mt/Mutex.h +++ b/src/lib/mt/Mutex.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/Thread.cpp b/src/lib/mt/Thread.cpp index 9016906c..7474c16f 100644 --- a/src/lib/mt/Thread.cpp +++ b/src/lib/mt/Thread.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/Thread.h b/src/lib/mt/Thread.h index e3320230..a7434fd7 100644 --- a/src/lib/mt/Thread.h +++ b/src/lib/mt/Thread.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/XMT.cpp b/src/lib/mt/XMT.cpp index ff7d8751..9aa58525 100644 --- a/src/lib/mt/XMT.cpp +++ b/src/lib/mt/XMT.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/XMT.h b/src/lib/mt/XMT.h index 16cef278..9e48fd94 100644 --- a/src/lib/mt/XMT.h +++ b/src/lib/mt/XMT.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/mt/XThread.h b/src/lib/mt/XThread.h index bc502851..acc32e3c 100644 --- a/src/lib/mt/XThread.h +++ b/src/lib/mt/XThread.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/CMakeLists.txt b/src/lib/net/CMakeLists.txt index 62e0231a..54394509 100644 --- a/src/lib/net/CMakeLists.txt +++ b/src/lib/net/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -17,7 +17,7 @@ file(GLOB headers "*.h") file(GLOB sources "*.cpp") -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/net/IDataSocket.cpp b/src/lib/net/IDataSocket.cpp index 4d4d8944..cc679c30 100644 --- a/src/lib/net/IDataSocket.cpp +++ b/src/lib/net/IDataSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/IDataSocket.h b/src/lib/net/IDataSocket.h index a58c4df6..dc07df52 100644 --- a/src/lib/net/IDataSocket.h +++ b/src/lib/net/IDataSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -28,7 +28,7 @@ This interface defines the methods common to all network sockets that represent a full-duplex data stream. */ -class IDataSocket : public ISocket, public synergy::IStream { +class IDataSocket : public ISocket, public barrier::IStream { public: class ConnectionFailedInfo { public: diff --git a/src/lib/net/IListenSocket.h b/src/lib/net/IListenSocket.h index cbf1d252..73dcc6e9 100644 --- a/src/lib/net/IListenSocket.h +++ b/src/lib/net/IListenSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/ISocket.h b/src/lib/net/ISocket.h index 2d5d6311..0e9688b7 100644 --- a/src/lib/net/ISocket.h +++ b/src/lib/net/ISocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/ISocketFactory.h b/src/lib/net/ISocketFactory.h index 628535db..2bfd5393 100644 --- a/src/lib/net/ISocketFactory.h +++ b/src/lib/net/ISocketFactory.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/ISocketMultiplexerJob.h b/src/lib/net/ISocketMultiplexerJob.h index cc1d0d93..ddd3ba54 100644 --- a/src/lib/net/ISocketMultiplexerJob.h +++ b/src/lib/net/ISocketMultiplexerJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/net/NetworkAddress.cpp b/src/lib/net/NetworkAddress.cpp index c0df9805..2b8b01d3 100644 --- a/src/lib/net/NetworkAddress.cpp +++ b/src/lib/net/NetworkAddress.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/NetworkAddress.h b/src/lib/net/NetworkAddress.h index f4266854..cbd15f58 100644 --- a/src/lib/net/NetworkAddress.h +++ b/src/lib/net/NetworkAddress.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/SecureListenSocket.cpp b/src/lib/net/SecureListenSocket.cpp index b0b50506..31eafa62 100644 --- a/src/lib/net/SecureListenSocket.cpp +++ b/src/lib/net/SecureListenSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ #include "arch/XArch.h" static const char s_certificateDir[] = { "SSL" }; -static const char s_certificateFilename[] = { "Synergy.pem" }; +static const char s_certificateFilename[] = { "Barrier.pem" }; // // SecureListenSocket @@ -61,7 +61,7 @@ SecureListenSocket::accept() setListeningJob(); } - String certificateFilename = synergy::string::sprintf("%s/%s/%s", + String certificateFilename = barrier::string::sprintf("%s/%s/%s", ARCH->getProfileDirectory().c_str(), s_certificateDir, s_certificateFilename); diff --git a/src/lib/net/SecureListenSocket.h b/src/lib/net/SecureListenSocket.h index 340dba5d..3e178453 100644 --- a/src/lib/net/SecureListenSocket.h +++ b/src/lib/net/SecureListenSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp index 9dd3a816..5c892524 100644 --- a/src/lib/net/SecureSocket.cpp +++ b/src/lib/net/SecureSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -653,11 +653,11 @@ SecureSocket::formatFingerprint(String& fingerprint, bool hex, bool separator) { if (hex) { // to hexidecimal - synergy::string::toHex(fingerprint, 2); + barrier::string::toHex(fingerprint, 2); } // all uppercase - synergy::string::uppercase(fingerprint); + barrier::string::uppercase(fingerprint); if (separator) { // add colon to separate each 2 charactors @@ -690,7 +690,7 @@ SecureSocket::verifyCertFingerprint() LOG((CLOG_NOTE "server fingerprint: %s", fingerprint.c_str())); String trustedServersFilename; - trustedServersFilename = synergy::string::sprintf( + trustedServersFilename = barrier::string::sprintf( "%s/%s/%s", ARCH->getProfileDirectory().c_str(), kFingerprintDirName, diff --git a/src/lib/net/SecureSocket.h b/src/lib/net/SecureSocket.h index 2292cd29..45ae09d3 100644 --- a/src/lib/net/SecureSocket.h +++ b/src/lib/net/SecureSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/net/SocketMultiplexer.cpp b/src/lib/net/SocketMultiplexer.cpp index 77b5f0dd..c4bc64a3 100644 --- a/src/lib/net/SocketMultiplexer.cpp +++ b/src/lib/net/SocketMultiplexer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/net/SocketMultiplexer.h b/src/lib/net/SocketMultiplexer.h index f745ed00..4aa39fc4 100644 --- a/src/lib/net/SocketMultiplexer.h +++ b/src/lib/net/SocketMultiplexer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/net/TCPListenSocket.cpp b/src/lib/net/TCPListenSocket.cpp index 23abed40..294054d8 100644 --- a/src/lib/net/TCPListenSocket.cpp +++ b/src/lib/net/TCPListenSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/TCPListenSocket.h b/src/lib/net/TCPListenSocket.h index 4abd752c..54bbbae4 100644 --- a/src/lib/net/TCPListenSocket.h +++ b/src/lib/net/TCPListenSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/TCPSocket.cpp b/src/lib/net/TCPSocket.cpp index ff69ab2b..fbb40587 100644 --- a/src/lib/net/TCPSocket.cpp +++ b/src/lib/net/TCPSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -494,16 +494,16 @@ TCPSocket::serviceConnecting(ISocketMultiplexerJob* job, // non-blocking stream socket that fails to connect immediately is // reported by select as being writable (i.e. connected) even when // the connection has failed. this is easily demonstrated on OS X - // 10.3.4 by starting a synergy client and telling to connect to - // another system that's not running a synergy server. it will + // 10.3.4 by starting a barrier client and telling to connect to + // another system that's not running a barrier server. it will // claim to have connected then quickly disconnect (i guess because - // read returns 0 bytes). unfortunately, synergy attempts to + // read returns 0 bytes). unfortunately, barrier attempts to // reconnect immediately, the process repeats and we end up // spinning the CPU. luckily, OS X does set SO_ERROR on the // socket correctly when the connection has failed so checking for // errors works. (curiously, sometimes OS X doesn't report // connection refused. when that happens it at least doesn't - // report the socket as being writable so synergy is able to time + // report the socket as being writable so barrier is able to time // out the attempt.) if (error || true) { try { diff --git a/src/lib/net/TCPSocket.h b/src/lib/net/TCPSocket.h index b29aa927..d685f45c 100644 --- a/src/lib/net/TCPSocket.h +++ b/src/lib/net/TCPSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/TCPSocketFactory.cpp b/src/lib/net/TCPSocketFactory.cpp index e8329980..91b11521 100644 --- a/src/lib/net/TCPSocketFactory.cpp +++ b/src/lib/net/TCPSocketFactory.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/TCPSocketFactory.h b/src/lib/net/TCPSocketFactory.h index 0b28851e..3e7afcb2 100644 --- a/src/lib/net/TCPSocketFactory.h +++ b/src/lib/net/TCPSocketFactory.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/net/TSocketMultiplexerMethodJob.h b/src/lib/net/TSocketMultiplexerMethodJob.h index 256943d9..90efbe7d 100644 --- a/src/lib/net/TSocketMultiplexerMethodJob.h +++ b/src/lib/net/TSocketMultiplexerMethodJob.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/net/XSocket.cpp b/src/lib/net/XSocket.cpp index 77c9ea16..13e0fc3b 100644 --- a/src/lib/net/XSocket.cpp +++ b/src/lib/net/XSocket.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -69,7 +69,7 @@ XSocketAddress::getWhat() const throw() }; return format(s_errorID[m_error], s_errorMsg[m_error], m_hostname.c_str(), - synergy::string::sprintf("%d", m_port).c_str()); + barrier::string::sprintf("%d", m_port).c_str()); } diff --git a/src/lib/net/XSocket.h b/src/lib/net/XSocket.h index f6e3ca9f..be02b5b8 100644 --- a/src/lib/net/XSocket.h +++ b/src/lib/net/XSocket.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt index af36c55f..c4d6c2d6 100644 --- a/src/lib/platform/CMakeLists.txt +++ b/src/lib/platform/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -25,7 +25,7 @@ elseif (UNIX) file(GLOB sources "XWindows*.cpp") endif() -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/platform/IMSWindowsClipboardFacade.h b/src/lib/platform/IMSWindowsClipboardFacade.h index 2eca023d..03c62485 100644 --- a/src/lib/platform/IMSWindowsClipboardFacade.h +++ b/src/lib/platform/IMSWindowsClipboardFacade.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/IOSXKeyResource.cpp b/src/lib/platform/IOSXKeyResource.cpp index b887fc59..0c5abe70 100644 --- a/src/lib/platform/IOSXKeyResource.cpp +++ b/src/lib/platform/IOSXKeyResource.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/IOSXKeyResource.h b/src/lib/platform/IOSXKeyResource.h index 71770828..fc190ef9 100644 --- a/src/lib/platform/IOSXKeyResource.h +++ b/src/lib/platform/IOSXKeyResource.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "barrier/KeyState.h" class IOSXKeyResource : public IInterface { public: diff --git a/src/lib/platform/MSWindowsClipboard.cpp b/src/lib/platform/MSWindowsClipboard.cpp index 5a807a0c..8ab50df8 100644 --- a/src/lib/platform/MSWindowsClipboard.cpp +++ b/src/lib/platform/MSWindowsClipboard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -86,7 +86,7 @@ MSWindowsClipboard::empty() return false; } - // mark clipboard as being owned by synergy + // mark clipboard as being owned by barrier HGLOBAL data = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, 1); if (NULL == SetClipboardData(getOwnershipFormat(), data)) { LOG((CLOG_DEBUG "failed to set clipboard data")); @@ -210,11 +210,11 @@ MSWindowsClipboard::clearConverters() } bool -MSWindowsClipboard::isOwnedBySynergy() +MSWindowsClipboard::isOwnedByBarrier() { // create ownership format if we haven't yet if (s_ownershipFormat == 0) { - s_ownershipFormat = RegisterClipboardFormat(TEXT("SynergyOwnership")); + s_ownershipFormat = RegisterClipboardFormat(TEXT("BarrierOwnership")); } return (IsClipboardFormatAvailable(getOwnershipFormat()) != 0); } @@ -224,7 +224,7 @@ MSWindowsClipboard::getOwnershipFormat() { // create ownership format if we haven't yet if (s_ownershipFormat == 0) { - s_ownershipFormat = RegisterClipboardFormat(TEXT("SynergyOwnership")); + s_ownershipFormat = RegisterClipboardFormat(TEXT("BarrierOwnership")); } // return the format diff --git a/src/lib/platform/MSWindowsClipboard.h b/src/lib/platform/MSWindowsClipboard.h index c0f47cc1..3e92a392 100644 --- a/src/lib/platform/MSWindowsClipboard.h +++ b/src/lib/platform/MSWindowsClipboard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,7 +19,7 @@ #pragma once #include "platform/MSWindowsClipboardFacade.h" -#include "synergy/IClipboard.h" +#include "barrier/IClipboard.h" #include "common/stdvector.h" #define WIN32_LEAN_AND_MEAN @@ -41,17 +41,17 @@ public: This must be called between a successful open() and close(). Return false if the clipboard ownership could not be taken; the clipboard should not be emptied in this case. Unlike - empty(), isOwnedBySynergy() will return false when emptied - this way. This is useful when synergy wants to put data on + empty(), isOwnedByBarrier() will return false when emptied + this way. This is useful when barrier wants to put data on clipboard but pretend (to itself) that some other app did it. - When using empty(), synergy assumes the data came from the + When using empty(), barrier assumes the data came from the server and doesn't need to be sent back. emptyUnowned() - makes synergy send the data to the server. + makes barrier send the data to the server. */ bool emptyUnowned(); - //! Test if clipboard is owned by synergy - static bool isOwnedBySynergy(); + //! Test if clipboard is owned by barrier + static bool isOwnedByBarrier(); // IClipboard overrides virtual bool empty(); diff --git a/src/lib/platform/MSWindowsClipboardAnyTextConverter.cpp b/src/lib/platform/MSWindowsClipboardAnyTextConverter.cpp index b28b6974..decbad69 100644 --- a/src/lib/platform/MSWindowsClipboardAnyTextConverter.cpp +++ b/src/lib/platform/MSWindowsClipboardAnyTextConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardAnyTextConverter.h b/src/lib/platform/MSWindowsClipboardAnyTextConverter.h index c0942839..cabdb0bf 100644 --- a/src/lib/platform/MSWindowsClipboardAnyTextConverter.h +++ b/src/lib/platform/MSWindowsClipboardAnyTextConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp b/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp index 94ef1088..16bd4bf9 100644 --- a/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp +++ b/src/lib/platform/MSWindowsClipboardBitmapConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardBitmapConverter.h b/src/lib/platform/MSWindowsClipboardBitmapConverter.h index 4a0c8ec7..52b55474 100644 --- a/src/lib/platform/MSWindowsClipboardBitmapConverter.h +++ b/src/lib/platform/MSWindowsClipboardBitmapConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardFacade.cpp b/src/lib/platform/MSWindowsClipboardFacade.cpp index e69bb189..3b6478f4 100644 --- a/src/lib/platform/MSWindowsClipboardFacade.cpp +++ b/src/lib/platform/MSWindowsClipboardFacade.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardFacade.h b/src/lib/platform/MSWindowsClipboardFacade.h index a256dace..a95e835c 100644 --- a/src/lib/platform/MSWindowsClipboardFacade.h +++ b/src/lib/platform/MSWindowsClipboardFacade.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -20,7 +20,7 @@ #include "platform/IMSWindowsClipboardFacade.h" -#include "synergy/IClipboard.h" +#include "barrier/IClipboard.h" class MSWindowsClipboardFacade : public IMSWindowsClipboardFacade { diff --git a/src/lib/platform/MSWindowsClipboardHTMLConverter.cpp b/src/lib/platform/MSWindowsClipboardHTMLConverter.cpp index 53404058..347a2243 100644 --- a/src/lib/platform/MSWindowsClipboardHTMLConverter.cpp +++ b/src/lib/platform/MSWindowsClipboardHTMLConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -63,11 +63,11 @@ MSWindowsClipboardHTMLConverter::doFromIClipboard(const String& data) const UInt32 EndHTML = EndFragment + (UInt32)suffix.size(); prefix.replace(prefix.find("XXXXXXXXXX"), 10, - synergy::string::sprintf("%010u", StartFragment)); + barrier::string::sprintf("%010u", StartFragment)); prefix.replace(prefix.find("YYYYYYYYYY"), 10, - synergy::string::sprintf("%010u", EndFragment)); + barrier::string::sprintf("%010u", EndFragment)); prefix.replace(prefix.find("ZZZZZZZZZZ"), 10, - synergy::string::sprintf("%010u", EndHTML)); + barrier::string::sprintf("%010u", EndHTML)); // concatenate prefix += data; diff --git a/src/lib/platform/MSWindowsClipboardHTMLConverter.h b/src/lib/platform/MSWindowsClipboardHTMLConverter.h index 9ca767c9..66c80456 100644 --- a/src/lib/platform/MSWindowsClipboardHTMLConverter.h +++ b/src/lib/platform/MSWindowsClipboardHTMLConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardTextConverter.cpp b/src/lib/platform/MSWindowsClipboardTextConverter.cpp index 9fbec002..360c72c3 100644 --- a/src/lib/platform/MSWindowsClipboardTextConverter.cpp +++ b/src/lib/platform/MSWindowsClipboardTextConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardTextConverter.h b/src/lib/platform/MSWindowsClipboardTextConverter.h index 2b534acd..fb081c3b 100644 --- a/src/lib/platform/MSWindowsClipboardTextConverter.h +++ b/src/lib/platform/MSWindowsClipboardTextConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp b/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp index eee17af7..0f8642a0 100644 --- a/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp +++ b/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsClipboardUTF16Converter.h b/src/lib/platform/MSWindowsClipboardUTF16Converter.h index 8c9d8ceb..e7222bc2 100644 --- a/src/lib/platform/MSWindowsClipboardUTF16Converter.h +++ b/src/lib/platform/MSWindowsClipboardUTF16Converter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsDebugOutputter.cpp b/src/lib/platform/MSWindowsDebugOutputter.cpp index 9d9f4344..43c38ad0 100644 --- a/src/lib/platform/MSWindowsDebugOutputter.cpp +++ b/src/lib/platform/MSWindowsDebugOutputter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/platform/MSWindowsDebugOutputter.h b/src/lib/platform/MSWindowsDebugOutputter.h index 3ce8c4e5..01fd97eb 100644 --- a/src/lib/platform/MSWindowsDebugOutputter.h +++ b/src/lib/platform/MSWindowsDebugOutputter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/lib/platform/MSWindowsDesks.cpp b/src/lib/platform/MSWindowsDesks.cpp index c377ab76..5d4d90af 100644 --- a/src/lib/platform/MSWindowsDesks.cpp +++ b/src/lib/platform/MSWindowsDesks.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -20,8 +20,8 @@ #include "synwinhk/synwinhk.h" #include "platform/MSWindowsScreen.h" -#include "synergy/IScreenSaver.h" -#include "synergy/XScreen.h" +#include "barrier/IScreenSaver.h" +#include "barrier/XScreen.h" #include "mt/Lock.h" #include "mt/Thread.h" #include "arch/win32/ArchMiscWindows.h" @@ -64,29 +64,29 @@ #endif // ; -#define SYNERGY_MSG_SWITCH SYNERGY_HOOK_LAST_MSG + 1 +#define BARRIER_MSG_SWITCH BARRIER_HOOK_LAST_MSG + 1 // ; -#define SYNERGY_MSG_ENTER SYNERGY_HOOK_LAST_MSG + 2 +#define BARRIER_MSG_ENTER BARRIER_HOOK_LAST_MSG + 2 // ; -#define SYNERGY_MSG_LEAVE SYNERGY_HOOK_LAST_MSG + 3 +#define BARRIER_MSG_LEAVE BARRIER_HOOK_LAST_MSG + 3 // wParam = flags, HIBYTE(lParam) = virtual key, LOBYTE(lParam) = scan code -#define SYNERGY_MSG_FAKE_KEY SYNERGY_HOOK_LAST_MSG + 4 +#define BARRIER_MSG_FAKE_KEY BARRIER_HOOK_LAST_MSG + 4 // flags, XBUTTON id -#define SYNERGY_MSG_FAKE_BUTTON SYNERGY_HOOK_LAST_MSG + 5 +#define BARRIER_MSG_FAKE_BUTTON BARRIER_HOOK_LAST_MSG + 5 // x; y -#define SYNERGY_MSG_FAKE_MOVE SYNERGY_HOOK_LAST_MSG + 6 +#define BARRIER_MSG_FAKE_MOVE BARRIER_HOOK_LAST_MSG + 6 // xDelta; yDelta -#define SYNERGY_MSG_FAKE_WHEEL SYNERGY_HOOK_LAST_MSG + 7 +#define BARRIER_MSG_FAKE_WHEEL BARRIER_HOOK_LAST_MSG + 7 // POINT*; -#define SYNERGY_MSG_CURSOR_POS SYNERGY_HOOK_LAST_MSG + 8 +#define BARRIER_MSG_CURSOR_POS BARRIER_HOOK_LAST_MSG + 8 // IKeyState*; -#define SYNERGY_MSG_SYNC_KEYS SYNERGY_HOOK_LAST_MSG + 9 +#define BARRIER_MSG_SYNC_KEYS BARRIER_HOOK_LAST_MSG + 9 // install; -#define SYNERGY_MSG_SCREENSAVER SYNERGY_HOOK_LAST_MSG + 10 +#define BARRIER_MSG_SCREENSAVER BARRIER_HOOK_LAST_MSG + 10 // dx; dy -#define SYNERGY_MSG_FAKE_REL_MOVE SYNERGY_HOOK_LAST_MSG + 11 +#define BARRIER_MSG_FAKE_REL_MOVE BARRIER_HOOK_LAST_MSG + 11 // enable; -#define SYNERGY_MSG_FAKE_INPUT SYNERGY_HOOK_LAST_MSG + 12 +#define BARRIER_MSG_FAKE_INPUT BARRIER_HOOK_LAST_MSG + 12 // // MSWindowsDesks @@ -170,13 +170,13 @@ MSWindowsDesks::disable() void MSWindowsDesks::enter() { - sendMessage(SYNERGY_MSG_ENTER, 0, 0); + sendMessage(BARRIER_MSG_ENTER, 0, 0); } void MSWindowsDesks::leave(HKL keyLayout) { - sendMessage(SYNERGY_MSG_LEAVE, (WPARAM)keyLayout, 0); + sendMessage(BARRIER_MSG_LEAVE, (WPARAM)keyLayout, 0); } void @@ -199,7 +199,7 @@ MSWindowsDesks::setOptions(const OptionsList& options) void MSWindowsDesks::updateKeys() { - sendMessage(SYNERGY_MSG_SYNC_KEYS, 0, 0); + sendMessage(BARRIER_MSG_SYNC_KEYS, 0, 0); } void @@ -221,27 +221,27 @@ MSWindowsDesks::installScreensaverHooks(bool install) { if (m_isPrimary && m_screensaverNotify != install) { m_screensaverNotify = install; - sendMessage(SYNERGY_MSG_SCREENSAVER, install, 0); + sendMessage(BARRIER_MSG_SCREENSAVER, install, 0); } } void MSWindowsDesks::fakeInputBegin() { - sendMessage(SYNERGY_MSG_FAKE_INPUT, 1, 0); + sendMessage(BARRIER_MSG_FAKE_INPUT, 1, 0); } void MSWindowsDesks::fakeInputEnd() { - sendMessage(SYNERGY_MSG_FAKE_INPUT, 0, 0); + sendMessage(BARRIER_MSG_FAKE_INPUT, 0, 0); } void MSWindowsDesks::getCursorPos(SInt32& x, SInt32& y) const { POINT pos; - sendMessage(SYNERGY_MSG_CURSOR_POS, reinterpret_cast(&pos), 0); + sendMessage(BARRIER_MSG_CURSOR_POS, reinterpret_cast(&pos), 0); x = pos.x; y = pos.y; } @@ -259,7 +259,7 @@ MSWindowsDesks::fakeKeyEvent( if (!press) { flags |= KEYEVENTF_KEYUP; } - sendMessage(SYNERGY_MSG_FAKE_KEY, flags, + sendMessage(BARRIER_MSG_FAKE_KEY, flags, MAKEWORD(static_cast(button & 0xffu), static_cast(virtualKey & 0xffu))); } @@ -314,13 +314,13 @@ MSWindowsDesks::fakeMouseButton(ButtonID button, bool press) } // do it - sendMessage(SYNERGY_MSG_FAKE_BUTTON, flags, data); + sendMessage(BARRIER_MSG_FAKE_BUTTON, flags, data); } void MSWindowsDesks::fakeMouseMove(SInt32 x, SInt32 y) const { - sendMessage(SYNERGY_MSG_FAKE_MOVE, + sendMessage(BARRIER_MSG_FAKE_MOVE, static_cast(x), static_cast(y)); } @@ -328,7 +328,7 @@ MSWindowsDesks::fakeMouseMove(SInt32 x, SInt32 y) const void MSWindowsDesks::fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const { - sendMessage(SYNERGY_MSG_FAKE_REL_MOVE, + sendMessage(BARRIER_MSG_FAKE_REL_MOVE, static_cast(dx), static_cast(dy)); } @@ -336,7 +336,7 @@ MSWindowsDesks::fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const void MSWindowsDesks::fakeMouseWheel(SInt32 xDelta, SInt32 yDelta) const { - sendMessage(SYNERGY_MSG_FAKE_WHEEL, xDelta, yDelta); + sendMessage(BARRIER_MSG_FAKE_WHEEL, xDelta, yDelta); } void @@ -418,7 +418,7 @@ MSWindowsDesks::createDeskWindowClass(bool isPrimary) const classInfo.hCursor = m_cursor; classInfo.hbrBackground = NULL; classInfo.lpszMenuName = NULL; - classInfo.lpszClassName = "SynergyDesk"; + classInfo.lpszClassName = "BarrierDesk"; classInfo.hIconSm = NULL; return RegisterClassEx(&classInfo); } @@ -513,7 +513,7 @@ MSWindowsDesks::deskMouseRelativeMove(SInt32 dx, SInt32 dy) const // restore acceleration. there's a slight chance we'll end up in // the wrong place if the user moves the cursor using this system's // mouse while simultaneously moving the mouse on the server - // system. that defeats the purpose of synergy so we'll assume + // system. that defeats the purpose of barrier so we'll assume // that won't happen. even if it does, the next mouse move will // correct the position. @@ -601,7 +601,7 @@ MSWindowsDesks::deskLeave(Desk* desk, HKL keyLayout) // if not using low-level hooks we have to also activate the // window to ensure we don't lose keyboard focus. // FIXME -- see if this can be avoided. if so then always - // disable the window (see handling of SYNERGY_MSG_SWITCH). + // disable the window (see handling of BARRIER_MSG_SWITCH). if (!desk->m_lowLevel) { SetActiveWindow(desk->m_window); } @@ -666,7 +666,7 @@ MSWindowsDesks::deskThread(void* vdesk) // create a window. we use this window to hide the cursor. try { - desk->m_window = createWindow(m_deskClass, "SynergyDesk"); + desk->m_window = createWindow(m_deskClass, "BarrierDesk"); LOG((CLOG_DEBUG "desk %s window is 0x%08x", desk->m_name.c_str(), desk->m_window)); } catch (...) { @@ -689,7 +689,7 @@ MSWindowsDesks::deskThread(void* vdesk) DispatchMessage(&msg); continue; - case SYNERGY_MSG_SWITCH: + case BARRIER_MSG_SWITCH: if (m_isPrimary && !m_noHooks) { m_uninstall(); if (m_screensaverNotify) { @@ -718,45 +718,45 @@ MSWindowsDesks::deskThread(void* vdesk) } break; - case SYNERGY_MSG_ENTER: + case BARRIER_MSG_ENTER: m_isOnScreen = true; deskEnter(desk); break; - case SYNERGY_MSG_LEAVE: + case BARRIER_MSG_LEAVE: m_isOnScreen = false; m_keyLayout = (HKL)msg.wParam; deskLeave(desk, m_keyLayout); break; - case SYNERGY_MSG_FAKE_KEY: + case BARRIER_MSG_FAKE_KEY: keybd_event(HIBYTE(msg.lParam), LOBYTE(msg.lParam), (DWORD)msg.wParam, 0); break; - case SYNERGY_MSG_FAKE_BUTTON: + case BARRIER_MSG_FAKE_BUTTON: if (msg.wParam != 0) { mouse_event((DWORD)msg.wParam, 0, 0, (DWORD)msg.lParam, 0); } break; - case SYNERGY_MSG_FAKE_MOVE: + case BARRIER_MSG_FAKE_MOVE: deskMouseMove(static_cast(msg.wParam), static_cast(msg.lParam)); break; - case SYNERGY_MSG_FAKE_REL_MOVE: + case BARRIER_MSG_FAKE_REL_MOVE: deskMouseRelativeMove(static_cast(msg.wParam), static_cast(msg.lParam)); break; - case SYNERGY_MSG_FAKE_WHEEL: + case BARRIER_MSG_FAKE_WHEEL: // XXX -- add support for x-axis scrolling if (msg.lParam != 0) { mouse_event(MOUSEEVENTF_WHEEL, 0, 0, (DWORD)msg.lParam, 0); } break; - case SYNERGY_MSG_CURSOR_POS: { + case BARRIER_MSG_CURSOR_POS: { POINT* pos = reinterpret_cast(msg.wParam); if (!GetCursorPos(pos)) { pos->x = m_xCenter; @@ -765,11 +765,11 @@ MSWindowsDesks::deskThread(void* vdesk) break; } - case SYNERGY_MSG_SYNC_KEYS: + case BARRIER_MSG_SYNC_KEYS: m_updateKeys->run(); break; - case SYNERGY_MSG_SCREENSAVER: + case BARRIER_MSG_SCREENSAVER: if (!m_noHooks) { if (msg.wParam != 0) { m_installScreensaver(); @@ -780,9 +780,9 @@ MSWindowsDesks::deskThread(void* vdesk) } break; - case SYNERGY_MSG_FAKE_INPUT: - keybd_event(SYNERGY_HOOK_FAKE_INPUT_VIRTUAL_KEY, - SYNERGY_HOOK_FAKE_INPUT_SCANCODE, + case BARRIER_MSG_FAKE_INPUT: + keybd_event(BARRIER_HOOK_FAKE_INPUT_VIRTUAL_KEY, + BARRIER_HOOK_FAKE_INPUT_SCANCODE, msg.wParam ? 0 : KEYEVENTF_KEYUP, 0); break; } @@ -868,7 +868,7 @@ MSWindowsDesks::checkDesk() // show cursor on previous desk bool wasOnScreen = m_isOnScreen; if (!wasOnScreen) { - sendMessage(SYNERGY_MSG_ENTER, 0, 0); + sendMessage(BARRIER_MSG_ENTER, 0, 0); } // check for desk accessibility change. we don't get events @@ -891,11 +891,11 @@ MSWindowsDesks::checkDesk() // switch desk m_activeDesk = desk; m_activeDeskName = name; - sendMessage(SYNERGY_MSG_SWITCH, 0, 0); + sendMessage(BARRIER_MSG_SWITCH, 0, 0); // hide cursor on new desk if (!wasOnScreen) { - sendMessage(SYNERGY_MSG_LEAVE, (WPARAM)m_keyLayout, 0); + sendMessage(BARRIER_MSG_LEAVE, (WPARAM)m_keyLayout, 0); } // update keys if necessary @@ -905,7 +905,7 @@ MSWindowsDesks::checkDesk() } else if (name != m_activeDeskName) { // screen saver might have started - PostThreadMessage(m_threadID, SYNERGY_MSG_SCREEN_SAVER, TRUE, 0); + PostThreadMessage(m_threadID, BARRIER_MSG_SCREEN_SAVER, TRUE, 0); } } @@ -937,7 +937,7 @@ MSWindowsDesks::handleCheckDesk(const Event&, void*) if (m_isPrimary) { BOOL running; SystemParametersInfo(SPI_GETSCREENSAVERRUNNING, 0, &running, FALSE); - PostThreadMessage(m_threadID, SYNERGY_MSG_SCREEN_SAVER, running, 0); + PostThreadMessage(m_threadID, BARRIER_MSG_SCREEN_SAVER, running, 0); } } diff --git a/src/lib/platform/MSWindowsDesks.h b/src/lib/platform/MSWindowsDesks.h index d12900a1..37240f8a 100644 --- a/src/lib/platform/MSWindowsDesks.h +++ b/src/lib/platform/MSWindowsDesks.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -19,9 +19,9 @@ #pragma once #include "synwinhk/synwinhk.h" -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" -#include "synergy/option_types.h" +#include "barrier/key_types.h" +#include "barrier/mouse_types.h" +#include "barrier/option_types.h" #include "mt/CondVar.h" #include "mt/Mutex.h" #include "base/String.h" @@ -46,9 +46,9 @@ desk at a time, you can't switch desks if the thread has any hooks installed or owns any windows, windows cannot exist on multiple desks at once, etc. Basically, they're useless except for running the login window or the screensaver, which is what they're used -for. Synergy must deal with them mainly because of the login +for. Barrier must deal with them mainly because of the login window and screensaver but users can create their own desks and -synergy should work on those too. +barrier should work on those too. This class encapsulates all the desk nastiness. Clients of this object don't have to know anything about desks. diff --git a/src/lib/platform/MSWindowsDropTarget.cpp b/src/lib/platform/MSWindowsDropTarget.cpp index 3c9f7ccd..d6478083 100644 --- a/src/lib/platform/MSWindowsDropTarget.cpp +++ b/src/lib/platform/MSWindowsDropTarget.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/MSWindowsDropTarget.h b/src/lib/platform/MSWindowsDropTarget.h index cf60480a..6d608456 100644 --- a/src/lib/platform/MSWindowsDropTarget.h +++ b/src/lib/platform/MSWindowsDropTarget.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/MSWindowsEventQueueBuffer.cpp b/src/lib/platform/MSWindowsEventQueueBuffer.cpp index b1203f9a..694f4a5f 100644 --- a/src/lib/platform/MSWindowsEventQueueBuffer.cpp +++ b/src/lib/platform/MSWindowsEventQueueBuffer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -40,7 +40,7 @@ MSWindowsEventQueueBuffer::MSWindowsEventQueueBuffer(IEventQueue* events) : m_thread = GetCurrentThreadId(); // create a message type for custom events - m_userEvent = RegisterWindowMessage("SYNERGY_USER_EVENT"); + m_userEvent = RegisterWindowMessage("BARRIER_USER_EVENT"); // get message type for daemon quit m_daemonQuit = ArchMiscWindows::getDaemonQuitMessage(); diff --git a/src/lib/platform/MSWindowsEventQueueBuffer.h b/src/lib/platform/MSWindowsEventQueueBuffer.h index 872684e4..6a0f9f90 100644 --- a/src/lib/platform/MSWindowsEventQueueBuffer.h +++ b/src/lib/platform/MSWindowsEventQueueBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsHook.cpp b/src/lib/platform/MSWindowsHook.cpp index b81d9373..23cdb75e 100644 --- a/src/lib/platform/MSWindowsHook.cpp +++ b/src/lib/platform/MSWindowsHook.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Chris Schoeneman * @@ -18,7 +18,7 @@ #include "platform/MSWindowsHook.h" -#include "synergy/XScreen.h" +#include "barrier/XScreen.h" #include "base/Log.h" static const char* g_name = "synwinhk"; diff --git a/src/lib/platform/MSWindowsHook.h b/src/lib/platform/MSWindowsHook.h index 988528f8..fa836c73 100644 --- a/src/lib/platform/MSWindowsHook.h +++ b/src/lib/platform/MSWindowsHook.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsKeyState.cpp b/src/lib/platform/MSWindowsKeyState.cpp index 4e093bd3..2f29f72f 100644 --- a/src/lib/platform/MSWindowsKeyState.cpp +++ b/src/lib/platform/MSWindowsKeyState.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -37,7 +37,7 @@ // MSWindowsKeyState // -// map virtual keys to synergy key enumeration +// map virtual keys to barrier key enumeration const KeyID MSWindowsKeyState::s_virtualKey[] = { /* 0x000 */ { kKeyNone }, // reserved @@ -593,7 +593,7 @@ MSWindowsKeyState::MSWindowsKeyState( } MSWindowsKeyState::MSWindowsKeyState( - MSWindowsDesks* desks, void* eventTarget, IEventQueue* events, synergy::KeyMap& keyMap) : + MSWindowsDesks* desks, void* eventTarget, IEventQueue* events, barrier::KeyMap& keyMap) : KeyState(events, keyMap), m_eventTarget(eventTarget), m_desks(desks), @@ -922,7 +922,7 @@ MSWindowsKeyState::pollPressedKeys(KeyButtonSet& pressedKeys) const } void -MSWindowsKeyState::getKeyMap(synergy::KeyMap& keyMap) +MSWindowsKeyState::getKeyMap(barrier::KeyMap& keyMap) { // update keyboard groups if (getGroups(m_groups)) { @@ -938,7 +938,7 @@ MSWindowsKeyState::getKeyMap(synergy::KeyMap& keyMap) memset(m_virtualKeyToButton, 0, sizeof(m_virtualKeyToButton)); m_keyToVKMap.clear(); - synergy::KeyMap::KeyItem item; + barrier::KeyMap::KeyItem item; SInt32 numGroups = (SInt32)m_groups.size(); for (SInt32 g = 0; g < numGroups; ++g) { item.m_group = g; @@ -1117,7 +1117,7 @@ MSWindowsKeyState::getKeyMap(synergy::KeyMap& keyMap) item.m_client = m_buttonToVK[i]; // get flags for modifier keys - synergy::KeyMap::initModifierKey(item); + barrier::KeyMap::initModifierKey(item); if (item.m_id == 0) { // translate virtual key to a character with and without @@ -1365,7 +1365,7 @@ MSWindowsKeyState::mapButtonToVirtualKey(KeyButton button) const } KeyID -MSWindowsKeyState::getIDForKey(synergy::KeyMap::KeyItem& item, +MSWindowsKeyState::getIDForKey(barrier::KeyMap::KeyItem& item, KeyButton button, UINT virtualKey, PBYTE keyState, HKL hkl) const { @@ -1377,7 +1377,7 @@ MSWindowsKeyState::getIDForKey(synergy::KeyMap::KeyItem& item, switch (n) { case -1: - return synergy::KeyMap::getDeadKey(id); + return barrier::KeyMap::getDeadKey(id); default: case 0: @@ -1396,7 +1396,7 @@ MSWindowsKeyState::getIDForKey(synergy::KeyMap::KeyItem& item, } void -MSWindowsKeyState::addKeyEntry(synergy::KeyMap& keyMap, synergy::KeyMap::KeyItem& item) +MSWindowsKeyState::addKeyEntry(barrier::KeyMap& keyMap, barrier::KeyMap::KeyItem& item) { keyMap.addKeyEntry(item); if (item.m_group == 0) { diff --git a/src/lib/platform/MSWindowsKeyState.h b/src/lib/platform/MSWindowsKeyState.h index fcbd5d98..b226d8bd 100644 --- a/src/lib/platform/MSWindowsKeyState.h +++ b/src/lib/platform/MSWindowsKeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "barrier/KeyState.h" #include "base/String.h" #include "common/stdvector.h" @@ -37,7 +37,7 @@ This class maps KeyIDs to keystrokes. class MSWindowsKeyState : public KeyState { public: MSWindowsKeyState(MSWindowsDesks* desks, void* eventTarget, IEventQueue* events); - MSWindowsKeyState(MSWindowsDesks* desks, void* eventTarget, IEventQueue* events, synergy::KeyMap& keyMap); + MSWindowsKeyState(MSWindowsDesks* desks, void* eventTarget, IEventQueue* events, barrier::KeyMap& keyMap); virtual ~MSWindowsKeyState(); //! @name manipulators @@ -161,7 +161,7 @@ public: protected: // KeyState overrides - virtual void getKeyMap(synergy::KeyMap& keyMap); + virtual void getKeyMap(barrier::KeyMap& keyMap); virtual void fakeKey(const Keystroke& keystroke); virtual KeyModifierMask& getActiveModifiersRValue(); @@ -175,11 +175,11 @@ private: bool getGroups(GroupList&) const; void setWindowGroup(SInt32 group); - KeyID getIDForKey(synergy::KeyMap::KeyItem& item, + KeyID getIDForKey(barrier::KeyMap::KeyItem& item, KeyButton button, UINT virtualKey, PBYTE keyState, HKL hkl) const; - void addKeyEntry(synergy::KeyMap& keyMap, synergy::KeyMap::KeyItem& item); + void addKeyEntry(barrier::KeyMap& keyMap, barrier::KeyMap::KeyItem& item); void init(); diff --git a/src/lib/platform/MSWindowsScreen.cpp b/src/lib/platform/MSWindowsScreen.cpp index 080db53d..18e7a972 100644 --- a/src/lib/platform/MSWindowsScreen.cpp +++ b/src/lib/platform/MSWindowsScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -25,12 +25,12 @@ #include "platform/MSWindowsEventQueueBuffer.h" #include "platform/MSWindowsKeyState.h" #include "platform/MSWindowsScreenSaver.h" -#include "synergy/Clipboard.h" -#include "synergy/KeyMap.h" -#include "synergy/XScreen.h" -#include "synergy/App.h" -#include "synergy/ArgsBase.h" -#include "synergy/ClientApp.h" +#include "barrier/Clipboard.h" +#include "barrier/KeyMap.h" +#include "barrier/XScreen.h" +#include "barrier/App.h" +#include "barrier/ArgsBase.h" +#include "barrier/ClientApp.h" #include "mt/Lock.h" #include "mt/Thread.h" #include "arch/win32/ArchMiscWindows.h" @@ -146,7 +146,7 @@ MSWindowsScreen::MSWindowsScreen( updateScreenShape(); m_class = createWindowClass(); - m_window = createWindow(m_class, "Synergy"); + m_window = createWindow(m_class, "Barrier"); forceShowCursor(); LOG((CLOG_DEBUG "screen shape: %d,%d %dx%d %s", m_x, m_y, m_w, m_h, m_multimon ? "(multi-monitor)" : "")); LOG((CLOG_DEBUG "window is 0x%08x", m_window)); @@ -431,7 +431,7 @@ MSWindowsScreen::checkClipboards() // next reboot we do this double check. clipboard ownership // won't be reflected on other screens until we leave but at // least the clipboard itself will work. - if (m_ownClipboard && !MSWindowsClipboard::isOwnedBySynergy()) { + if (m_ownClipboard && !MSWindowsClipboard::isOwnedByBarrier()) { LOG((CLOG_DEBUG "clipboard changed: lost ownership and no notification received")); m_ownClipboard = false; sendClipboardEvent(m_events->forClipboard().clipboardGrabbed(), kClipboardClipboard); @@ -553,8 +553,8 @@ MSWindowsScreen::warpCursor(SInt32 x, SInt32 y) // remove all input events before and including warp MSG msg; - while (PeekMessage(&msg, NULL, SYNERGY_MSG_INPUT_FIRST, - SYNERGY_MSG_INPUT_LAST, PM_REMOVE)) { + while (PeekMessage(&msg, NULL, BARRIER_MSG_INPUT_FIRST, + BARRIER_MSG_INPUT_LAST, PM_REMOVE)) { // do nothing } @@ -638,11 +638,11 @@ MSWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask) else { m_oldHotKeyIDs.push_back(id); m_hotKeys.erase(id); - LOG((CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", synergy::KeyMap::formatKey(key, mask).c_str(), key, mask)); + LOG((CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", barrier::KeyMap::formatKey(key, mask).c_str(), key, mask)); return 0; } - LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", synergy::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); + LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", barrier::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); return id; } @@ -849,7 +849,7 @@ MSWindowsScreen::createWindowClass() const classInfo.hCursor = NULL; classInfo.hbrBackground = NULL; classInfo.lpszMenuName = NULL; - classInfo.lpszClassName = "Synergy"; + classInfo.lpszClassName = "Barrier"; classInfo.hIconSm = NULL; return RegisterClassEx(&classInfo); } @@ -974,10 +974,10 @@ MSWindowsScreen::onPreDispatch(HWND hwnd, { // handle event switch (message) { - case SYNERGY_MSG_SCREEN_SAVER: + case BARRIER_MSG_SCREEN_SAVER: return onScreensaver(wParam != 0); - case SYNERGY_MSG_DEBUG: + case BARRIER_MSG_DEBUG: LOG((CLOG_DEBUG1 "hook: 0x%08x 0x%08x", wParam, lParam)); return true; } @@ -997,24 +997,24 @@ MSWindowsScreen::onPreDispatchPrimary(HWND, // handle event switch (message) { - case SYNERGY_MSG_MARK: + case BARRIER_MSG_MARK: return onMark(static_cast(wParam)); - case SYNERGY_MSG_KEY: + case BARRIER_MSG_KEY: return onKey(wParam, lParam); - case SYNERGY_MSG_MOUSE_BUTTON: + case BARRIER_MSG_MOUSE_BUTTON: return onMouseButton(wParam, lParam); - case SYNERGY_MSG_MOUSE_MOVE: + case BARRIER_MSG_MOUSE_MOVE: return onMouseMove(static_cast(wParam), static_cast(lParam)); - case SYNERGY_MSG_MOUSE_WHEEL: + case BARRIER_MSG_MOUSE_WHEEL: // XXX -- support x-axis scrolling return onMouseWheel(0, static_cast(wParam)); - case SYNERGY_MSG_PRE_WARP: + case BARRIER_MSG_PRE_WARP: { // save position to compute delta of next motion saveMousePosition(static_cast(wParam), static_cast(lParam)); @@ -1026,13 +1026,13 @@ MSWindowsScreen::onPreDispatchPrimary(HWND, // event. MSG msg; do { - GetMessage(&msg, NULL, SYNERGY_MSG_MOUSE_MOVE, - SYNERGY_MSG_POST_WARP); - } while (msg.message != SYNERGY_MSG_POST_WARP); + GetMessage(&msg, NULL, BARRIER_MSG_MOUSE_MOVE, + BARRIER_MSG_POST_WARP); + } while (msg.message != BARRIER_MSG_POST_WARP); } return true; - case SYNERGY_MSG_POST_WARP: + case BARRIER_MSG_POST_WARP: LOG((CLOG_WARN "unmatched post warp")); return true; @@ -1337,7 +1337,7 @@ MSWindowsScreen::onMouseButton(WPARAM wParam, LPARAM lParam) } // here's how mouse movements are sent across the network to a client: -// 1. synergy checks the mouse position on server screen +// 1. barrier checks the mouse position on server screen // 2. records the delta (current x,y minus last x,y) // 3. records the current x,y as "last" (so we can calc delta next time) // 4. on the server, puts the cursor back to the center of the screen @@ -1430,14 +1430,14 @@ MSWindowsScreen::onScreensaver(bool activated) // send SC_SCREENSAVE until the screen saver starts, even if // the screen saver is disabled! MSG msg; - if (PeekMessage(&msg, NULL, SYNERGY_MSG_SCREEN_SAVER, - SYNERGY_MSG_SCREEN_SAVER, PM_NOREMOVE)) { + if (PeekMessage(&msg, NULL, BARRIER_MSG_SCREEN_SAVER, + BARRIER_MSG_SCREEN_SAVER, PM_NOREMOVE)) { return true; } if (activated) { if (!m_screensaverActive && - m_screensaver->checkStarted(SYNERGY_MSG_SCREEN_SAVER, FALSE, 0)) { + m_screensaver->checkStarted(BARRIER_MSG_SCREEN_SAVER, FALSE, 0)) { m_screensaverActive = true; sendEvent(m_events->forIPrimaryScreen().screensaverActivated()); @@ -1497,7 +1497,7 @@ MSWindowsScreen::onClipboardChange() { // now notify client that somebody changed the clipboard (unless // we're the owner). - if (!MSWindowsClipboard::isOwnedBySynergy()) { + if (!MSWindowsClipboard::isOwnedByBarrier()) { if (m_ownClipboard) { LOG((CLOG_DEBUG "clipboard changed: lost ownership")); m_ownClipboard = false; @@ -1506,7 +1506,7 @@ MSWindowsScreen::onClipboardChange() } } else if (!m_ownClipboard) { - LOG((CLOG_DEBUG "clipboard changed: synergy owned")); + LOG((CLOG_DEBUG "clipboard changed: barrier owned")); m_ownClipboard = true; } @@ -1517,7 +1517,7 @@ void MSWindowsScreen::warpCursorNoFlush(SInt32 x, SInt32 y) { // send an event that we can recognize before the mouse warp - PostThreadMessage(GetCurrentThreadId(), SYNERGY_MSG_PRE_WARP, x, y); + PostThreadMessage(GetCurrentThreadId(), BARRIER_MSG_PRE_WARP, x, y); // warp mouse. hopefully this inserts a mouse motion event // between the previous message and the following message. @@ -1565,7 +1565,7 @@ MSWindowsScreen::warpCursorNoFlush(SInt32 x, SInt32 y) ARCH->sleep(0.0); // send an event that we can recognize after the mouse warp - PostThreadMessage(GetCurrentThreadId(), SYNERGY_MSG_POST_WARP, 0, 0); + PostThreadMessage(GetCurrentThreadId(), BARRIER_MSG_POST_WARP, 0, 0); } void @@ -1575,7 +1575,7 @@ MSWindowsScreen::nextMark() ++m_mark; // mark point in message queue where the mark was changed - PostThreadMessage(GetCurrentThreadId(), SYNERGY_MSG_MARK, m_mark, 0); + PostThreadMessage(GetCurrentThreadId(), BARRIER_MSG_MARK, m_mark, 0); } bool diff --git a/src/lib/platform/MSWindowsScreen.h b/src/lib/platform/MSWindowsScreen.h index 4b1f2c18..56c497f6 100644 --- a/src/lib/platform/MSWindowsScreen.h +++ b/src/lib/platform/MSWindowsScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,8 +19,8 @@ #pragma once #include "platform/MSWindowsHook.h" -#include "synergy/PlatformScreen.h" -#include "synergy/DragInformation.h" +#include "barrier/PlatformScreen.h" +#include "barrier/DragInformation.h" #include "synwinhk/synwinhk.h" #include "mt/CondVar.h" #include "mt/Mutex.h" diff --git a/src/lib/platform/MSWindowsScreenSaver.cpp b/src/lib/platform/MSWindowsScreenSaver.cpp index 96771b27..f9c15fb9 100644 --- a/src/lib/platform/MSWindowsScreenSaver.cpp +++ b/src/lib/platform/MSWindowsScreenSaver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsScreenSaver.h b/src/lib/platform/MSWindowsScreenSaver.h index c7441283..91df1818 100644 --- a/src/lib/platform/MSWindowsScreenSaver.h +++ b/src/lib/platform/MSWindowsScreenSaver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/IScreenSaver.h" +#include "barrier/IScreenSaver.h" #include "base/String.h" #define WIN32_LEAN_AND_MEAN diff --git a/src/lib/platform/MSWindowsSession.cpp b/src/lib/platform/MSWindowsSession.cpp index b70de74c..63e8d8f5 100644 --- a/src/lib/platform/MSWindowsSession.cpp +++ b/src/lib/platform/MSWindowsSession.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ #include "platform/MSWindowsSession.h" #include "arch/win32/XArchWindows.h" -#include "synergy/XSynergy.h" +#include "barrier/XBarrier.h" #include "base/Log.h" #include diff --git a/src/lib/platform/MSWindowsSession.h b/src/lib/platform/MSWindowsSession.h index 8c48117d..d777141d 100644 --- a/src/lib/platform/MSWindowsSession.h +++ b/src/lib/platform/MSWindowsSession.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/MSWindowsUtil.cpp b/src/lib/platform/MSWindowsUtil.cpp index 7ce6e2dc..4b51781c 100644 --- a/src/lib/platform/MSWindowsUtil.cpp +++ b/src/lib/platform/MSWindowsUtil.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -52,8 +52,8 @@ MSWindowsUtil::getErrorString(HINSTANCE hinstance, DWORD error, DWORD id) (LPTSTR)&buffer, 0, NULL) == 0) { - String errorString = synergy::string::sprintf("%d", error); - return synergy::string::format(getString(hinstance, id).c_str(), + String errorString = barrier::string::sprintf("%d", error); + return barrier::string::format(getString(hinstance, id).c_str(), errorString.c_str()); } else { diff --git a/src/lib/platform/MSWindowsUtil.h b/src/lib/platform/MSWindowsUtil.h index 275288b4..95ec2cfc 100644 --- a/src/lib/platform/MSWindowsUtil.h +++ b/src/lib/platform/MSWindowsUtil.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/MSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp index 3f37d368..34454f7e 100644 --- a/src/lib/platform/MSWindowsWatchdog.cpp +++ b/src/lib/platform/MSWindowsWatchdog.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2009 Chris Schoeneman * @@ -22,8 +22,8 @@ #include "ipc/IpcServer.h" #include "ipc/IpcMessage.h" #include "ipc/Ipc.h" -#include "synergy/App.h" -#include "synergy/ArgsBase.h" +#include "barrier/App.h" +#include "barrier/ArgsBase.h" #include "mt/Thread.h" #include "arch/win32/ArchDaemonWindows.h" #include "arch/win32/XArchWindows.h" @@ -138,7 +138,7 @@ MSWindowsWatchdog::getUserToken(LPSECURITY_ATTRIBUTES security) { // always elevate if we are at the vista/7 login screen. we could also // elevate for the uac dialog (consent.exe) but this would be pointless, - // since synergy would re-launch as non-elevated after the desk switch, + // since barrier would re-launch as non-elevated after the desk switch, // and so would be unusable with the new elevated process taking focus. if (m_elevateProcess || m_autoElevated @@ -460,9 +460,9 @@ MSWindowsWatchdog::shutdownProcess(HANDLE handle, DWORD pid, int timeout) double elapsed = (ARCH->time() - start); if (elapsed > timeout) { // if timeout reached, kill forcefully. - // calling TerminateProcess on synergy is very bad! + // calling TerminateProcess on barrier is very bad! // it causes the hook DLL to stay loaded in some apps, - // making it impossible to start synergy again. + // making it impossible to start barrier again. LOG((CLOG_WARN "shutdown timed out after %d secs, forcefully terminating", (int)elapsed)); TerminateProcess(handle, kExitSuccess); break; @@ -501,8 +501,8 @@ MSWindowsWatchdog::shutdownExistingProcesses() // make sure we're not checking the system process if (entry.th32ProcessID != 0) { - if (_stricmp(entry.szExeFile, "synergyc.exe") == 0 || - _stricmp(entry.szExeFile, "synergys.exe") == 0) { + if (_stricmp(entry.szExeFile, "barrierc.exe") == 0 || + _stricmp(entry.szExeFile, "barriers.exe") == 0) { HANDLE handle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, entry.th32ProcessID); shutdownProcess(handle, entry.th32ProcessID, 10); diff --git a/src/lib/platform/MSWindowsWatchdog.h b/src/lib/platform/MSWindowsWatchdog.h index 76546539..b741977a 100644 --- a/src/lib/platform/MSWindowsWatchdog.h +++ b/src/lib/platform/MSWindowsWatchdog.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2009 Chris Schoeneman * @@ -19,7 +19,7 @@ #pragma once #include "platform/MSWindowsSession.h" -#include "synergy/XSynergy.h" +#include "barrier/XBarrier.h" #include "arch/IArchMultithread.h" #define WIN32_LEAN_AND_MEAN @@ -87,9 +87,9 @@ private: /*! An error occured in the process watchdog. */ -class XMSWindowsWatchdogError : public XSynergy { +class XMSWindowsWatchdogError : public XBarrier { public: - XMSWindowsWatchdogError(const String& msg) : XSynergy(msg) { } + XMSWindowsWatchdogError(const String& msg) : XBarrier(msg) { } // XBase overrides virtual String getWhat() const throw() { return what(); } diff --git a/src/lib/platform/OSXClipboard.cpp b/src/lib/platform/OSXClipboard.cpp index 7212175c..710b4719 100644 --- a/src/lib/platform/OSXClipboard.cpp +++ b/src/lib/platform/OSXClipboard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -18,7 +18,7 @@ #include "platform/OSXClipboard.h" -#include "synergy/Clipboard.h" +#include "barrier/Clipboard.h" #include "platform/OSXClipboardUTF16Converter.h" #include "platform/OSXClipboardTextConverter.h" #include "platform/OSXClipboardBMPConverter.h" diff --git a/src/lib/platform/OSXClipboard.h b/src/lib/platform/OSXClipboard.h index e9d01a70..ba25c321 100644 --- a/src/lib/platform/OSXClipboard.h +++ b/src/lib/platform/OSXClipboard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/IClipboard.h" +#include "barrier/IClipboard.h" #include #include @@ -31,8 +31,8 @@ public: OSXClipboard(); virtual ~OSXClipboard(); - //! Test if clipboard is owned by synergy - static bool isOwnedBySynergy(); + //! Test if clipboard is owned by barrier + static bool isOwnedByBarrier(); // IClipboard overrides virtual bool empty(); diff --git a/src/lib/platform/OSXClipboardAnyBitmapConverter.cpp b/src/lib/platform/OSXClipboardAnyBitmapConverter.cpp index bab48a0f..73f64c73 100644 --- a/src/lib/platform/OSXClipboardAnyBitmapConverter.cpp +++ b/src/lib/platform/OSXClipboardAnyBitmapConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * Patch by Ryan Chapman * diff --git a/src/lib/platform/OSXClipboardAnyBitmapConverter.h b/src/lib/platform/OSXClipboardAnyBitmapConverter.h index c54a4a8b..277e75d9 100644 --- a/src/lib/platform/OSXClipboardAnyBitmapConverter.h +++ b/src/lib/platform/OSXClipboardAnyBitmapConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * Patch by Ryan Chapman * diff --git a/src/lib/platform/OSXClipboardAnyTextConverter.cpp b/src/lib/platform/OSXClipboardAnyTextConverter.cpp index 27711bc4..7095006e 100644 --- a/src/lib/platform/OSXClipboardAnyTextConverter.cpp +++ b/src/lib/platform/OSXClipboardAnyTextConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXClipboardAnyTextConverter.h b/src/lib/platform/OSXClipboardAnyTextConverter.h index 3a95d496..ea42994c 100644 --- a/src/lib/platform/OSXClipboardAnyTextConverter.h +++ b/src/lib/platform/OSXClipboardAnyTextConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXClipboardBMPConverter.cpp b/src/lib/platform/OSXClipboardBMPConverter.cpp index 6639f11f..51c44ec7 100644 --- a/src/lib/platform/OSXClipboardBMPConverter.cpp +++ b/src/lib/platform/OSXClipboardBMPConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * Patch by Ryan Chapman * diff --git a/src/lib/platform/OSXClipboardBMPConverter.h b/src/lib/platform/OSXClipboardBMPConverter.h index 48f888aa..400831d9 100644 --- a/src/lib/platform/OSXClipboardBMPConverter.h +++ b/src/lib/platform/OSXClipboardBMPConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * Patch by Ryan Chapman * diff --git a/src/lib/platform/OSXClipboardHTMLConverter.cpp b/src/lib/platform/OSXClipboardHTMLConverter.cpp index 03caaa09..b5fdb770 100644 --- a/src/lib/platform/OSXClipboardHTMLConverter.cpp +++ b/src/lib/platform/OSXClipboardHTMLConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * Patch by Ryan Chapman * diff --git a/src/lib/platform/OSXClipboardHTMLConverter.h b/src/lib/platform/OSXClipboardHTMLConverter.h index 058f0d89..21c2b828 100644 --- a/src/lib/platform/OSXClipboardHTMLConverter.h +++ b/src/lib/platform/OSXClipboardHTMLConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * Patch by Ryan Chapman * diff --git a/src/lib/platform/OSXClipboardTextConverter.cpp b/src/lib/platform/OSXClipboardTextConverter.cpp index 4c8bf66f..c18ad3fb 100644 --- a/src/lib/platform/OSXClipboardTextConverter.cpp +++ b/src/lib/platform/OSXClipboardTextConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXClipboardTextConverter.h b/src/lib/platform/OSXClipboardTextConverter.h index fd4f5c22..55d82cee 100644 --- a/src/lib/platform/OSXClipboardTextConverter.h +++ b/src/lib/platform/OSXClipboardTextConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXClipboardUTF16Converter.cpp b/src/lib/platform/OSXClipboardUTF16Converter.cpp index d2f07c27..02d8fa35 100644 --- a/src/lib/platform/OSXClipboardUTF16Converter.cpp +++ b/src/lib/platform/OSXClipboardUTF16Converter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXClipboardUTF16Converter.h b/src/lib/platform/OSXClipboardUTF16Converter.h index da52f1ea..10bb595f 100644 --- a/src/lib/platform/OSXClipboardUTF16Converter.h +++ b/src/lib/platform/OSXClipboardUTF16Converter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXDragSimulator.h b/src/lib/platform/OSXDragSimulator.h index 148fca04..cb361ca6 100644 --- a/src/lib/platform/OSXDragSimulator.h +++ b/src/lib/platform/OSXDragSimulator.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXDragSimulator.m b/src/lib/platform/OSXDragSimulator.m index 333abd00..affed383 100644 --- a/src/lib/platform/OSXDragSimulator.m +++ b/src/lib/platform/OSXDragSimulator.m @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXDragView.h b/src/lib/platform/OSXDragView.h index 9e706c58..9b8aa48f 100644 --- a/src/lib/platform/OSXDragView.h +++ b/src/lib/platform/OSXDragView.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXDragView.m b/src/lib/platform/OSXDragView.m index 4862e97a..6ebc5973 100644 --- a/src/lib/platform/OSXDragView.m +++ b/src/lib/platform/OSXDragView.m @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXEventQueueBuffer.cpp b/src/lib/platform/OSXEventQueueBuffer.cpp index 2a5bd220..8e18afc3 100644 --- a/src/lib/platform/OSXEventQueueBuffer.cpp +++ b/src/lib/platform/OSXEventQueueBuffer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXEventQueueBuffer.h b/src/lib/platform/OSXEventQueueBuffer.h index d2e46b8b..28c4a5d0 100644 --- a/src/lib/platform/OSXEventQueueBuffer.h +++ b/src/lib/platform/OSXEventQueueBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp index 95492340..482d7c13 100644 --- a/src/lib/platform/OSXKeyState.cpp +++ b/src/lib/platform/OSXKeyState.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -136,7 +136,7 @@ OSXKeyState::OSXKeyState(IEventQueue* events) : init(); } -OSXKeyState::OSXKeyState(IEventQueue* events, synergy::KeyMap& keyMap) : +OSXKeyState::OSXKeyState(IEventQueue* events, barrier::KeyMap& keyMap) : KeyState(events, keyMap) { init(); @@ -427,7 +427,7 @@ OSXKeyState::pollPressedKeys(KeyButtonSet& pressedKeys) const } void -OSXKeyState::getKeyMap(synergy::KeyMap& keyMap) +OSXKeyState::getKeyMap(barrier::KeyMap& keyMap) { // update keyboard groups if (getGroups(m_groups)) { @@ -604,10 +604,10 @@ OSXKeyState::fakeKey(const Keystroke& keystroke) } void -OSXKeyState::getKeyMapForSpecialKeys(synergy::KeyMap& keyMap, SInt32 group) const +OSXKeyState::getKeyMapForSpecialKeys(barrier::KeyMap& keyMap, SInt32 group) const { // special keys are insensitive to modifers and none are dead keys - synergy::KeyMap::KeyItem item; + barrier::KeyMap::KeyItem item; for (size_t i = 0; i < sizeof(s_controlKeys) / sizeof(s_controlKeys[0]); ++i) { const KeyEntry& entry = s_controlKeys[i]; @@ -618,7 +618,7 @@ OSXKeyState::getKeyMapForSpecialKeys(synergy::KeyMap& keyMap, SInt32 group) cons item.m_sensitive = 0; item.m_dead = false; item.m_client = 0; - synergy::KeyMap::initModifierKey(item); + barrier::KeyMap::initModifierKey(item); keyMap.addKeyEntry(item); if (item.m_lock) { @@ -635,7 +635,7 @@ OSXKeyState::getKeyMapForSpecialKeys(synergy::KeyMap& keyMap, SInt32 group) cons } bool -OSXKeyState::getKeyMap(synergy::KeyMap& keyMap, +OSXKeyState::getKeyMap(barrier::KeyMap& keyMap, SInt32 group, const IOSXKeyResource& r) const { if (!r.isValid()) { @@ -649,7 +649,7 @@ OSXKeyState::getKeyMap(synergy::KeyMap& keyMap, std::vector > buttonKeys(r.getNumTables()); // iterate over each button - synergy::KeyMap::KeyItem item; + barrier::KeyMap::KeyItem item; for (UInt32 i = 0; i < r.getNumButtons(); ++i) { item.m_button = mapVirtualKeyToKeyButton(i); @@ -659,7 +659,7 @@ OSXKeyState::getKeyMap(synergy::KeyMap& keyMap, // convert the entry in each table for this button to a KeyID for (UInt32 j = 0; j < r.getNumTables(); ++j) { buttonKeys[j].first = r.getKey(j, i); - buttonKeys[j].second = synergy::KeyMap::isDeadKey(buttonKeys[j].first); + buttonKeys[j].second = barrier::KeyMap::isDeadKey(buttonKeys[j].first); } // iterate over each character table @@ -682,7 +682,7 @@ OSXKeyState::getKeyMap(synergy::KeyMap& keyMap, item.m_group = group; item.m_dead = buttonKeys[j].second; item.m_client = buttonKeys[j].second ? 1 : 0; - synergy::KeyMap::initModifierKey(item); + barrier::KeyMap::initModifierKey(item); if (item.m_lock) { // all locking keys are half duplex on OS X keyMap.addHalfDuplexButton(i); @@ -753,7 +753,7 @@ OSXKeyState::getKeyMap(synergy::KeyMap& keyMap, } bool -OSXKeyState::mapSynergyHotKeyToMac(KeyID key, KeyModifierMask mask, +OSXKeyState::mapBarrierHotKeyToMac(KeyID key, KeyModifierMask mask, UInt32 &macVirtualKey, UInt32 &macModifierMask) const { // look up button for key diff --git a/src/lib/platform/OSXKeyState.h b/src/lib/platform/OSXKeyState.h index ac951671..4d92860c 100644 --- a/src/lib/platform/OSXKeyState.h +++ b/src/lib/platform/OSXKeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "barrier/KeyState.h" #include "common/stdmap.h" #include "common/stdset.h" #include "common/stdvector.h" @@ -37,7 +37,7 @@ public: typedef std::vector KeyIDs; OSXKeyState(IEventQueue* events); - OSXKeyState(IEventQueue* events, synergy::KeyMap& keyMap); + OSXKeyState(IEventQueue* events, barrier::KeyMap& keyMap); virtual ~OSXKeyState(); //! @name modifiers @@ -55,9 +55,9 @@ public: //! @name accessors //@{ - //! Convert OS X modifier mask to synergy mask + //! Convert OS X modifier mask to barrier mask /*! - Returns the synergy modifier mask corresponding to the OS X modifier + Returns the barrier modifier mask corresponding to the OS X modifier mask in \p mask. */ KeyModifierMask mapModifiersFromOSX(UInt32 mask) const; @@ -84,7 +84,7 @@ public: Calculates mac virtual key and mask for a key \p key and modifiers \p mask. Returns \c true if the key can be mapped, \c false otherwise. */ - bool mapSynergyHotKeyToMac(KeyID key, KeyModifierMask mask, + bool mapBarrierHotKeyToMac(KeyID key, KeyModifierMask mask, UInt32& macVirtualKey, UInt32& macModifierMask) const; @@ -101,19 +101,19 @@ public: CGEventFlags getModifierStateAsOSXFlags(); protected: // KeyState overrides - virtual void getKeyMap(synergy::KeyMap& keyMap); + virtual void getKeyMap(barrier::KeyMap& keyMap); virtual void fakeKey(const Keystroke& keystroke); private: class KeyResource; typedef std::vector GroupList; - // Add hard coded special keys to a synergy::KeyMap. + // Add hard coded special keys to a barrier::KeyMap. void getKeyMapForSpecialKeys( - synergy::KeyMap& keyMap, SInt32 group) const; + barrier::KeyMap& keyMap, SInt32 group) const; // Convert keyboard resource to a key map - bool getKeyMap(synergy::KeyMap& keyMap, + bool getKeyMap(barrier::KeyMap& keyMap, SInt32 group, const IOSXKeyResource& r) const; // Get the available keyboard groups @@ -157,7 +157,7 @@ private: const bool postDown); private: - // OS X uses a physical key if 0 for the 'A' key. synergy reserves + // OS X uses a physical key if 0 for the 'A' key. barrier reserves // KeyButton 0 so we offset all OS X physical key ids by this much // when used as a KeyButton and by minus this much to map a KeyButton // to a physical button. diff --git a/src/lib/platform/OSXMediaKeySimulator.h b/src/lib/platform/OSXMediaKeySimulator.h index 75145480..39739d26 100644 --- a/src/lib/platform/OSXMediaKeySimulator.h +++ b/src/lib/platform/OSXMediaKeySimulator.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #import -#include "synergy/key_types.h" +#include "barrier/key_types.h" #if defined(__cplusplus) extern "C" { diff --git a/src/lib/platform/OSXMediaKeySimulator.m b/src/lib/platform/OSXMediaKeySimulator.m index 646807e3..5aacd107 100644 --- a/src/lib/platform/OSXMediaKeySimulator.m +++ b/src/lib/platform/OSXMediaKeySimulator.m @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXMediaKeySupport.h b/src/lib/platform/OSXMediaKeySupport.h index 3cecaacf..d64e26e5 100644 --- a/src/lib/platform/OSXMediaKeySupport.h +++ b/src/lib/platform/OSXMediaKeySupport.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless. * * This package is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #import #import -#include "synergy/key_types.h" +#include "barrier/key_types.h" #if defined(__cplusplus) extern "C" { diff --git a/src/lib/platform/OSXMediaKeySupport.m b/src/lib/platform/OSXMediaKeySupport.m index 514f0daf..9c9dbc31 100644 --- a/src/lib/platform/OSXMediaKeySupport.m +++ b/src/lib/platform/OSXMediaKeySupport.m @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXPasteboardPeeker.h b/src/lib/platform/OSXPasteboardPeeker.h index 7d368a7e..5105262c 100644 --- a/src/lib/platform/OSXPasteboardPeeker.h +++ b/src/lib/platform/OSXPasteboardPeeker.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXPasteboardPeeker.m b/src/lib/platform/OSXPasteboardPeeker.m index de70a48d..ab39e262 100644 --- a/src/lib/platform/OSXPasteboardPeeker.m +++ b/src/lib/platform/OSXPasteboardPeeker.m @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXScreen.h b/src/lib/platform/OSXScreen.h index 668e713b..27cb7dfc 100644 --- a/src/lib/platform/OSXScreen.h +++ b/src/lib/platform/OSXScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -19,8 +19,8 @@ #pragma once #include "platform/OSXClipboard.h" -#include "synergy/PlatformScreen.h" -#include "synergy/DragInformation.h" +#include "barrier/PlatformScreen.h" +#include "barrier/DragInformation.h" #include "base/EventTypes.h" #include "common/stdmap.h" #include "common/stdvector.h" @@ -137,17 +137,17 @@ private: void showCursor(); void hideCursor(); - // map synergy mouse button to mac buttons - ButtonID mapSynergyButtonToMac(UInt16) const; + // map barrier mouse button to mac buttons + ButtonID mapBarrierButtonToMac(UInt16) const; - // map mac mouse button to synergy buttons - ButtonID mapMacButtonToSynergy(UInt16) const; + // map mac mouse button to barrier buttons + ButtonID mapMacButtonToBarrier(UInt16) const; - // map mac scroll wheel value to a synergy scroll wheel value - SInt32 mapScrollWheelToSynergy(SInt32) const; + // map mac scroll wheel value to a barrier scroll wheel value + SInt32 mapScrollWheelToBarrier(SInt32) const; - // map synergy scroll wheel value to a mac scroll wheel value - SInt32 mapScrollWheelFromSynergy(SInt32) const; + // map barrier scroll wheel value to a mac scroll wheel value + SInt32 mapScrollWheelFromBarrier(SInt32) const; // get the current scroll wheel speed double getScrollSpeed() const; diff --git a/src/lib/platform/OSXScreen.mm b/src/lib/platform/OSXScreen.mm index 0106ccf9..1d80521a 100644 --- a/src/lib/platform/OSXScreen.mm +++ b/src/lib/platform/OSXScreen.mm @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -27,9 +27,9 @@ #include "platform/OSXDragSimulator.h" #include "platform/OSXMediaKeySupport.h" #include "platform/OSXPasteboardPeeker.h" -#include "synergy/Clipboard.h" -#include "synergy/KeyMap.h" -#include "synergy/ClientApp.h" +#include "barrier/Clipboard.h" +#include "barrier/KeyMap.h" +#include "barrier/ClientApp.h" #include "mt/CondVar.h" #include "mt/Lock.h" #include "mt/Mutex.h" @@ -48,9 +48,9 @@ // This isn't in any Apple SDK that I know of as of yet. enum { - kSynergyEventMouseScroll = 11, - kSynergyMouseScrollAxisX = 'saxx', - kSynergyMouseScrollAxisY = 'saxy' + kBarrierEventMouseScroll = 11, + kBarrierMouseScrollAxisX = 'saxx', + kBarrierMouseScrollAxisY = 'saxy' }; enum { @@ -319,9 +319,9 @@ OSXScreen::getCursorCenter(SInt32& x, SInt32& y) const UInt32 OSXScreen::registerHotKey(KeyID key, KeyModifierMask mask) { - // get mac virtual key and modifier mask matching synergy key and mask + // get mac virtual key and modifier mask matching barrier key and mask UInt32 macKey, macMask; - if (!m_keyState->mapSynergyHotKeyToMac(key, mask, macKey, macMask)) { + if (!m_keyState->mapBarrierHotKeyToMac(key, mask, macKey, macMask)) { LOG((CLOG_DEBUG "could not map hotkey id=%04x mask=%04x", key, mask)); return 0; } @@ -361,13 +361,13 @@ OSXScreen::registerHotKey(KeyID key, KeyModifierMask mask) if (!okay) { m_oldHotKeyIDs.push_back(id); m_hotKeyToIDMap.erase(HotKeyItem(macKey, macMask)); - LOG((CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", synergy::KeyMap::formatKey(key, mask).c_str(), key, mask)); + LOG((CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", barrier::KeyMap::formatKey(key, mask).c_str(), key, mask)); return 0; } m_hotKeys.insert(std::make_pair(id, HotKeyItem(ref, macKey, macMask))); - LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", synergy::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); + LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", barrier::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); return id; } @@ -510,7 +510,7 @@ void OSXScreen::fakeMouseButton(ButtonID id, bool press) { // Buttons are indexed from one, but the button down array is indexed from zero - UInt32 index = mapSynergyButtonToMac(id) - kButtonLeft; + UInt32 index = mapBarrierButtonToMac(id) - kButtonLeft; if (index >= NumButtonIDs) { return; } @@ -676,8 +676,8 @@ OSXScreen::fakeMouseWheel(SInt32 xDelta, SInt32 yDelta) const // is the right choice here over kCGScrollEventUnitPixel CGEventRef scrollEvent = CGEventCreateScrollWheelEvent( NULL, kCGScrollEventUnitLine, 2, - mapScrollWheelFromSynergy(yDelta), - -mapScrollWheelFromSynergy(xDelta)); + mapScrollWheelFromBarrier(yDelta), + -mapScrollWheelFromBarrier(xDelta)); // Fix for sticky keys CGEventFlags modifiers = m_keyState->getModifierStateAsOSXFlags(); @@ -999,7 +999,7 @@ OSXScreen::handleSystemEvent(const Event& event, void*) switch (eventClass) { case kEventClassMouse: switch (GetEventKind(*carbonEvent)) { - case kSynergyEventMouseScroll: + case kBarrierEventMouseScroll: { OSStatus r; long xScroll; @@ -1007,7 +1007,7 @@ OSXScreen::handleSystemEvent(const Event& event, void*) // get scroll amount r = GetEventParameter(*carbonEvent, - kSynergyMouseScrollAxisX, + kBarrierMouseScrollAxisX, typeSInt32, NULL, sizeof(xScroll), @@ -1017,7 +1017,7 @@ OSXScreen::handleSystemEvent(const Event& event, void*) xScroll = 0; } r = GetEventParameter(*carbonEvent, - kSynergyMouseScrollAxisY, + kBarrierMouseScrollAxisY, typeSInt32, NULL, sizeof(yScroll), @@ -1028,8 +1028,8 @@ OSXScreen::handleSystemEvent(const Event& event, void*) } if (xScroll != 0 || yScroll != 0) { - onMouseWheel(-mapScrollWheelToSynergy(xScroll), - mapScrollWheelToSynergy(yScroll)); + onMouseWheel(-mapScrollWheelToBarrier(xScroll), + mapScrollWheelToBarrier(yScroll)); } } } @@ -1129,7 +1129,7 @@ bool OSXScreen::onMouseButton(bool pressed, UInt16 macButton) { // Buttons 2 and 3 are inverted on the mac - ButtonID button = mapMacButtonToSynergy(macButton); + ButtonID button = mapMacButtonToBarrier(macButton); if (pressed) { LOG((CLOG_DEBUG1 "event: button press button=%d", button)); @@ -1389,7 +1389,7 @@ OSXScreen::onHotKey(EventRef event) const } ButtonID -OSXScreen::mapSynergyButtonToMac(UInt16 button) const +OSXScreen::mapBarrierButtonToMac(UInt16 button) const { switch (button) { case 1: @@ -1404,7 +1404,7 @@ OSXScreen::mapSynergyButtonToMac(UInt16 button) const } ButtonID -OSXScreen::mapMacButtonToSynergy(UInt16 macButton) const +OSXScreen::mapMacButtonToBarrier(UInt16 macButton) const { switch (macButton) { case 1: @@ -1421,7 +1421,7 @@ OSXScreen::mapMacButtonToSynergy(UInt16 macButton) const } SInt32 -OSXScreen::mapScrollWheelToSynergy(SInt32 x) const +OSXScreen::mapScrollWheelToBarrier(SInt32 x) const { // return accelerated scrolling but not exponentially scaled as it is // on the mac. @@ -1430,7 +1430,7 @@ OSXScreen::mapScrollWheelToSynergy(SInt32 x) const } SInt32 -OSXScreen::mapScrollWheelFromSynergy(SInt32 x) const +OSXScreen::mapScrollWheelFromBarrier(SInt32 x) const { // use server's acceleration with a little boost since other platforms // take one wheel step as a larger step than the mac does. @@ -1885,7 +1885,7 @@ OSXScreen::HotKeyItem::operator<(const HotKeyItem& x) const } // Quartz event tap support for the secondary display. This makes sure that we -// will show the cursor if a local event comes in while synergy has the cursor +// will show the cursor if a local event comes in while barrier has the cursor // off the screen. CGEventRef OSXScreen::handleCGInputEventSecondary( @@ -1947,9 +1947,9 @@ OSXScreen::handleCGInputEvent(CGEventTapProxy proxy, return event; break; case kCGEventScrollWheel: - screen->onMouseWheel(screen->mapScrollWheelToSynergy( + screen->onMouseWheel(screen->mapScrollWheelToBarrier( CGEventGetIntegerValueField(event, kCGScrollWheelEventDeltaAxis2)), - screen->mapScrollWheelToSynergy( + screen->mapScrollWheelToBarrier( CGEventGetIntegerValueField(event, kCGScrollWheelEventDeltaAxis1))); break; case kCGEventKeyDown: diff --git a/src/lib/platform/OSXScreenSaver.cpp b/src/lib/platform/OSXScreenSaver.cpp index 49fe8fe8..a0282d97 100644 --- a/src/lib/platform/OSXScreenSaver.cpp +++ b/src/lib/platform/OSXScreenSaver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -19,7 +19,7 @@ #import "platform/OSXScreenSaver.h" #import "platform/OSXScreenSaverUtil.h" -#import "synergy/IPrimaryScreen.h" +#import "barrier/IPrimaryScreen.h" #import "base/Log.h" #import "base/IEventQueue.h" diff --git a/src/lib/platform/OSXScreenSaver.h b/src/lib/platform/OSXScreenSaver.h index 2427ba8d..07f2a7bc 100644 --- a/src/lib/platform/OSXScreenSaver.h +++ b/src/lib/platform/OSXScreenSaver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/IScreenSaver.h" +#include "barrier/IScreenSaver.h" #include diff --git a/src/lib/platform/OSXScreenSaverControl.h b/src/lib/platform/OSXScreenSaverControl.h index 01608c67..76f88757 100644 --- a/src/lib/platform/OSXScreenSaverControl.h +++ b/src/lib/platform/OSXScreenSaverControl.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2009 Chris Schoeneman * diff --git a/src/lib/platform/OSXScreenSaverUtil.h b/src/lib/platform/OSXScreenSaverUtil.h index 0fa5727d..045553d7 100644 --- a/src/lib/platform/OSXScreenSaverUtil.h +++ b/src/lib/platform/OSXScreenSaverUtil.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/OSXScreenSaverUtil.m b/src/lib/platform/OSXScreenSaverUtil.m index dfc59a9a..6d82f10f 100644 --- a/src/lib/platform/OSXScreenSaverUtil.m +++ b/src/lib/platform/OSXScreenSaverUtil.m @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea * * This package is free software; you can redistribute it and/or diff --git a/src/lib/platform/OSXUchrKeyResource.cpp b/src/lib/platform/OSXUchrKeyResource.cpp index 4d2ca7e3..e0230e95 100644 --- a/src/lib/platform/OSXUchrKeyResource.cpp +++ b/src/lib/platform/OSXUchrKeyResource.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -201,7 +201,7 @@ OSXUchrKeyResource::getDeadKey( // convert keys to their dead counterparts for (KeySequence::iterator i = keys.begin(); i != keys.end(); ++i) { - *i = synergy::KeyMap::getDeadKey(*i); + *i = barrier::KeyMap::getDeadKey(*i); } return true; diff --git a/src/lib/platform/OSXUchrKeyResource.h b/src/lib/platform/OSXUchrKeyResource.h index bbb8fd2b..47b63c9f 100644 --- a/src/lib/platform/OSXUchrKeyResource.h +++ b/src/lib/platform/OSXUchrKeyResource.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -17,7 +17,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "barrier/KeyState.h" #include "platform/IOSXKeyResource.h" #include diff --git a/src/lib/platform/XWindowsClipboard.cpp b/src/lib/platform/XWindowsClipboard.cpp index 7e79f7e3..8e7d864e 100644 --- a/src/lib/platform/XWindowsClipboard.cpp +++ b/src/lib/platform/XWindowsClipboard.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboard.h b/src/lib/platform/XWindowsClipboard.h index 9e6fbd47..cf20e82d 100644 --- a/src/lib/platform/XWindowsClipboard.h +++ b/src/lib/platform/XWindowsClipboard.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,14 +18,14 @@ #pragma once -#include "synergy/clipboard_types.h" -#include "synergy/IClipboard.h" +#include "barrier/clipboard_types.h" +#include "barrier/IClipboard.h" #include "common/stdmap.h" #include "common/stdlist.h" #include "common/stdvector.h" #if X_DISPLAY_MISSING -# error X11 is required to build synergy +# error X11 is required to build barrier #else # include #endif diff --git a/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp index 4c18b537..493b1e88 100644 --- a/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp +++ b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h index e99d7dc5..d723a337 100644 --- a/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h +++ b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardBMPConverter.cpp b/src/lib/platform/XWindowsClipboardBMPConverter.cpp index 22c6dcbe..b4def5b2 100644 --- a/src/lib/platform/XWindowsClipboardBMPConverter.cpp +++ b/src/lib/platform/XWindowsClipboardBMPConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardBMPConverter.h b/src/lib/platform/XWindowsClipboardBMPConverter.h index 0f99a32a..d7813a07 100644 --- a/src/lib/platform/XWindowsClipboardBMPConverter.h +++ b/src/lib/platform/XWindowsClipboardBMPConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardHTMLConverter.cpp b/src/lib/platform/XWindowsClipboardHTMLConverter.cpp index 2e743f7e..32db7247 100644 --- a/src/lib/platform/XWindowsClipboardHTMLConverter.cpp +++ b/src/lib/platform/XWindowsClipboardHTMLConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardHTMLConverter.h b/src/lib/platform/XWindowsClipboardHTMLConverter.h index 32e5bdd8..013aa995 100644 --- a/src/lib/platform/XWindowsClipboardHTMLConverter.h +++ b/src/lib/platform/XWindowsClipboardHTMLConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardTextConverter.cpp b/src/lib/platform/XWindowsClipboardTextConverter.cpp index 7d055f10..71b7a846 100644 --- a/src/lib/platform/XWindowsClipboardTextConverter.cpp +++ b/src/lib/platform/XWindowsClipboardTextConverter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardTextConverter.h b/src/lib/platform/XWindowsClipboardTextConverter.h index 0ad87ceb..0e6d5987 100644 --- a/src/lib/platform/XWindowsClipboardTextConverter.h +++ b/src/lib/platform/XWindowsClipboardTextConverter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardUCS2Converter.cpp b/src/lib/platform/XWindowsClipboardUCS2Converter.cpp index 82bebbdb..988b909b 100644 --- a/src/lib/platform/XWindowsClipboardUCS2Converter.cpp +++ b/src/lib/platform/XWindowsClipboardUCS2Converter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardUCS2Converter.h b/src/lib/platform/XWindowsClipboardUCS2Converter.h index f57ad1e2..6491408f 100644 --- a/src/lib/platform/XWindowsClipboardUCS2Converter.h +++ b/src/lib/platform/XWindowsClipboardUCS2Converter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardUTF8Converter.cpp b/src/lib/platform/XWindowsClipboardUTF8Converter.cpp index 4a7a5b09..0e43cce2 100644 --- a/src/lib/platform/XWindowsClipboardUTF8Converter.cpp +++ b/src/lib/platform/XWindowsClipboardUTF8Converter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsClipboardUTF8Converter.h b/src/lib/platform/XWindowsClipboardUTF8Converter.h index db8d9902..e3eeca02 100644 --- a/src/lib/platform/XWindowsClipboardUTF8Converter.h +++ b/src/lib/platform/XWindowsClipboardUTF8Converter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * diff --git a/src/lib/platform/XWindowsEventQueueBuffer.cpp b/src/lib/platform/XWindowsEventQueueBuffer.cpp index 71e2cfba..234cd621 100644 --- a/src/lib/platform/XWindowsEventQueueBuffer.cpp +++ b/src/lib/platform/XWindowsEventQueueBuffer.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -62,7 +62,7 @@ XWindowsEventQueueBuffer::XWindowsEventQueueBuffer( assert(m_display != NULL); assert(m_window != None); - m_userEvent = XInternAtom(m_display, "SYNERGY_USER_EVENT", False); + m_userEvent = XInternAtom(m_display, "BARRIER_USER_EVENT", False); // set up for pipe hack int result = pipe(m_pipefd); assert(result == 0); diff --git a/src/lib/platform/XWindowsEventQueueBuffer.h b/src/lib/platform/XWindowsEventQueueBuffer.h index 7614deea..07f3b3ab 100644 --- a/src/lib/platform/XWindowsEventQueueBuffer.h +++ b/src/lib/platform/XWindowsEventQueueBuffer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -23,7 +23,7 @@ #include "common/stdvector.h" #if X_DISPLAY_MISSING -# error X11 is required to build synergy +# error X11 is required to build barrier #else # include #endif diff --git a/src/lib/platform/XWindowsKeyState.cpp b/src/lib/platform/XWindowsKeyState.cpp index f9dc722d..1ca4629b 100644 --- a/src/lib/platform/XWindowsKeyState.cpp +++ b/src/lib/platform/XWindowsKeyState.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -26,7 +26,7 @@ #include #include #if X_DISPLAY_MISSING -# error X11 is required to build synergy +# error X11 is required to build barrier #else # include # include @@ -52,7 +52,7 @@ XWindowsKeyState::XWindowsKeyState( XWindowsKeyState::XWindowsKeyState( Display* display, bool useXKB, - IEventQueue* events, synergy::KeyMap& keyMap) : + IEventQueue* events, barrier::KeyMap& keyMap) : KeyState(events, keyMap), m_display(display), m_modifierFromX(ModifiersFromXDefaultSize) @@ -218,10 +218,10 @@ XWindowsKeyState::pollPressedKeys(KeyButtonSet& pressedKeys) const } void -XWindowsKeyState::getKeyMap(synergy::KeyMap& keyMap) +XWindowsKeyState::getKeyMap(barrier::KeyMap& keyMap) { // get autorepeat info. we must use the global_auto_repeat told to - // us because it may have modified by synergy. + // us because it may have modified by barrier. int oldGlobalAutoRepeat = m_keyboardState.global_auto_repeat; XGetKeyboardControl(m_display, &m_keyboardState); m_keyboardState.global_auto_repeat = oldGlobalAutoRepeat; @@ -297,7 +297,7 @@ XWindowsKeyState::fakeKey(const Keystroke& keystroke) } void -XWindowsKeyState::updateKeysymMap(synergy::KeyMap& keyMap) +XWindowsKeyState::updateKeysymMap(barrier::KeyMap& keyMap) { // there are up to 4 keysyms per keycode static const int maxKeysyms = 4; @@ -391,7 +391,7 @@ XWindowsKeyState::updateKeysymMap(synergy::KeyMap& keyMap) } // add entries for each keycode - synergy::KeyMap::KeyItem item; + barrier::KeyMap::KeyItem item; for (int i = 0; i < numKeycodes; ++i) { KeySym* keysyms = allKeysyms + maxKeysyms * i; KeyCode keycode = static_cast(i + minKeycode); @@ -495,7 +495,7 @@ XWindowsKeyState::updateKeysymMap(synergy::KeyMap& keyMap) item.m_lock = false; if (modifierButtons.count(keycode) > 0) { // get flags for modifier keys - synergy::KeyMap::initModifierKey(item); + barrier::KeyMap::initModifierKey(item); // add mapping from X (unless we already have) if (item.m_generates != 0) { @@ -543,7 +543,7 @@ XWindowsKeyState::updateKeysymMap(synergy::KeyMap& keyMap) #if HAVE_XKB_EXTENSION void -XWindowsKeyState::updateKeysymMapXKB(synergy::KeyMap& keyMap) +XWindowsKeyState::updateKeysymMapXKB(barrier::KeyMap& keyMap) { static const XkbKTMapEntryRec defMapEntry = { True, // active @@ -589,7 +589,7 @@ XWindowsKeyState::updateKeysymMapXKB(synergy::KeyMap& keyMap) // check every button. on this pass we save all modifiers as native // X modifier masks. - synergy::KeyMap::KeyItem item; + barrier::KeyMap::KeyItem item; for (int i = m_xkb->min_key_code; i <= m_xkb->max_key_code; ++i) { KeyCode keycode = static_cast(i); item.m_button = static_cast(keycode); @@ -773,7 +773,7 @@ XWindowsKeyState::updateKeysymMapXKB(synergy::KeyMap& keyMap) } } - // change all modifier masks to synergy masks from X masks + // change all modifier masks to barrier masks from X masks keyMap.foreachKey(&XWindowsKeyState::remapKeyModifiers, this); // allow composition across groups @@ -783,7 +783,7 @@ XWindowsKeyState::updateKeysymMapXKB(synergy::KeyMap& keyMap) void XWindowsKeyState::remapKeyModifiers(KeyID id, SInt32 group, - synergy::KeyMap::KeyItem& item, void* vself) + barrier::KeyMap::KeyItem& item, void* vself) { XWindowsKeyState* self = static_cast(vself); item.m_required = diff --git a/src/lib/platform/XWindowsKeyState.h b/src/lib/platform/XWindowsKeyState.h index 9b389794..f3c0a1e5 100644 --- a/src/lib/platform/XWindowsKeyState.h +++ b/src/lib/platform/XWindowsKeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2003 Chris Schoeneman * @@ -18,18 +18,18 @@ #pragma once -#include "synergy/KeyState.h" +#include "barrier/KeyState.h" #include "common/stdmap.h" #include "common/stdvector.h" #if X_DISPLAY_MISSING -# error X11 is required to build synergy +# error X11 is required to build barrier #else # include # if HAVE_X11_EXTENSIONS_XTEST_H # include # else -# error The XTest extension is required to build synergy +# error The XTest extension is required to build barrier # endif # if HAVE_XKB_EXTENSION # include @@ -52,7 +52,7 @@ public: XWindowsKeyState(Display*, bool useXKB, IEventQueue* events); XWindowsKeyState(Display*, bool useXKB, - IEventQueue* events, synergy::KeyMap& keyMap); + IEventQueue* events, barrier::KeyMap& keyMap); ~XWindowsKeyState(); //! @name modifiers @@ -78,24 +78,24 @@ public: //! @name accessors //@{ - //! Convert X modifier mask to synergy mask + //! Convert X modifier mask to barrier mask /*! - Returns the synergy modifier mask corresponding to the X modifier + Returns the barrier modifier mask corresponding to the X modifier mask in \p state. */ KeyModifierMask mapModifiersFromX(unsigned int state) const; - //! Convert synergy modifier mask to X mask + //! Convert barrier modifier mask to X mask /*! - Converts the synergy modifier mask to the corresponding X modifier + Converts the barrier modifier mask to the corresponding X modifier mask. Returns \c true if successful and \c false if any modifier could not be converted. */ bool mapModifiersToX(KeyModifierMask, unsigned int&) const; - //! Convert synergy key to all corresponding X keycodes + //! Convert barrier key to all corresponding X keycodes /*! - Converts the synergy key \p key to all of the keycodes that map to + Converts the barrier key \p key to all of the keycodes that map to that key. */ void mapKeyToKeycodes(KeyID key, @@ -112,19 +112,19 @@ public: protected: // KeyState overrides - virtual void getKeyMap(synergy::KeyMap& keyMap); + virtual void getKeyMap(barrier::KeyMap& keyMap); virtual void fakeKey(const Keystroke& keystroke); private: void init(Display* display, bool useXKB); - void updateKeysymMap(synergy::KeyMap&); - void updateKeysymMapXKB(synergy::KeyMap&); + void updateKeysymMap(barrier::KeyMap&); + void updateKeysymMapXKB(barrier::KeyMap&); bool hasModifiersXKB() const; int getEffectiveGroup(KeyCode, int group) const; UInt32 getGroupFromState(unsigned int state) const; static void remapKeyModifiers(KeyID, SInt32, - synergy::KeyMap::KeyItem&, void*); + barrier::KeyMap::KeyItem&, void*); private: struct XKBModifierInfo { @@ -153,10 +153,10 @@ private: XKBModifierMap m_lastGoodXKBModifiers; NonXKBModifierMap m_lastGoodNonXKBModifiers; - // X modifier (bit number) to synergy modifier (mask) mapping + // X modifier (bit number) to barrier modifier (mask) mapping KeyModifierMaskList m_modifierFromX; - // synergy modifier (mask) to X modifier (mask) + // barrier modifier (mask) to X modifier (mask) KeyModifierToXMask m_modifierToX; // map KeyID to all keycodes that can synthesize that KeyID diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp index 6a0d72bf..3a001ff7 100644 --- a/src/lib/platform/XWindowsScreen.cpp +++ b/src/lib/platform/XWindowsScreen.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,9 +23,9 @@ #include "platform/XWindowsKeyState.h" #include "platform/XWindowsScreenSaver.h" #include "platform/XWindowsUtil.h" -#include "synergy/Clipboard.h" -#include "synergy/KeyMap.h" -#include "synergy/XScreen.h" +#include "barrier/Clipboard.h" +#include "barrier/KeyMap.h" +#include "barrier/XScreen.h" #include "arch/XArch.h" #include "arch/Arch.h" #include "base/Log.h" @@ -38,7 +38,7 @@ #include #include #if X_DISPLAY_MISSING -# error X11 is required to build synergy +# error X11 is required to build barrier #else # include # include @@ -53,7 +53,7 @@ # if HAVE_X11_EXTENSIONS_XTEST_H # include # else -# error The XTest extension is required to build synergy +# error The XTest extension is required to build barrier # endif # if HAVE_X11_EXTENSIONS_XINERAMA_H // Xinerama.h may lack extern "C" for inclusion by C++ @@ -739,11 +739,11 @@ XWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask) m_oldHotKeyIDs.push_back(id); m_hotKeys.erase(id); - LOG((CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", synergy::KeyMap::formatKey(key, mask).c_str(), key, mask)); + LOG((CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", barrier::KeyMap::formatKey(key, mask).c_str(), key, mask)); return 0; } - LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", synergy::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); + LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", barrier::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); return id; } @@ -987,7 +987,7 @@ XWindowsScreen::saveShape() // 0,0 to Wm,Hm where Wm (Hm) is the minimum width (height) over // all physical screens. this warp only seems to happen if the // pointer wasn't in that region before the XWarpPointer(). the - // second (unexpected) warp causes synergy to think the pointer + // second (unexpected) warp causes barrier to think the pointer // has been moved when it hasn't. to work around the problem, // we warp the pointer to the center of the first physical // screen instead of the logical screen. @@ -1073,7 +1073,7 @@ XWindowsScreen::openIM() return; } - // find the appropriate style. synergy supports XIMPreeditNothing + // find the appropriate style. barrier supports XIMPreeditNothing // only at the moment. XIMStyles* styles; if (XGetIMValues(im, XNQueryInputStyle, &styles, NULL) != NULL || diff --git a/src/lib/platform/XWindowsScreen.h b/src/lib/platform/XWindowsScreen.h index 89524490..35f9368e 100644 --- a/src/lib/platform/XWindowsScreen.h +++ b/src/lib/platform/XWindowsScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,13 +18,13 @@ #pragma once -#include "synergy/PlatformScreen.h" -#include "synergy/KeyMap.h" +#include "barrier/PlatformScreen.h" +#include "barrier/KeyMap.h" #include "common/stdset.h" #include "common/stdvector.h" #if X_DISPLAY_MISSING -# error X11 is required to build synergy +# error X11 is required to build barrier #else # include #endif @@ -244,7 +244,7 @@ private: int m_xrandrEventBase; IEventQueue* m_events; - synergy::KeyMap m_keyMap; + barrier::KeyMap m_keyMap; // pointer to (singleton) screen. this is only needed by // ioErrorHandler(). diff --git a/src/lib/platform/XWindowsScreenSaver.cpp b/src/lib/platform/XWindowsScreenSaver.cpp index 239ddc14..bc457f92 100644 --- a/src/lib/platform/XWindowsScreenSaver.cpp +++ b/src/lib/platform/XWindowsScreenSaver.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,7 +19,7 @@ #include "platform/XWindowsScreenSaver.h" #include "platform/XWindowsUtil.h" -#include "synergy/IPlatformScreen.h" +#include "barrier/IPlatformScreen.h" #include "base/Log.h" #include "base/Event.h" #include "base/IEventQueue.h" @@ -29,7 +29,7 @@ #if HAVE_X11_EXTENSIONS_XTEST_H # include #else -# error The XTest extension is required to build synergy +# error The XTest extension is required to build barrier #endif #if HAVE_X11_EXTENSIONS_DPMS_H extern "C" { diff --git a/src/lib/platform/XWindowsScreenSaver.h b/src/lib/platform/XWindowsScreenSaver.h index 1b3b0928..db85f41a 100644 --- a/src/lib/platform/XWindowsScreenSaver.h +++ b/src/lib/platform/XWindowsScreenSaver.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,12 +18,12 @@ #pragma once -#include "synergy/IScreenSaver.h" +#include "barrier/IScreenSaver.h" #include "base/IEventQueue.h" #include "common/stdmap.h" #if X_DISPLAY_MISSING -# error X11 is required to build synergy +# error X11 is required to build barrier #else # include #endif diff --git a/src/lib/platform/XWindowsUtil.cpp b/src/lib/platform/XWindowsUtil.cpp index cfef8cf4..b1c6e9d3 100644 --- a/src/lib/platform/XWindowsUtil.cpp +++ b/src/lib/platform/XWindowsUtil.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #include "platform/XWindowsUtil.h" -#include "synergy/key_types.h" +#include "barrier/key_types.h" #include "mt/Thread.h" #include "base/Log.h" #include "base/String.h" @@ -1619,10 +1619,10 @@ XWindowsUtil::atomToString(Display* display, Atom atom) XWindowsUtil::ErrorLock lock(display, &error); char* name = XGetAtomName(display, atom); if (error) { - return synergy::string::sprintf(" (%d)", (int)atom); + return barrier::string::sprintf(" (%d)", (int)atom); } else { - String msg = synergy::string::sprintf("%s (%d)", name, (int)atom); + String msg = barrier::string::sprintf("%s (%d)", name, (int)atom); XFree(name); return msg; } @@ -1638,12 +1638,12 @@ XWindowsUtil::atomsToString(Display* display, const Atom* atom, UInt32 num) String msg; if (error) { for (UInt32 i = 0; i < num; ++i) { - msg += synergy::string::sprintf(" (%d), ", (int)atom[i]); + msg += barrier::string::sprintf(" (%d), ", (int)atom[i]); } } else { for (UInt32 i = 0; i < num; ++i) { - msg += synergy::string::sprintf("%s (%d), ", names[i], (int)atom[i]); + msg += barrier::string::sprintf("%s (%d), ", names[i], (int)atom[i]); XFree(names[i]); } } diff --git a/src/lib/platform/XWindowsUtil.h b/src/lib/platform/XWindowsUtil.h index f953e32d..4df888f7 100644 --- a/src/lib/platform/XWindowsUtil.h +++ b/src/lib/platform/XWindowsUtil.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -24,7 +24,7 @@ #include "common/stdvector.h" #if X_DISPLAY_MISSING -# error X11 is required to build synergy +# error X11 is required to build barrier #else # include #endif diff --git a/src/lib/server/BaseClientProxy.cpp b/src/lib/server/BaseClientProxy.cpp index 029f999f..b9c53392 100644 --- a/src/lib/server/BaseClientProxy.cpp +++ b/src/lib/server/BaseClientProxy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2006 Chris Schoeneman * diff --git a/src/lib/server/BaseClientProxy.h b/src/lib/server/BaseClientProxy.h index 22076c7c..c7c23ff8 100644 --- a/src/lib/server/BaseClientProxy.h +++ b/src/lib/server/BaseClientProxy.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,10 +18,10 @@ #pragma once -#include "synergy/IClient.h" +#include "barrier/IClient.h" #include "base/String.h" -namespace synergy { class IStream; } +namespace barrier { class IStream; } //! Generic proxy for client or primary class BaseClientProxy : public IClient { @@ -90,7 +90,7 @@ public: size_t size) = 0; virtual void fileChunkSending(UInt8 mark, char* data, size_t dataSize) = 0; virtual String getName() const; - virtual synergy::IStream* + virtual barrier::IStream* getStream() const = 0; private: diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt index 1fc7154d..94e1d68a 100644 --- a/src/lib/server/CMakeLists.txt +++ b/src/lib/server/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -17,7 +17,7 @@ file(GLOB headers "*.h") file(GLOB sources "*.cpp") -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/server/ClientListener.cpp b/src/lib/server/ClientListener.cpp index 0ecdb0e6..c12a77ac 100644 --- a/src/lib/server/ClientListener.cpp +++ b/src/lib/server/ClientListener.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -20,7 +20,7 @@ #include "server/ClientProxy.h" #include "server/ClientProxyUnknown.h" -#include "synergy/PacketStreamFilter.h" +#include "barrier/PacketStreamFilter.h" #include "net/IDataSocket.h" #include "net/IListenSocket.h" #include "net/ISocketFactory.h" @@ -149,7 +149,7 @@ ClientListener::handleClientAccepted(const Event&, void* vsocket) IDataSocket* socket = static_cast(vsocket); // filter socket messages, including a packetizing filter - synergy::IStream* stream = new PacketStreamFilter(m_events, socket, true); + barrier::IStream* stream = new PacketStreamFilter(m_events, socket, true); assert(m_server != NULL); // create proxy for unknown client diff --git a/src/lib/server/ClientListener.h b/src/lib/server/ClientListener.h index 4b69f0d9..cd54e475 100644 --- a/src/lib/server/ClientListener.h +++ b/src/lib/server/ClientListener.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * diff --git a/src/lib/server/ClientProxy.cpp b/src/lib/server/ClientProxy.cpp index 404ce2c6..5a282483 100644 --- a/src/lib/server/ClientProxy.cpp +++ b/src/lib/server/ClientProxy.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #include "server/ClientProxy.h" -#include "synergy/ProtocolUtil.h" +#include "barrier/ProtocolUtil.h" #include "io/IStream.h" #include "base/Log.h" #include "base/EventQueue.h" @@ -27,7 +27,7 @@ // ClientProxy // -ClientProxy::ClientProxy(const String& name, synergy::IStream* stream) : +ClientProxy::ClientProxy(const String& name, barrier::IStream* stream) : BaseClientProxy(name), m_stream(stream) { @@ -48,7 +48,7 @@ ClientProxy::close(const char* msg) getStream()->flush(); } -synergy::IStream* +barrier::IStream* ClientProxy::getStream() const { return m_stream; diff --git a/src/lib/server/ClientProxy.h b/src/lib/server/ClientProxy.h index 3d05a072..726ded46 100644 --- a/src/lib/server/ClientProxy.h +++ b/src/lib/server/ClientProxy.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,7 +23,7 @@ #include "base/String.h" #include "base/EventTypes.h" -namespace synergy { class IStream; } +namespace barrier { class IStream; } //! Generic proxy for client class ClientProxy : public BaseClientProxy { @@ -31,7 +31,7 @@ public: /*! \c name is the name of the client. */ - ClientProxy(const String& name, synergy::IStream* adoptedStream); + ClientProxy(const String& name, barrier::IStream* adoptedStream); ~ClientProxy(); //! @name manipulators @@ -51,7 +51,7 @@ public: /*! Returns the original stream passed to the c'tor. */ - synergy::IStream* getStream() const; + barrier::IStream* getStream() const; //@} @@ -87,5 +87,5 @@ public: virtual void fileChunkSending(UInt8 mark, char* data, size_t dataSize) = 0; private: - synergy::IStream* m_stream; + barrier::IStream* m_stream; }; diff --git a/src/lib/server/ClientProxy1_0.cpp b/src/lib/server/ClientProxy1_0.cpp index 429973f1..ee805c6a 100644 --- a/src/lib/server/ClientProxy1_0.cpp +++ b/src/lib/server/ClientProxy1_0.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,8 +18,8 @@ #include "server/ClientProxy1_0.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/XSynergy.h" +#include "barrier/ProtocolUtil.h" +#include "barrier/XBarrier.h" #include "io/IStream.h" #include "base/Log.h" #include "base/IEventQueue.h" @@ -31,7 +31,7 @@ // ClientProxy1_0 // -ClientProxy1_0::ClientProxy1_0(const String& name, synergy::IStream* stream, IEventQueue* events) : +ClientProxy1_0::ClientProxy1_0(const String& name, barrier::IStream* stream, IEventQueue* events) : ClientProxy(name, stream), m_heartbeatTimer(NULL), m_parser(&ClientProxy1_0::parseHandshakeMessage), diff --git a/src/lib/server/ClientProxy1_0.h b/src/lib/server/ClientProxy1_0.h index e40f8d86..0720232c 100644 --- a/src/lib/server/ClientProxy1_0.h +++ b/src/lib/server/ClientProxy1_0.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,8 +19,8 @@ #pragma once #include "server/ClientProxy.h" -#include "synergy/Clipboard.h" -#include "synergy/protocol_types.h" +#include "barrier/Clipboard.h" +#include "barrier/protocol_types.h" class Event; class EventQueueTimer; @@ -29,7 +29,7 @@ class IEventQueue; //! Proxy for client implementing protocol version 1.0 class ClientProxy1_0 : public ClientProxy { public: - ClientProxy1_0(const String& name, synergy::IStream* adoptedStream, IEventQueue* events); + ClientProxy1_0(const String& name, barrier::IStream* adoptedStream, IEventQueue* events); ~ClientProxy1_0(); // IScreen diff --git a/src/lib/server/ClientProxy1_1.cpp b/src/lib/server/ClientProxy1_1.cpp index e445d322..b7eb4c4b 100644 --- a/src/lib/server/ClientProxy1_1.cpp +++ b/src/lib/server/ClientProxy1_1.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #include "server/ClientProxy1_1.h" -#include "synergy/ProtocolUtil.h" +#include "barrier/ProtocolUtil.h" #include "base/Log.h" #include @@ -27,7 +27,7 @@ // ClientProxy1_1 // -ClientProxy1_1::ClientProxy1_1(const String& name, synergy::IStream* stream, IEventQueue* events) : +ClientProxy1_1::ClientProxy1_1(const String& name, barrier::IStream* stream, IEventQueue* events) : ClientProxy1_0(name, stream, events) { // do nothing diff --git a/src/lib/server/ClientProxy1_1.h b/src/lib/server/ClientProxy1_1.h index 22cda44f..cdb674d5 100644 --- a/src/lib/server/ClientProxy1_1.h +++ b/src/lib/server/ClientProxy1_1.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -23,7 +23,7 @@ //! Proxy for client implementing protocol version 1.1 class ClientProxy1_1 : public ClientProxy1_0 { public: - ClientProxy1_1(const String& name, synergy::IStream* adoptedStream, IEventQueue* events); + ClientProxy1_1(const String& name, barrier::IStream* adoptedStream, IEventQueue* events); ~ClientProxy1_1(); // IClient overrides diff --git a/src/lib/server/ClientProxy1_2.cpp b/src/lib/server/ClientProxy1_2.cpp index d6aca0f4..2dd13cfd 100644 --- a/src/lib/server/ClientProxy1_2.cpp +++ b/src/lib/server/ClientProxy1_2.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,14 +18,14 @@ #include "server/ClientProxy1_2.h" -#include "synergy/ProtocolUtil.h" +#include "barrier/ProtocolUtil.h" #include "base/Log.h" // // ClientProxy1_1 // -ClientProxy1_2::ClientProxy1_2(const String& name, synergy::IStream* stream, IEventQueue* events) : +ClientProxy1_2::ClientProxy1_2(const String& name, barrier::IStream* stream, IEventQueue* events) : ClientProxy1_1(name, stream, events) { // do nothing diff --git a/src/lib/server/ClientProxy1_2.h b/src/lib/server/ClientProxy1_2.h index c54b90d2..f6ffe949 100644 --- a/src/lib/server/ClientProxy1_2.h +++ b/src/lib/server/ClientProxy1_2.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -25,7 +25,7 @@ class IEventQueue; //! Proxy for client implementing protocol version 1.2 class ClientProxy1_2 : public ClientProxy1_1 { public: - ClientProxy1_2(const String& name, synergy::IStream* adoptedStream, IEventQueue* events); + ClientProxy1_2(const String& name, barrier::IStream* adoptedStream, IEventQueue* events); ~ClientProxy1_2(); // IClient overrides diff --git a/src/lib/server/ClientProxy1_3.cpp b/src/lib/server/ClientProxy1_3.cpp index 9f923595..34ea0c88 100644 --- a/src/lib/server/ClientProxy1_3.cpp +++ b/src/lib/server/ClientProxy1_3.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2006 Chris Schoeneman * @@ -18,7 +18,7 @@ #include "server/ClientProxy1_3.h" -#include "synergy/ProtocolUtil.h" +#include "barrier/ProtocolUtil.h" #include "base/Log.h" #include "base/IEventQueue.h" #include "base/TMethodEventJob.h" @@ -30,7 +30,7 @@ // ClientProxy1_3 // -ClientProxy1_3::ClientProxy1_3(const String& name, synergy::IStream* stream, IEventQueue* events) : +ClientProxy1_3::ClientProxy1_3(const String& name, barrier::IStream* stream, IEventQueue* events) : ClientProxy1_2(name, stream, events), m_keepAliveRate(kKeepAliveRate), m_keepAliveTimer(NULL), diff --git a/src/lib/server/ClientProxy1_3.h b/src/lib/server/ClientProxy1_3.h index 37299ca6..ff2ed0a3 100644 --- a/src/lib/server/ClientProxy1_3.h +++ b/src/lib/server/ClientProxy1_3.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2006 Chris Schoeneman * @@ -23,7 +23,7 @@ //! Proxy for client implementing protocol version 1.3 class ClientProxy1_3 : public ClientProxy1_2 { public: - ClientProxy1_3(const String& name, synergy::IStream* adoptedStream, IEventQueue* events); + ClientProxy1_3(const String& name, barrier::IStream* adoptedStream, IEventQueue* events); ~ClientProxy1_3(); // IClient overrides diff --git a/src/lib/server/ClientProxy1_4.cpp b/src/lib/server/ClientProxy1_4.cpp index 52f105df..43c708d9 100644 --- a/src/lib/server/ClientProxy1_4.cpp +++ b/src/lib/server/ClientProxy1_4.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Chris Schoeneman * @@ -19,7 +19,7 @@ #include "server/ClientProxy1_4.h" #include "server/Server.h" -#include "synergy/ProtocolUtil.h" +#include "barrier/ProtocolUtil.h" #include "base/Log.h" #include "base/IEventQueue.h" #include "base/TMethodEventJob.h" @@ -31,7 +31,7 @@ // ClientProxy1_4 // -ClientProxy1_4::ClientProxy1_4(const String& name, synergy::IStream* stream, Server* server, IEventQueue* events) : +ClientProxy1_4::ClientProxy1_4(const String& name, barrier::IStream* stream, Server* server, IEventQueue* events) : ClientProxy1_3(name, stream, events), m_server(server) { assert(m_server != NULL); diff --git a/src/lib/server/ClientProxy1_4.h b/src/lib/server/ClientProxy1_4.h index 8b08bc13..6c559656 100644 --- a/src/lib/server/ClientProxy1_4.h +++ b/src/lib/server/ClientProxy1_4.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Chris Schoeneman * @@ -25,7 +25,7 @@ class Server; //! Proxy for client implementing protocol version 1.4 class ClientProxy1_4 : public ClientProxy1_3 { public: - ClientProxy1_4(const String& name, synergy::IStream* adoptedStream, Server* server, IEventQueue* events); + ClientProxy1_4(const String& name, barrier::IStream* adoptedStream, Server* server, IEventQueue* events); ~ClientProxy1_4(); //! @name accessors diff --git a/src/lib/server/ClientProxy1_5.cpp b/src/lib/server/ClientProxy1_5.cpp index 91560c08..43fd0b75 100644 --- a/src/lib/server/ClientProxy1_5.cpp +++ b/src/lib/server/ClientProxy1_5.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -18,9 +18,9 @@ #include "server/ClientProxy1_5.h" #include "server/Server.h" -#include "synergy/FileChunk.h" -#include "synergy/StreamChunker.h" -#include "synergy/ProtocolUtil.h" +#include "barrier/FileChunk.h" +#include "barrier/StreamChunker.h" +#include "barrier/ProtocolUtil.h" #include "io/IStream.h" #include "base/TMethodEventJob.h" #include "base/Log.h" @@ -31,7 +31,7 @@ // ClientProxy1_5 // -ClientProxy1_5::ClientProxy1_5(const String& name, synergy::IStream* stream, Server* server, IEventQueue* events) : +ClientProxy1_5::ClientProxy1_5(const String& name, barrier::IStream* stream, Server* server, IEventQueue* events) : ClientProxy1_4(name, stream, server, events), m_events(events) { diff --git a/src/lib/server/ClientProxy1_5.h b/src/lib/server/ClientProxy1_5.h index 1d541005..776de03e 100644 --- a/src/lib/server/ClientProxy1_5.h +++ b/src/lib/server/ClientProxy1_5.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ class IEventQueue; //! Proxy for client implementing protocol version 1.5 class ClientProxy1_5 : public ClientProxy1_4 { public: - ClientProxy1_5(const String& name, synergy::IStream* adoptedStream, Server* server, IEventQueue* events); + ClientProxy1_5(const String& name, barrier::IStream* adoptedStream, Server* server, IEventQueue* events); ~ClientProxy1_5(); virtual void sendDragInfo(UInt32 fileCount, const char* info, size_t size); diff --git a/src/lib/server/ClientProxy1_6.cpp b/src/lib/server/ClientProxy1_6.cpp index deb70e13..a0d26218 100644 --- a/src/lib/server/ClientProxy1_6.cpp +++ b/src/lib/server/ClientProxy1_6.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -18,9 +18,9 @@ #include "server/ClientProxy1_6.h" #include "server/Server.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/StreamChunker.h" -#include "synergy/ClipboardChunk.h" +#include "barrier/ProtocolUtil.h" +#include "barrier/StreamChunker.h" +#include "barrier/ClipboardChunk.h" #include "io/IStream.h" #include "base/TMethodEventJob.h" #include "base/Log.h" @@ -29,7 +29,7 @@ // ClientProxy1_6 // -ClientProxy1_6::ClientProxy1_6(const String& name, synergy::IStream* stream, Server* server, IEventQueue* events) : +ClientProxy1_6::ClientProxy1_6(const String& name, barrier::IStream* stream, Server* server, IEventQueue* events) : ClientProxy1_5(name, stream, server, events), m_events(events) { diff --git a/src/lib/server/ClientProxy1_6.h b/src/lib/server/ClientProxy1_6.h index 395365e6..838cb028 100644 --- a/src/lib/server/ClientProxy1_6.h +++ b/src/lib/server/ClientProxy1_6.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ class IEventQueue; //! Proxy for client implementing protocol version 1.6 class ClientProxy1_6 : public ClientProxy1_5 { public: - ClientProxy1_6(const String& name, synergy::IStream* adoptedStream, Server* server, IEventQueue* events); + ClientProxy1_6(const String& name, barrier::IStream* adoptedStream, Server* server, IEventQueue* events); ~ClientProxy1_6(); virtual void setClipboard(ClipboardID id, const IClipboard* clipboard); diff --git a/src/lib/server/ClientProxyUnknown.cpp b/src/lib/server/ClientProxyUnknown.cpp index 7df67c0f..f929108e 100644 --- a/src/lib/server/ClientProxyUnknown.cpp +++ b/src/lib/server/ClientProxyUnknown.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -26,9 +26,9 @@ #include "server/ClientProxy1_4.h" #include "server/ClientProxy1_5.h" #include "server/ClientProxy1_6.h" -#include "synergy/protocol_types.h" -#include "synergy/ProtocolUtil.h" -#include "synergy/XSynergy.h" +#include "barrier/protocol_types.h" +#include "barrier/ProtocolUtil.h" +#include "barrier/XBarrier.h" #include "io/IStream.h" #include "io/XIO.h" #include "base/Log.h" @@ -40,7 +40,7 @@ // ClientProxyUnknown // -ClientProxyUnknown::ClientProxyUnknown(synergy::IStream* stream, double timeout, Server* server, IEventQueue* events) : +ClientProxyUnknown::ClientProxyUnknown(barrier::IStream* stream, double timeout, Server* server, IEventQueue* events) : m_stream(stream), m_proxy(NULL), m_ready(false), diff --git a/src/lib/server/ClientProxyUnknown.h b/src/lib/server/ClientProxyUnknown.h index 88ef88ba..5d594020 100644 --- a/src/lib/server/ClientProxyUnknown.h +++ b/src/lib/server/ClientProxyUnknown.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2004 Chris Schoeneman * @@ -23,13 +23,13 @@ class ClientProxy; class EventQueueTimer; -namespace synergy { class IStream; } +namespace barrier { class IStream; } class Server; class IEventQueue; class ClientProxyUnknown { public: - ClientProxyUnknown(synergy::IStream* stream, double timeout, Server* server, IEventQueue* events); + ClientProxyUnknown(barrier::IStream* stream, double timeout, Server* server, IEventQueue* events); ~ClientProxyUnknown(); //! @name manipulators @@ -44,7 +44,7 @@ public: ClientProxy* orphanClientProxy(); //! Get the stream - synergy::IStream* getStream() { return m_stream; } + barrier::IStream* getStream() { return m_stream; } //@} @@ -62,7 +62,7 @@ private: void handleReady(const Event&, void*); private: - synergy::IStream* m_stream; + barrier::IStream* m_stream; EventQueueTimer* m_timer; ClientProxy* m_proxy; bool m_ready; diff --git a/src/lib/server/Config.cpp b/src/lib/server/Config.cpp index e50cf1d2..3cf60a5b 100644 --- a/src/lib/server/Config.cpp +++ b/src/lib/server/Config.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,8 +19,8 @@ #include "server/Config.h" #include "server/Server.h" -#include "synergy/KeyMap.h" -#include "synergy/key_types.h" +#include "barrier/KeyMap.h" +#include "barrier/key_types.h" #include "net/XSocket.h" #include "base/IEventQueue.h" #include "common/stdistream.h" @@ -28,7 +28,7 @@ #include -using namespace synergy::string; +using namespace barrier::string; // // Config @@ -280,9 +280,9 @@ Config::disconnect(const String& srcName, EDirection srcSide, float position) } void -Config::setSynergyAddress(const NetworkAddress& addr) +Config::setBarrierAddress(const NetworkAddress& addr) { - m_synergyAddress = addr; + m_barrierAddress = addr; } bool @@ -529,9 +529,9 @@ Config::endNeighbor(const String& srcName) const } const NetworkAddress& -Config::getSynergyAddress() const +Config::getBarrierAddress() const { - return m_synergyAddress; + return m_barrierAddress; } const Config::ScreenOptions* @@ -562,7 +562,7 @@ Config::hasLockToScreenAction() const bool Config::operator==(const Config& x) const { - if (m_synergyAddress != x.m_synergyAddress) { + if (m_barrierAddress != x.m_barrierAddress) { return false; } if (m_map.size() != x.m_map.size()) { @@ -647,7 +647,7 @@ Config::formatInterval(const Interval& x) if (x.first == 0.0f && x.second == 1.0f) { return ""; } - return synergy::string::sprintf("(%d,%d)", (int)(x.first * 100.0f + 0.5f), + return barrier::string::sprintf("(%d,%d)", (int)(x.first * 100.0f + 0.5f), (int)(x.second * 100.0f + 0.5f)); } @@ -724,8 +724,8 @@ Config::readSectionOptions(ConfigReadContext& s) bool handled = true; if (name == "address") { try { - m_synergyAddress = NetworkAddress(value, kDefaultPort); - m_synergyAddress.resolve(); + m_barrierAddress = NetworkAddress(value, kDefaultPort); + m_barrierAddress.resolve(); } catch (XSocketAddress& e) { throw XConfigRead(s, @@ -1436,7 +1436,7 @@ Config::getOptionValue(OptionID id, OptionValue value) id == kOptionScreenSwitchCornerSize || id == kOptionScreenSwitchDelay || id == kOptionScreenSwitchTwoTap) { - return synergy::string::sprintf("%d", value); + return barrier::string::sprintf("%d", value); } if (id == kOptionScreenSwitchCorners) { std::string result("none"); @@ -1862,9 +1862,9 @@ operator<<(std::ostream& s, const Config& config) } } } - if (config.m_synergyAddress.isValid()) { + if (config.m_barrierAddress.isValid()) { s << "\taddress = " << - config.m_synergyAddress.getHostname().c_str() << std::endl; + config.m_barrierAddress.getHostname().c_str() << std::endl; } s << config.m_inputFilter.format("\t"); s << "end" << std::endl; @@ -1917,7 +1917,7 @@ ConfigReadContext::readLine(String& line) if (!isgraph(line[i]) && line[i] != ' ' && line[i] != '\t') { throw XConfigRead(*this, "invalid character %{1}", - synergy::string::sprintf("%#2x", line[i])); + barrier::string::sprintf("%#2x", line[i])); } } @@ -2233,12 +2233,12 @@ ConfigReadContext::parseKeystroke(const String& keystroke, String s = keystroke; KeyModifierMask mask; - if (!synergy::KeyMap::parseModifiers(s, mask)) { + if (!barrier::KeyMap::parseModifiers(s, mask)) { throw XConfigRead(*this, "unable to parse key modifiers"); } KeyID key; - if (!synergy::KeyMap::parseKey(s, key)) { + if (!barrier::KeyMap::parseKey(s, key)) { throw XConfigRead(*this, "unable to parse key"); } @@ -2255,7 +2255,7 @@ ConfigReadContext::parseMouse(const String& mouse) const String s = mouse; KeyModifierMask mask; - if (!synergy::KeyMap::parseModifiers(s, mask)) { + if (!barrier::KeyMap::parseModifiers(s, mask)) { throw XConfigRead(*this, "unable to parse button modifiers"); } @@ -2277,7 +2277,7 @@ ConfigReadContext::parseModifier(const String& modifiers) const String s = modifiers; KeyModifierMask mask; - if (!synergy::KeyMap::parseModifiers(s, mask)) { + if (!barrier::KeyMap::parseModifiers(s, mask)) { throw XConfigRead(*this, "unable to parse modifiers"); } @@ -2309,7 +2309,7 @@ ConfigReadContext::concatArgs(const ArgList& args) XConfigRead::XConfigRead(const ConfigReadContext& context, const String& error) : - m_error(synergy::string::sprintf("line %d: %s", + m_error(barrier::string::sprintf("line %d: %s", context.getLineNumber(), error.c_str())) { // do nothing @@ -2317,8 +2317,8 @@ XConfigRead::XConfigRead(const ConfigReadContext& context, XConfigRead::XConfigRead(const ConfigReadContext& context, const char* errorFmt, const String& arg) : - m_error(synergy::string::sprintf("line %d: ", context.getLineNumber()) + - synergy::string::format(errorFmt, arg.c_str())) + m_error(barrier::string::sprintf("line %d: ", context.getLineNumber()) + + barrier::string::format(errorFmt, arg.c_str())) { // do nothing } diff --git a/src/lib/server/Config.h b/src/lib/server/Config.h index 75b37203..69b01c4e 100644 --- a/src/lib/server/Config.h +++ b/src/lib/server/Config.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,9 +19,9 @@ #pragma once #include "server/InputFilter.h" -#include "synergy/option_types.h" -#include "synergy/protocol_types.h" -#include "synergy/IPlatformScreen.h" +#include "barrier/option_types.h" +#include "barrier/protocol_types.h" +#include "barrier/IPlatformScreen.h" #include "net/NetworkAddress.h" #include "base/String.h" #include "base/XBase.h" @@ -140,8 +140,8 @@ private: public: ScreenOptions m_options; }; - typedef std::map CellMap; - typedef std::map NameMap; + typedef std::map CellMap; + typedef std::map NameMap; public: typedef Cell::const_iterator link_const_iterator; @@ -283,10 +283,10 @@ public: //! Set server address /*! - Set the synergy listen addresses. There is no default address so + Set the barrier listen addresses. There is no default address so this must be called to run a server using this configuration. */ - void setSynergyAddress(const NetworkAddress&); + void setBarrierAddress(const NetworkAddress&); //! Add a screen option /*! @@ -392,7 +392,7 @@ public: //! Get the server address const NetworkAddress& - getSynergyAddress() const; + getBarrierAddress() const; //! Get the screen options /*! @@ -474,7 +474,7 @@ private: private: CellMap m_map; NameMap m_nameToCanonicalName; - NetworkAddress m_synergyAddress; + NetworkAddress m_barrierAddress; ScreenOptions m_globalOptions; InputFilter m_inputFilter; bool m_hasLockToScreenAction; diff --git a/src/lib/server/InputFilter.cpp b/src/lib/server/InputFilter.cpp index 363ded15..9e73f45e 100644 --- a/src/lib/server/InputFilter.cpp +++ b/src/lib/server/InputFilter.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2005 Chris Schoeneman * @@ -19,7 +19,7 @@ #include "server/InputFilter.h" #include "server/Server.h" #include "server/PrimaryClient.h" -#include "synergy/KeyMap.h" +#include "barrier/KeyMap.h" #include "base/EventQueue.h" #include "base/Log.h" #include "base/TMethodEventJob.h" @@ -98,8 +98,8 @@ InputFilter::KeystrokeCondition::clone() const String InputFilter::KeystrokeCondition::format() const { - return synergy::string::sprintf("keystroke(%s)", - synergy::KeyMap::formatKey(m_key, m_mask).c_str()); + return barrier::string::sprintf("keystroke(%s)", + barrier::KeyMap::formatKey(m_key, m_mask).c_str()); } InputFilter::EFilterStatus @@ -186,11 +186,11 @@ InputFilter::MouseButtonCondition::clone() const String InputFilter::MouseButtonCondition::format() const { - String key = synergy::KeyMap::formatKey(kKeyNone, m_mask); + String key = barrier::KeyMap::formatKey(kKeyNone, m_mask); if (!key.empty()) { key += "+"; } - return synergy::string::sprintf("mousebutton(%s%d)", key.c_str(), m_button); + return barrier::string::sprintf("mousebutton(%s%d)", key.c_str(), m_button); } InputFilter::EFilterStatus @@ -248,7 +248,7 @@ InputFilter::ScreenConnectedCondition::clone() const String InputFilter::ScreenConnectedCondition::format() const { - return synergy::string::sprintf("connect(%s)", m_screen.c_str()); + return barrier::string::sprintf("connect(%s)", m_screen.c_str()); } InputFilter::EFilterStatus @@ -303,7 +303,7 @@ InputFilter::LockCursorToScreenAction::format() const { static const char* s_mode[] = { "off", "on", "toggle" }; - return synergy::string::sprintf("lockCursorToScreen(%s)", s_mode[m_mode]); + return barrier::string::sprintf("lockCursorToScreen(%s)", s_mode[m_mode]); } void @@ -346,7 +346,7 @@ InputFilter::SwitchToScreenAction::clone() const String InputFilter::SwitchToScreenAction::format() const { - return synergy::string::sprintf("switchToScreen(%s)", m_screen.c_str()); + return barrier::string::sprintf("switchToScreen(%s)", m_screen.c_str()); } void @@ -400,7 +400,7 @@ InputFilter::SwitchInDirectionAction::format() const "down" }; - return synergy::string::sprintf("switchInDirection(%s)", s_names[m_direction]); + return barrier::string::sprintf("switchInDirection(%s)", s_names[m_direction]); } void @@ -459,10 +459,10 @@ InputFilter::KeyboardBroadcastAction::format() const static const char* s_name = "keyboardBroadcast"; if (m_screens.empty() || m_screens[0] == '*') { - return synergy::string::sprintf("%s(%s)", s_name, s_mode[m_mode]); + return barrier::string::sprintf("%s(%s)", s_name, s_mode[m_mode]); } else { - return synergy::string::sprintf("%s(%s,%.*s)", s_name, s_mode[m_mode], + return barrier::string::sprintf("%s(%s,%.*s)", s_name, s_mode[m_mode], m_screens.size() - 2, m_screens.c_str() + 1); } @@ -531,18 +531,18 @@ InputFilter::KeystrokeAction::format() const const char* type = formatName(); if (m_keyInfo->m_screens[0] == '\0') { - return synergy::string::sprintf("%s(%s)", type, - synergy::KeyMap::formatKey(m_keyInfo->m_key, + return barrier::string::sprintf("%s(%s)", type, + barrier::KeyMap::formatKey(m_keyInfo->m_key, m_keyInfo->m_mask).c_str()); } else if (m_keyInfo->m_screens[0] == '*') { - return synergy::string::sprintf("%s(%s,*)", type, - synergy::KeyMap::formatKey(m_keyInfo->m_key, + return barrier::string::sprintf("%s(%s,*)", type, + barrier::KeyMap::formatKey(m_keyInfo->m_key, m_keyInfo->m_mask).c_str()); } else { - return synergy::string::sprintf("%s(%s,%.*s)", type, - synergy::KeyMap::formatKey(m_keyInfo->m_key, + return barrier::string::sprintf("%s(%s,%.*s)", type, + barrier::KeyMap::formatKey(m_keyInfo->m_key, m_keyInfo->m_mask).c_str(), strlen(m_keyInfo->m_screens + 1) - 1, m_keyInfo->m_screens + 1); @@ -612,8 +612,8 @@ InputFilter::MouseButtonAction::format() const { const char* type = formatName(); - String key = synergy::KeyMap::formatKey(kKeyNone, m_buttonInfo->m_mask); - return synergy::string::sprintf("%s(%s%s%d)", type, + String key = barrier::KeyMap::formatKey(kKeyNone, m_buttonInfo->m_mask); + return barrier::string::sprintf("%s(%s%s%d)", type, key.c_str(), key.empty() ? "" : "+", m_buttonInfo->m_button); } diff --git a/src/lib/server/InputFilter.h b/src/lib/server/InputFilter.h index 99564176..73afe970 100644 --- a/src/lib/server/InputFilter.h +++ b/src/lib/server/InputFilter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2005 Chris Schoeneman * @@ -18,10 +18,10 @@ #pragma once -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" -#include "synergy/protocol_types.h" -#include "synergy/IPlatformScreen.h" +#include "barrier/key_types.h" +#include "barrier/mouse_types.h" +#include "barrier/protocol_types.h" +#include "barrier/IPlatformScreen.h" #include "base/String.h" #include "common/stdmap.h" #include "common/stdset.h" diff --git a/src/lib/server/PrimaryClient.cpp b/src/lib/server/PrimaryClient.cpp index 76731228..4c9fe50d 100644 --- a/src/lib/server/PrimaryClient.cpp +++ b/src/lib/server/PrimaryClient.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,15 +18,15 @@ #include "server/PrimaryClient.h" -#include "synergy/Screen.h" -#include "synergy/Clipboard.h" +#include "barrier/Screen.h" +#include "barrier/Clipboard.h" #include "base/Log.h" // // PrimaryClient // -PrimaryClient::PrimaryClient(const String& name, synergy::Screen* screen) : +PrimaryClient::PrimaryClient(const String& name, barrier::Screen* screen) : BaseClientProxy(name), m_screen(screen), m_fakeInputCount(0) diff --git a/src/lib/server/PrimaryClient.h b/src/lib/server/PrimaryClient.h index f63bbf5c..4296aaa4 100644 --- a/src/lib/server/PrimaryClient.h +++ b/src/lib/server/PrimaryClient.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,9 +19,9 @@ #pragma once #include "server/BaseClientProxy.h" -#include "synergy/protocol_types.h" +#include "barrier/protocol_types.h" -namespace synergy { class Screen; } +namespace barrier { class Screen; } //! Primary screen as pseudo-client /*! @@ -34,7 +34,7 @@ public: /*! \c name is the name of the server and \p screen is primary screen. */ - PrimaryClient(const String& name, synergy::Screen* screen); + PrimaryClient(const String& name, barrier::Screen* screen); ~PrimaryClient(); #ifdef TEST_ENV @@ -146,11 +146,11 @@ public: virtual void sendDragInfo(UInt32 fileCount, const char* info, size_t size); virtual void fileChunkSending(UInt8 mark, char* data, size_t dataSize); - virtual synergy::IStream* + virtual barrier::IStream* getStream() const { return NULL; } bool isPrimary() const { return true; } private: - synergy::Screen* m_screen; + barrier::Screen* m_screen; bool m_clipboardDirty[kClipboardEnd]; SInt32 m_fakeInputCount; }; diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp index 206b145c..80481551 100644 --- a/src/lib/server/Server.cpp +++ b/src/lib/server/Server.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -22,17 +22,17 @@ #include "server/ClientProxyUnknown.h" #include "server/PrimaryClient.h" #include "server/ClientListener.h" -#include "synergy/FileChunk.h" -#include "synergy/IPlatformScreen.h" -#include "synergy/DropHelper.h" -#include "synergy/option_types.h" -#include "synergy/protocol_types.h" -#include "synergy/XScreen.h" -#include "synergy/XSynergy.h" -#include "synergy/StreamChunker.h" -#include "synergy/KeyState.h" -#include "synergy/Screen.h" -#include "synergy/PacketStreamFilter.h" +#include "barrier/FileChunk.h" +#include "barrier/IPlatformScreen.h" +#include "barrier/DropHelper.h" +#include "barrier/option_types.h" +#include "barrier/protocol_types.h" +#include "barrier/XScreen.h" +#include "barrier/XBarrier.h" +#include "barrier/StreamChunker.h" +#include "barrier/KeyState.h" +#include "barrier/Screen.h" +#include "barrier/PacketStreamFilter.h" #include "net/TCPSocket.h" #include "net/IDataSocket.h" #include "net/IListenSocket.h" @@ -59,7 +59,7 @@ Server::Server( Config& config, PrimaryClient* primaryClient, - synergy::Screen* screen, + barrier::Screen* screen, IEventQueue* events, ServerArgs const& args) : m_mock(false), @@ -1846,8 +1846,8 @@ Server::sendDragInfoThread(void* arg) #if defined(__APPLE__) // on mac it seems that after faking a LMB up, system would signal back - // to synergy a mouse up event, which doesn't happen on windows. as a - // result, synergy would send dragging file to client twice. This variable + // to barrier a mouse up event, which doesn't happen on windows. as a + // result, barrier would send dragging file to client twice. This variable // is used to ignore the first file sending. m_ignoreFileTransfer = true; #endif diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h index a9c5d239..609af212 100644 --- a/src/lib/server/Server.h +++ b/src/lib/server/Server.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -19,13 +19,13 @@ #pragma once #include "server/Config.h" -#include "synergy/clipboard_types.h" -#include "synergy/Clipboard.h" -#include "synergy/key_types.h" -#include "synergy/mouse_types.h" -#include "synergy/INode.h" -#include "synergy/DragInformation.h" -#include "synergy/ServerArgs.h" +#include "barrier/clipboard_types.h" +#include "barrier/Clipboard.h" +#include "barrier/key_types.h" +#include "barrier/mouse_types.h" +#include "barrier/INode.h" +#include "barrier/DragInformation.h" +#include "barrier/ServerArgs.h" #include "base/Event.h" #include "base/Stopwatch.h" #include "base/EventTypes.h" @@ -37,14 +37,14 @@ class BaseClientProxy; class EventQueueTimer; class PrimaryClient; class InputFilter; -namespace synergy { class Screen; } +namespace barrier { class Screen; } class IEventQueue; class Thread; class ClientListener; -//! Synergy server +//! Barrier server /*! -This class implements the top-level server algorithms for synergy. +This class implements the top-level server algorithms for barrier. */ class Server : public INode { public: @@ -107,7 +107,7 @@ public: ownership of \p primaryClient. */ Server(Config& config, PrimaryClient* primaryClient, - synergy::Screen* screen, IEventQueue* events, ServerArgs const& args); + barrier::Screen* screen, IEventQueue* events, ServerArgs const& args); ~Server(); #ifdef TEST_ENV @@ -460,7 +460,7 @@ private: bool m_lockedToScreen; // server screen - synergy::Screen* m_screen; + barrier::Screen* m_screen; IEventQueue* m_events; diff --git a/src/lib/shared/CMakeLists.txt b/src/lib/shared/CMakeLists.txt index f518c460..7439ae2c 100644 --- a/src/lib/shared/CMakeLists.txt +++ b/src/lib/shared/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2016 Symless Ltd. # # This package is free software; you can redistribute it and/or @@ -16,7 +16,7 @@ file(GLOB headers "*.h") file(GLOB sources "*.cpp") -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/shared/EditionType.h b/src/lib/shared/EditionType.h index 6544f613..57a94d59 100644 --- a/src/lib/shared/EditionType.h +++ b/src/lib/shared/EditionType.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/shared/SerialKey.cpp b/src/lib/shared/SerialKey.cpp index 7a47adfb..4b15b09d 100644 --- a/src/lib/shared/SerialKey.cpp +++ b/src/lib/shared/SerialKey.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/shared/SerialKey.h b/src/lib/shared/SerialKey.h index a27382cc..ac01f4ea 100644 --- a/src/lib/shared/SerialKey.h +++ b/src/lib/shared/SerialKey.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/lib/synwinhk/CMakeLists.txt b/src/lib/synwinhk/CMakeLists.txt index c9f68baa..16eaa500 100644 --- a/src/lib/synwinhk/CMakeLists.txt +++ b/src/lib/synwinhk/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2013-2016 Symless Ltd. # # This package is free software; you can redistribute it and/or @@ -16,7 +16,7 @@ file(GLOB headers "*.h") file(GLOB sources "*.cpp") -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() diff --git a/src/lib/synwinhk/synwinhk.cpp b/src/lib/synwinhk/synwinhk.cpp index 30ba1289..f45cec31 100644 --- a/src/lib/synwinhk/synwinhk.cpp +++ b/src/lib/synwinhk/synwinhk.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -18,7 +18,7 @@ #include "synwinhk/synwinhk.h" -#include "synergy/protocol_types.h" +#include "barrier/protocol_types.h" #include #include @@ -195,11 +195,11 @@ doKeyboardHookHandler(WPARAM wParam, LPARAM lParam) // passing events through and not report them to the server. this // is used to allow the server to synthesize events locally but // not pick them up as user events. - if (wParam == SYNERGY_HOOK_FAKE_INPUT_VIRTUAL_KEY && - ((lParam >> 16) & 0xffu) == SYNERGY_HOOK_FAKE_INPUT_SCANCODE) { + if (wParam == BARRIER_HOOK_FAKE_INPUT_VIRTUAL_KEY && + ((lParam >> 16) & 0xffu) == BARRIER_HOOK_FAKE_INPUT_SCANCODE) { // update flag g_fakeInput = ((lParam & 0x80000000u) == 0); - PostThreadMessage(g_threadID, SYNERGY_MSG_DEBUG, + PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG, 0xff000000u | wParam, lParam); // discard event @@ -209,7 +209,7 @@ doKeyboardHookHandler(WPARAM wParam, LPARAM lParam) // if we're expecting fake input then just pass the event through // and do not forward to the server if (g_fakeInput) { - PostThreadMessage(g_threadID, SYNERGY_MSG_DEBUG, + PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG, 0xfe000000u | wParam, lParam); return false; } @@ -221,13 +221,13 @@ doKeyboardHookHandler(WPARAM wParam, LPARAM lParam) } // tell server about event - PostThreadMessage(g_threadID, SYNERGY_MSG_DEBUG, wParam, lParam); + PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG, wParam, lParam); // ignore dead key release if ((g_deadVirtKey == wParam || g_deadRelease == wParam) && (lParam & 0x80000000u) != 0) { g_deadRelease = 0; - PostThreadMessage(g_threadID, SYNERGY_MSG_DEBUG, + PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG, wParam | 0x04000000, lParam); return false; } @@ -309,13 +309,13 @@ doKeyboardHookHandler(WPARAM wParam, LPARAM lParam) // if mapping failed and ctrl and alt are pressed then try again // with both not pressed. this handles the case where ctrl and // alt are being used as individual modifiers rather than AltGr. - // we note that's the case in the message sent back to synergy + // we note that's the case in the message sent back to barrier // because there's no simple way to deduce it after the fact. // we have to put the dead key back first, if there was one. bool noAltGr = false; if (n == 0 && (control & 0x80) != 0 && (menu & 0x80) != 0) { noAltGr = true; - PostThreadMessage(g_threadID, SYNERGY_MSG_DEBUG, + PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG, wParam | 0x05000000, lParam); if (g_deadVirtKey != 0) { if (ToAscii((UINT)g_deadVirtKey, (g_deadLParam & 0x10ff0000u) >> 16, @@ -339,7 +339,7 @@ doKeyboardHookHandler(WPARAM wParam, LPARAM lParam) n = ToAscii((UINT)wParam, scanCode, keys2, &c, flags); } - PostThreadMessage(g_threadID, SYNERGY_MSG_DEBUG, + PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG, wParam | ((c & 0xff) << 8) | ((n & 0xff) << 16) | 0x06000000, lParam); @@ -381,9 +381,9 @@ doKeyboardHookHandler(WPARAM wParam, LPARAM lParam) // and release for the dead key to our window. WPARAM deadCharAndVirtKey = makeKeyMsg((UINT)g_deadVirtKey, (char)LOBYTE(c), noAltGr); - PostThreadMessage(g_threadID, SYNERGY_MSG_KEY, + PostThreadMessage(g_threadID, BARRIER_MSG_KEY, deadCharAndVirtKey, g_deadLParam & 0x7fffffffu); - PostThreadMessage(g_threadID, SYNERGY_MSG_KEY, + PostThreadMessage(g_threadID, BARRIER_MSG_KEY, deadCharAndVirtKey, g_deadLParam | 0x80000000u); // use uncomposed character @@ -412,9 +412,9 @@ doKeyboardHookHandler(WPARAM wParam, LPARAM lParam) // XXX -- with hot keys for actions we may only need to do this when // forwarding. if (charAndVirtKey != 0) { - PostThreadMessage(g_threadID, SYNERGY_MSG_DEBUG, + PostThreadMessage(g_threadID, BARRIER_MSG_DEBUG, charAndVirtKey | 0x07000000, lParam); - PostThreadMessage(g_threadID, SYNERGY_MSG_KEY, charAndVirtKey, lParam); + PostThreadMessage(g_threadID, BARRIER_MSG_KEY, charAndVirtKey, lParam); } if (g_mode == kHOOK_RELAY_EVENTS) { @@ -483,13 +483,13 @@ doMouseHookHandler(WPARAM wParam, SInt32 x, SInt32 y, SInt32 data) case WM_NCRBUTTONUP: case WM_NCXBUTTONUP: // always relay the event. eat it if relaying. - PostThreadMessage(g_threadID, SYNERGY_MSG_MOUSE_BUTTON, wParam, data); + PostThreadMessage(g_threadID, BARRIER_MSG_MOUSE_BUTTON, wParam, data); return (g_mode == kHOOK_RELAY_EVENTS); case WM_MOUSEWHEEL: if (g_mode == kHOOK_RELAY_EVENTS) { // relay event - PostThreadMessage(g_threadID, SYNERGY_MSG_MOUSE_WHEEL, data, 0); + PostThreadMessage(g_threadID, BARRIER_MSG_MOUSE_WHEEL, data, 0); } return (g_mode == kHOOK_RELAY_EVENTS); @@ -497,7 +497,7 @@ doMouseHookHandler(WPARAM wParam, SInt32 x, SInt32 y, SInt32 data) case WM_MOUSEMOVE: if (g_mode == kHOOK_RELAY_EVENTS) { // relay and eat event - PostThreadMessage(g_threadID, SYNERGY_MSG_MOUSE_MOVE, x, y); + PostThreadMessage(g_threadID, BARRIER_MSG_MOUSE_MOVE, x, y); return true; } else if (g_mode == kHOOK_WATCH_JUMP_ZONE) { @@ -544,7 +544,7 @@ doMouseHookHandler(WPARAM wParam, SInt32 x, SInt32 y, SInt32 data) } // relay the event - PostThreadMessage(g_threadID, SYNERGY_MSG_MOUSE_MOVE, x, y); + PostThreadMessage(g_threadID, BARRIER_MSG_MOUSE_MOVE, x, y); // if inside and not bogus then eat the event return inside && !bogus; @@ -634,7 +634,7 @@ getMessageHook(int code, WPARAM wParam, LPARAM lParam) msg->wParam == SC_SCREENSAVE) { // broadcast screen saver started message PostThreadMessage(g_threadID, - SYNERGY_MSG_SCREEN_SAVER, TRUE, 0); + BARRIER_MSG_SCREEN_SAVER, TRUE, 0); } } if (g_mode == kHOOK_RELAY_EVENTS) { @@ -642,7 +642,7 @@ getMessageHook(int code, WPARAM wParam, LPARAM lParam) if (g_wheelSupport == kWheelOld && msg->message == g_wmMouseWheel) { // post message to our window PostThreadMessage(g_threadID, - SYNERGY_MSG_MOUSE_WHEEL, + BARRIER_MSG_MOUSE_WHEEL, static_cast(msg->wParam & 0xffffu), 0); // zero out the delta in the message so it's (hopefully) diff --git a/src/lib/synwinhk/synwinhk.h b/src/lib/synwinhk/synwinhk.h index fe279248..45f34daf 100644 --- a/src/lib/synwinhk/synwinhk.h +++ b/src/lib/synwinhk/synwinhk.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2002 Chris Schoeneman * @@ -32,26 +32,26 @@ #include #if defined(synwinhk_EXPORTS) -#define CSYNERGYHOOK_API __declspec(dllexport) +#define CBARRIERHOOK_API __declspec(dllexport) #else -#define CSYNERGYHOOK_API __declspec(dllimport) +#define CBARRIERHOOK_API __declspec(dllimport) #endif -#define SYNERGY_MSG_MARK WM_APP + 0x0011 // mark id; -#define SYNERGY_MSG_KEY WM_APP + 0x0012 // vk code; key data -#define SYNERGY_MSG_MOUSE_BUTTON WM_APP + 0x0013 // button msg; -#define SYNERGY_MSG_MOUSE_WHEEL WM_APP + 0x0014 // delta; -#define SYNERGY_MSG_MOUSE_MOVE WM_APP + 0x0015 // x; y -#define SYNERGY_MSG_POST_WARP WM_APP + 0x0016 // ; -#define SYNERGY_MSG_PRE_WARP WM_APP + 0x0017 // x; y -#define SYNERGY_MSG_SCREEN_SAVER WM_APP + 0x0018 // activated; -#define SYNERGY_MSG_DEBUG WM_APP + 0x0019 // data, data -#define SYNERGY_MSG_INPUT_FIRST SYNERGY_MSG_KEY -#define SYNERGY_MSG_INPUT_LAST SYNERGY_MSG_PRE_WARP -#define SYNERGY_HOOK_LAST_MSG SYNERGY_MSG_DEBUG +#define BARRIER_MSG_MARK WM_APP + 0x0011 // mark id; +#define BARRIER_MSG_KEY WM_APP + 0x0012 // vk code; key data +#define BARRIER_MSG_MOUSE_BUTTON WM_APP + 0x0013 // button msg; +#define BARRIER_MSG_MOUSE_WHEEL WM_APP + 0x0014 // delta; +#define BARRIER_MSG_MOUSE_MOVE WM_APP + 0x0015 // x; y +#define BARRIER_MSG_POST_WARP WM_APP + 0x0016 // ; +#define BARRIER_MSG_PRE_WARP WM_APP + 0x0017 // x; y +#define BARRIER_MSG_SCREEN_SAVER WM_APP + 0x0018 // activated; +#define BARRIER_MSG_DEBUG WM_APP + 0x0019 // data, data +#define BARRIER_MSG_INPUT_FIRST BARRIER_MSG_KEY +#define BARRIER_MSG_INPUT_LAST BARRIER_MSG_PRE_WARP +#define BARRIER_HOOK_LAST_MSG BARRIER_MSG_DEBUG -#define SYNERGY_HOOK_FAKE_INPUT_VIRTUAL_KEY VK_CANCEL -#define SYNERGY_HOOK_FAKE_INPUT_SCANCODE 0 +#define BARRIER_HOOK_FAKE_INPUT_VIRTUAL_KEY VK_CANCEL +#define BARRIER_HOOK_FAKE_INPUT_SCANCODE 0 extern "C" { @@ -77,15 +77,15 @@ typedef void (*SetSidesFunc)(UInt32); typedef void (*SetZoneFunc)(SInt32, SInt32, SInt32, SInt32, SInt32); typedef void (*SetModeFunc)(int); -CSYNERGYHOOK_API int init(DWORD); -CSYNERGYHOOK_API int cleanup(void); -CSYNERGYHOOK_API EHookResult install(void); -CSYNERGYHOOK_API int uninstall(void); -CSYNERGYHOOK_API int installScreenSaver(void); -CSYNERGYHOOK_API int uninstallScreenSaver(void); -CSYNERGYHOOK_API void setSides(UInt32 sides); -CSYNERGYHOOK_API void setZone(SInt32 x, SInt32 y, SInt32 w, SInt32 h, +CBARRIERHOOK_API int init(DWORD); +CBARRIERHOOK_API int cleanup(void); +CBARRIERHOOK_API EHookResult install(void); +CBARRIERHOOK_API int uninstall(void); +CBARRIERHOOK_API int installScreenSaver(void); +CBARRIERHOOK_API int uninstallScreenSaver(void); +CBARRIERHOOK_API void setSides(UInt32 sides); +CBARRIERHOOK_API void setZone(SInt32 x, SInt32 y, SInt32 w, SInt32 h, SInt32 jumpZoneSize); -CSYNERGYHOOK_API void setMode(EHookMode mode); +CBARRIERHOOK_API void setMode(EHookMode mode); } diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 1f78ae06..daecb317 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2011 Nick Bolton # diff --git a/src/test/global/TestEventQueue.cpp b/src/test/global/TestEventQueue.cpp index f28c46dd..d2029228 100644 --- a/src/test/global/TestEventQueue.cpp +++ b/src/test/global/TestEventQueue.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/global/TestEventQueue.h b/src/test/global/TestEventQueue.h index 28a38758..a6cf0caa 100644 --- a/src/test/global/TestEventQueue.h +++ b/src/test/global/TestEventQueue.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/global/gmock.h b/src/test/global/gmock.h index 5008c9b7..64597f40 100644 --- a/src/test/global/gmock.h +++ b/src/test/global/gmock.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/global/gtest.h b/src/test/global/gtest.h index 3c729eb0..0b2acbcd 100644 --- a/src/test/global/gtest.h +++ b/src/test/global/gtest.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/guitests/src/VersionCheckerTests.cpp b/src/test/guitests/src/VersionCheckerTests.cpp index 350c3e90..0efc5f96 100644 --- a/src/test/guitests/src/VersionCheckerTests.cpp +++ b/src/test/guitests/src/VersionCheckerTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/test/guitests/src/VersionCheckerTests.h b/src/test/guitests/src/VersionCheckerTests.h index 8d17af90..7884f3a8 100644 --- a/src/test/guitests/src/VersionCheckerTests.h +++ b/src/test/guitests/src/VersionCheckerTests.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/test/guitests/src/main.cpp b/src/test/guitests/src/main.cpp index 4ca2fb7f..2ff6e729 100644 --- a/src/test/guitests/src/main.cpp +++ b/src/test/guitests/src/main.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt index f39968a3..a412ecc0 100644 --- a/src/test/integtests/CMakeLists.txt +++ b/src/test/integtests/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -49,7 +49,7 @@ file(GLOB_RECURSE mock_sources "../../test/mock/*.cpp") list(APPEND headers ${mock_headers}) list(APPEND sources ${mock_sources}) -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() @@ -68,4 +68,4 @@ endif() add_executable(integtests ${sources}) target_link_libraries(integtests - arch base client common io ipc mt net platform server synergy gtest gmock ${libs} ${OPENSSL_LIBS}) + arch base client common io ipc mt net platform server barrier gtest gmock ${libs} ${OPENSSL_LIBS}) diff --git a/src/test/integtests/Main.cpp b/src/test/integtests/Main.cpp index 15598db2..76b42b6e 100644 --- a/src/test/integtests/Main.cpp +++ b/src/test/integtests/Main.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * diff --git a/src/test/integtests/arch/ArchInternetTests.cpp b/src/test/integtests/arch/ArchInternetTests.cpp index 95823e9f..722df2f3 100644 --- a/src/test/integtests/arch/ArchInternetTests.cpp +++ b/src/test/integtests/arch/ArchInternetTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #include "test/global/gtest.h" #define TEST_URL "https://symless.com/tests/?testString" -//#define TEST_URL "http://localhost/synergy/tests/?testString" +//#define TEST_URL "http://localhost/barrier/tests/?testString" TEST(ArchInternetTests, get) { diff --git a/src/test/integtests/ipc/IpcTests.cpp b/src/test/integtests/ipc/IpcTests.cpp index fc9ed8da..a0ee241b 100644 --- a/src/test/integtests/ipc/IpcTests.cpp +++ b/src/test/integtests/ipc/IpcTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2012 Nick Bolton * diff --git a/src/test/integtests/net/NetworkTests.cpp b/src/test/integtests/net/NetworkTests.cpp index 996ead1a..4a9a9f0d 100644 --- a/src/test/integtests/net/NetworkTests.cpp +++ b/src/test/integtests/net/NetworkTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -22,15 +22,15 @@ #include "test/mock/server/MockConfig.h" #include "test/mock/server/MockPrimaryClient.h" -#include "test/mock/synergy/MockScreen.h" +#include "test/mock/barrier/MockScreen.h" #include "test/mock/server/MockInputFilter.h" #include "test/global/TestEventQueue.h" #include "server/Server.h" #include "server/ClientListener.h" #include "server/ClientProxy.h" #include "client/Client.h" -#include "synergy/FileChunk.h" -#include "synergy/StreamChunker.h" +#include "barrier/FileChunk.h" +#include "barrier/StreamChunker.h" #include "net/SocketMultiplexer.h" #include "net/NetworkAddress.h" #include "net/TCPSocketFactory.h" @@ -424,7 +424,7 @@ void NetworkTests::sendMockData(void* eventTarget) { // send first message (file size) - String size = synergy::string::sizeTypeToString(kMockDataSize); + String size = barrier::string::sizeTypeToString(kMockDataSize); FileChunk* sizeMessage = FileChunk::start(size); m_events.addEvent(Event(m_events.forFile().fileChunkSending(), eventTarget, sizeMessage)); @@ -468,19 +468,19 @@ newMockData(size_t size) size_t headSize = sizeof(head) - 1; const UInt8 tail[] = "... mock tail"; size_t tailSize = sizeof(tail) - 1; - const UInt8 synergyRocks[] = "synergy\0 rocks! "; - size_t synergyRocksSize = sizeof(synergyRocks) - 1; + const UInt8 barrierRocks[] = "barrier\0 rocks! "; + size_t barrierRocksSize = sizeof(barrierRocks) - 1; memcpy(data, head, headSize); data += headSize; - size_t times = (size - headSize - tailSize) / synergyRocksSize; + size_t times = (size - headSize - tailSize) / barrierRocksSize; for (size_t i = 0; i < times; ++i) { - memcpy(data, synergyRocks, synergyRocksSize); - data += synergyRocksSize; + memcpy(data, barrierRocks, barrierRocksSize); + data += barrierRocksSize; } - size_t remainder = (size - headSize - tailSize) % synergyRocksSize; + size_t remainder = (size - headSize - tailSize) % barrierRocksSize; if (remainder != 0) { memset(data, '.', remainder); data += remainder; diff --git a/src/test/integtests/platform/MSWindowsClipboardTests.cpp b/src/test/integtests/platform/MSWindowsClipboardTests.cpp index bd5b7346..f9d09d14 100644 --- a/src/test/integtests/platform/MSWindowsClipboardTests.cpp +++ b/src/test/integtests/platform/MSWindowsClipboardTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -74,7 +74,7 @@ TEST_F(MSWindowsClipboardTests, empty_singleFormat_hasReturnsFalse) { MSWindowsClipboard clipboard(NULL); clipboard.open(0); - clipboard.add(MSWindowsClipboard::kText, "synergy rocks!"); + clipboard.add(MSWindowsClipboard::kText, "barrier rocks!"); clipboard.empty(); @@ -87,10 +87,10 @@ TEST_F(MSWindowsClipboardTests, add_newValue_valueWasStored) MSWindowsClipboard clipboard(NULL); clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("barrier rocks!", actual); } TEST_F(MSWindowsClipboardTests, add_newValue_writeWasCalled) @@ -102,7 +102,7 @@ TEST_F(MSWindowsClipboardTests, add_newValue_writeWasCalled) clipboard.setFacade(facade); clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); } TEST_F(MSWindowsClipboardTests, add_replaceValue_valueWasReplaced) @@ -110,7 +110,7 @@ TEST_F(MSWindowsClipboardTests, add_replaceValue_valueWasReplaced) MSWindowsClipboard clipboard(NULL); clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding. String actual = clipboard.get(IClipboard::kText); @@ -177,7 +177,7 @@ TEST_F(MSWindowsClipboardTests, has_withFormatAdded_returnsTrue) MSWindowsClipboard clipboard(NULL); clipboard.open(0); clipboard.empty(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); bool actual = clipboard.has(IClipboard::kText); @@ -211,19 +211,19 @@ TEST_F(MSWindowsClipboardTests, get_withFormatAdded_returnsExpected) MSWindowsClipboard clipboard(NULL); clipboard.open(0); clipboard.empty(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("barrier rocks!", actual); } -TEST_F(MSWindowsClipboardTests, isOwnedBySynergy_defaultState_noError) +TEST_F(MSWindowsClipboardTests, isOwnedByBarrier_defaultState_noError) { MSWindowsClipboard clipboard(NULL); clipboard.open(0); - bool actual = clipboard.isOwnedBySynergy(); + bool actual = clipboard.isOwnedByBarrier(); EXPECT_EQ(true, actual); } diff --git a/src/test/integtests/platform/MSWindowsKeyStateTests.cpp b/src/test/integtests/platform/MSWindowsKeyStateTests.cpp index 0affab6e..474a0b86 100644 --- a/src/test/integtests/platform/MSWindowsKeyStateTests.cpp +++ b/src/test/integtests/platform/MSWindowsKeyStateTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -18,8 +18,8 @@ #define TEST_ENV -#include "test/mock/synergy/MockEventQueue.h" -#include "test/mock/synergy/MockKeyMap.h" +#include "test/mock/barrier/MockEventQueue.h" +#include "test/mock/barrier/MockKeyMap.h" #include "platform/MSWindowsKeyState.h" #include "platform/MSWindowsDesks.h" #include "platform/MSWindowsScreen.h" @@ -30,7 +30,7 @@ #include "test/global/gmock.h" // wParam = flags, HIBYTE(lParam) = virtual key, LOBYTE(lParam) = scan code -#define SYNERGY_MSG_FAKE_KEY SYNERGY_HOOK_LAST_MSG + 4 +#define BARRIER_MSG_FAKE_KEY BARRIER_HOOK_LAST_MSG + 4 using ::testing::_; using ::testing::NiceMock; diff --git a/src/test/integtests/platform/OSXClipboardTests.cpp b/src/test/integtests/platform/OSXClipboardTests.cpp index c2222a5b..45b73bd8 100644 --- a/src/test/integtests/platform/OSXClipboardTests.cpp +++ b/src/test/integtests/platform/OSXClipboardTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -35,7 +35,7 @@ TEST(OSXClipboardTests, empty_singleFormat_hasReturnsFalse) { OSXClipboard clipboard; clipboard.open(0); - clipboard.add(OSXClipboard::kText, "synergy rocks!"); + clipboard.add(OSXClipboard::kText, "barrier rocks!"); clipboard.empty(); @@ -48,10 +48,10 @@ TEST(OSXClipboardTests, add_newValue_valueWasStored) OSXClipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("barrier rocks!", actual); } TEST(OSXClipboardTests, add_replaceValue_valueWasReplaced) @@ -59,7 +59,7 @@ TEST(OSXClipboardTests, add_replaceValue_valueWasReplaced) OSXClipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding. String actual = clipboard.get(IClipboard::kText); @@ -122,7 +122,7 @@ TEST(OSXClipboardTests, has_withFormatAdded_returnsTrue) OSXClipboard clipboard; clipboard.open(0); clipboard.empty(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); bool actual = clipboard.has(IClipboard::kText); @@ -156,9 +156,9 @@ TEST(OSXClipboardTests, get_withFormatAdded_returnsExpected) OSXClipboard clipboard; clipboard.open(0); clipboard.empty(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("barrier rocks!", actual); } diff --git a/src/test/integtests/platform/OSXKeyStateTests.cpp b/src/test/integtests/platform/OSXKeyStateTests.cpp index 963794d7..4957aaa4 100644 --- a/src/test/integtests/platform/OSXKeyStateTests.cpp +++ b/src/test/integtests/platform/OSXKeyStateTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#include "test/mock/synergy/MockKeyMap.h" -#include "test/mock/synergy/MockEventQueue.h" +#include "test/mock/barrier/MockKeyMap.h" +#include "test/mock/barrier/MockEventQueue.h" #include "platform/OSXKeyState.h" #include "base/Log.h" @@ -40,7 +40,7 @@ public: TEST_F(OSXKeyStateTests, fakeAndPoll_shift) { - synergy::KeyMap keyMap; + barrier::KeyMap keyMap; MockEventQueue eventQueue; OSXKeyState keyState(&eventQueue, keyMap); keyState.updateKeyMap(); @@ -60,7 +60,7 @@ TEST_F(OSXKeyStateTests, fakeAndPoll_shift) TEST_F(OSXKeyStateTests, fakeAndPoll_charKey) { - synergy::KeyMap keyMap; + barrier::KeyMap keyMap; MockEventQueue eventQueue; OSXKeyState keyState(&eventQueue, keyMap); keyState.updateKeyMap(); @@ -79,7 +79,7 @@ TEST_F(OSXKeyStateTests, fakeAndPoll_charKey) TEST_F(OSXKeyStateTests, fakeAndPoll_charKeyAndModifier) { - synergy::KeyMap keyMap; + barrier::KeyMap keyMap; MockEventQueue eventQueue; OSXKeyState keyState(&eventQueue, keyMap); keyState.updateKeyMap(); diff --git a/src/test/integtests/platform/OSXScreenTests.cpp b/src/test/integtests/platform/OSXScreenTests.cpp index 66f37e09..96beb4db 100644 --- a/src/test/integtests/platform/OSXScreenTests.cpp +++ b/src/test/integtests/platform/OSXScreenTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/integtests/platform/XWindowsClipboardTests.cpp b/src/test/integtests/platform/XWindowsClipboardTests.cpp index 0cd0f710..652ee5ed 100644 --- a/src/test/integtests/platform/XWindowsClipboardTests.cpp +++ b/src/test/integtests/platform/XWindowsClipboardTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -77,7 +77,7 @@ TEST_F(CXWindowsClipboardTests, empty_openCalled_returnsTrue) TEST_F(CXWindowsClipboardTests, empty_singleFormat_hasReturnsFalse) { CXWindowsClipboard clipboard = createClipboard(); - clipboard.add(CXWindowsClipboard::kText, "synergy rocks!"); + clipboard.add(CXWindowsClipboard::kText, "barrier rocks!"); clipboard.empty(); @@ -89,17 +89,17 @@ TEST_F(CXWindowsClipboardTests, add_newValue_valueWasStored) { CXWindowsClipboard clipboard = createClipboard(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("barrier rocks!", actual); } TEST_F(CXWindowsClipboardTests, add_replaceValue_valueWasReplaced) { CXWindowsClipboard clipboard = createClipboard(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding. String actual = clipboard.get(IClipboard::kText); @@ -119,7 +119,7 @@ TEST_F(CXWindowsClipboardTests, close_isOpen_noErrors) TEST_F(CXWindowsClipboardTests, has_withFormatAdded_returnsTrue) { CXWindowsClipboard clipboard = createClipboard(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); bool actual = clipboard.has(IClipboard::kText); @@ -147,11 +147,11 @@ TEST_F(CXWindowsClipboardTests, get_withNoFormats_returnsEmpty) TEST_F(CXWindowsClipboardTests, get_withFormatAdded_returnsExpected) { CXWindowsClipboard clipboard = createClipboard(); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("barrier rocks!", actual); } #endif diff --git a/src/test/integtests/platform/XWindowsKeyStateTests.cpp b/src/test/integtests/platform/XWindowsKeyStateTests.cpp index 69fe64a9..ea8ce441 100644 --- a/src/test/integtests/platform/XWindowsKeyStateTests.cpp +++ b/src/test/integtests/platform/XWindowsKeyStateTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -18,8 +18,8 @@ #define TEST_ENV -#include "test/mock/synergy/MockKeyMap.h" -#include "test/mock/synergy/MockEventQueue.h" +#include "test/mock/barrier/MockKeyMap.h" +#include "test/mock/barrier/MockEventQueue.h" #include "platform/XWindowsKeyState.h" #include "base/Log.h" @@ -171,13 +171,13 @@ TEST_F(XWindowsKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCor KeyCode key = XKeysymToKeycode(m_display, XK_Shift_L); - // fake shift key down (without using synergy) + // fake shift key down (without using barrier) XTestFakeKeyEvent(m_display, key, true, CurrentTime); // function under test (1st call) KeyModifierMask modDown = keyState.pollActiveModifiers(); - // fake shift key up (without using synergy) + // fake shift key up (without using barrier) XTestFakeKeyEvent(m_display, key, false, CurrentTime); // function under test (2nd call) diff --git a/src/test/integtests/platform/XWindowsScreenSaverTests.cpp b/src/test/integtests/platform/XWindowsScreenSaverTests.cpp index e9a5e937..c6a2710c 100644 --- a/src/test/integtests/platform/XWindowsScreenSaverTests.cpp +++ b/src/test/integtests/platform/XWindowsScreenSaverTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -19,7 +19,7 @@ // TODO: fix tests #if 0 -#include "test/mock/synergy/MockEventQueue.h" +#include "test/mock/barrier/MockEventQueue.h" #include "platform/XWindowsScreenSaver.h" #include "test/global/gtest.h" diff --git a/src/test/integtests/platform/XWindowsScreenTests.cpp b/src/test/integtests/platform/XWindowsScreenTests.cpp index a328cee9..b74599c9 100644 --- a/src/test/integtests/platform/XWindowsScreenTests.cpp +++ b/src/test/integtests/platform/XWindowsScreenTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "test/mock/synergy/MockEventQueue.h" +#include "test/mock/barrier/MockEventQueue.h" #include "platform/XWindowsScreen.h" #include "test/global/gtest.h" diff --git a/src/test/mock/synergy/MockApp.h b/src/test/mock/barrier/MockApp.h similarity index 91% rename from src/test/mock/synergy/MockApp.h rename to src/test/mock/barrier/MockApp.h index ba437b4d..91745d35 100644 --- a/src/test/mock/synergy/MockApp.h +++ b/src/test/mock/barrier/MockApp.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #define TEST_ENV -#include "synergy/App.h" +#include "barrier/App.h" #include "test/global/gmock.h" @@ -40,5 +40,5 @@ public: MOCK_METHOD0(startNode, void()); MOCK_METHOD0(mainLoop, int()); MOCK_METHOD2(foregroundStartup, int(int, char**)); - MOCK_METHOD0(createScreen, synergy::Screen*()); + MOCK_METHOD0(createScreen, barrier::Screen*()); }; diff --git a/src/test/mock/synergy/MockArgParser.h b/src/test/mock/barrier/MockArgParser.h similarity index 92% rename from src/test/mock/synergy/MockArgParser.h rename to src/test/mock/barrier/MockArgParser.h index 66b14057..b1dc07c1 100644 --- a/src/test/mock/synergy/MockArgParser.h +++ b/src/test/mock/barrier/MockArgParser.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #define TEST_ENV -#include "synergy/ArgParser.h" +#include "barrier/ArgParser.h" #include "test/global/gmock.h" diff --git a/src/test/mock/synergy/MockEventQueue.h b/src/test/mock/barrier/MockEventQueue.h similarity index 98% rename from src/test/mock/synergy/MockEventQueue.h rename to src/test/mock/barrier/MockEventQueue.h index dbfbe3bb..f2737369 100644 --- a/src/test/mock/synergy/MockEventQueue.h +++ b/src/test/mock/barrier/MockEventQueue.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * diff --git a/src/test/mock/synergy/MockKeyMap.h b/src/test/mock/barrier/MockKeyMap.h similarity index 90% rename from src/test/mock/synergy/MockKeyMap.h rename to src/test/mock/barrier/MockKeyMap.h index d1419ec4..ef711a5e 100644 --- a/src/test/mock/synergy/MockKeyMap.h +++ b/src/test/mock/barrier/MockKeyMap.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -18,11 +18,11 @@ #pragma once -#include "synergy/KeyMap.h" +#include "barrier/KeyMap.h" #include "test/global/gmock.h" -class MockKeyMap : public synergy::KeyMap +class MockKeyMap : public barrier::KeyMap { public: MOCK_METHOD1(swap, void(KeyMap&)); diff --git a/src/test/mock/synergy/MockKeyState.h b/src/test/mock/barrier/MockKeyState.h similarity index 86% rename from src/test/mock/synergy/MockKeyState.h rename to src/test/mock/barrier/MockKeyState.h index 052201c7..308e90a0 100644 --- a/src/test/mock/synergy/MockKeyState.h +++ b/src/test/mock/barrier/MockKeyState.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -18,7 +18,7 @@ #pragma once -#include "synergy/KeyState.h" +#include "barrier/KeyState.h" #include "test/global/gmock.h" @@ -36,14 +36,14 @@ public: } MockKeyState(const MockEventQueue& eventQueue, const MockKeyMap& keyMap) : - KeyState((IEventQueue*)&eventQueue, (synergy::KeyMap&)keyMap) + KeyState((IEventQueue*)&eventQueue, (barrier::KeyMap&)keyMap) { } MOCK_CONST_METHOD0(pollActiveGroup, SInt32()); MOCK_CONST_METHOD0(pollActiveModifiers, KeyModifierMask()); MOCK_METHOD0(fakeCtrlAltDel, bool()); - MOCK_METHOD1(getKeyMap, void(synergy::KeyMap&)); + MOCK_METHOD1(getKeyMap, void(barrier::KeyMap&)); MOCK_METHOD1(fakeKey, void(const Keystroke&)); MOCK_METHOD1(fakeMediaKey, bool(KeyID)); MOCK_CONST_METHOD1(pollPressedKeys, void(KeyButtonSet&)); @@ -54,4 +54,4 @@ typedef ::testing::NiceMock KeyStateImpl; typedef UInt32 KeyID; typedef void (*ForeachKeyCallback)( - KeyID, SInt32 group, synergy::KeyMap::KeyItem&, void* userData); + KeyID, SInt32 group, barrier::KeyMap::KeyItem&, void* userData); diff --git a/src/test/mock/synergy/MockScreen.h b/src/test/mock/barrier/MockScreen.h similarity index 86% rename from src/test/mock/synergy/MockScreen.h rename to src/test/mock/barrier/MockScreen.h index 2ad2f8e3..78c195aa 100644 --- a/src/test/mock/synergy/MockScreen.h +++ b/src/test/mock/barrier/MockScreen.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,14 +19,14 @@ #define TEST_ENV -#include "synergy/Screen.h" +#include "barrier/Screen.h" #include "test/global/gmock.h" -class MockScreen : public synergy::Screen +class MockScreen : public barrier::Screen { public: - MockScreen() : synergy::Screen() { } + MockScreen() : barrier::Screen() { } MOCK_METHOD0(disable, void()); MOCK_CONST_METHOD4(getShape, void(SInt32&, SInt32&, SInt32&, SInt32&)); MOCK_CONST_METHOD2(getCursorPos, void(SInt32&, SInt32&)); diff --git a/src/test/mock/io/MockStream.h b/src/test/mock/io/MockStream.h index 6265578d..bd127398 100644 --- a/src/test/mock/io/MockStream.h +++ b/src/test/mock/io/MockStream.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -24,7 +24,7 @@ class IEventQueue; -class MockStream : public synergy::IStream +class MockStream : public barrier::IStream { public: MockStream() { } diff --git a/src/test/mock/ipc/MockIpcServer.h b/src/test/mock/ipc/MockIpcServer.h index 1ea4d33b..4124b41e 100644 --- a/src/test/mock/ipc/MockIpcServer.h +++ b/src/test/mock/ipc/MockIpcServer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/mock/server/MockConfig.h b/src/test/mock/server/MockConfig.h index 72fa02c0..4161de0c 100644 --- a/src/test/mock/server/MockConfig.h +++ b/src/test/mock/server/MockConfig.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/mock/server/MockInputFilter.h b/src/test/mock/server/MockInputFilter.h index 12815752..edf6de18 100644 --- a/src/test/mock/server/MockInputFilter.h +++ b/src/test/mock/server/MockInputFilter.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/mock/server/MockPrimaryClient.h b/src/test/mock/server/MockPrimaryClient.h index 253a6ceb..80f18a1e 100644 --- a/src/test/mock/server/MockPrimaryClient.h +++ b/src/test/mock/server/MockPrimaryClient.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/mock/server/MockServer.h b/src/test/mock/server/MockServer.h index a2fa75b0..a45ee083 100644 --- a/src/test/mock/server/MockServer.h +++ b/src/test/mock/server/MockServer.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2013-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt index 54131eb2..91c31555 100644 --- a/src/test/unittests/CMakeLists.txt +++ b/src/test/unittests/CMakeLists.txt @@ -1,4 +1,4 @@ -# synergy -- mouse and keyboard sharing utility +# barrier -- mouse and keyboard sharing utility # Copyright (C) 2012-2016 Symless Ltd. # Copyright (C) 2009 Nick Bolton # @@ -62,10 +62,10 @@ if (UNIX) ) endif() -if (SYNERGY_ADD_HEADERS) +if (BARRIER_ADD_HEADERS) list(APPEND sources ${headers}) endif() add_executable(unittests ${sources}) target_link_libraries(unittests - arch base client server common io net platform server synergy mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) + arch base client server common io net platform server barrier mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) diff --git a/src/test/unittests/Main.cpp b/src/test/unittests/Main.cpp index 46e586a5..7f0d0fe6 100644 --- a/src/test/unittests/Main.cpp +++ b/src/test/unittests/Main.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * diff --git a/src/test/unittests/synergy/ArgParserTests.cpp b/src/test/unittests/barrier/ArgParserTests.cpp similarity index 97% rename from src/test/unittests/synergy/ArgParserTests.cpp rename to src/test/unittests/barrier/ArgParserTests.cpp index 504b690e..e14877e1 100644 --- a/src/test/unittests/synergy/ArgParserTests.cpp +++ b/src/test/unittests/barrier/ArgParserTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" -#include "synergy/ArgsBase.h" +#include "barrier/ArgParser.h" +#include "barrier/ArgsBase.h" #include "test/global/gtest.h" diff --git a/src/test/unittests/synergy/ClientArgsParsingTests.cpp b/src/test/unittests/barrier/ClientArgsParsingTests.cpp similarity index 91% rename from src/test/unittests/synergy/ClientArgsParsingTests.cpp rename to src/test/unittests/barrier/ClientArgsParsingTests.cpp index 7a4f9473..5a1e7d07 100644 --- a/src/test/unittests/synergy/ClientArgsParsingTests.cpp +++ b/src/test/unittests/barrier/ClientArgsParsingTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" -#include "synergy/ClientArgs.h" -#include "test/mock/synergy/MockArgParser.h" +#include "barrier/ArgParser.h" +#include "barrier/ClientArgs.h" +#include "test/mock/barrier/MockArgParser.h" #include "test/global/gtest.h" @@ -51,7 +51,7 @@ TEST(ClientArgsParsingTests, parseClientArgs_yScrollArg_setYScroll) EXPECT_EQ(1, clientArgs.m_yscroll); } -TEST(ClientArgsParsingTests, parseClientArgs_addressArg_setSynergyAddress) +TEST(ClientArgsParsingTests, parseClientArgs_addressArg_setBarrierAddress) { NiceMock argParser; ON_CALL(argParser, parseGenericArgs(_, _, _)).WillByDefault(Invoke(client_stubParseGenericArgs)); @@ -62,7 +62,7 @@ TEST(ClientArgsParsingTests, parseClientArgs_addressArg_setSynergyAddress) bool result = argParser.parseClientArgs(clientArgs, argc, kAddressCmd); - EXPECT_EQ("mock_address", clientArgs.m_synergyAddress); + EXPECT_EQ("mock_address", clientArgs.m_barrierAddress); EXPECT_EQ(true, result); } diff --git a/src/test/unittests/synergy/ClipboardChunkTests.cpp b/src/test/unittests/barrier/ClipboardChunkTests.cpp similarity index 96% rename from src/test/unittests/synergy/ClipboardChunkTests.cpp rename to src/test/unittests/barrier/ClipboardChunkTests.cpp index 1e547a46..9dc4a5ec 100644 --- a/src/test/unittests/synergy/ClipboardChunkTests.cpp +++ b/src/test/unittests/barrier/ClipboardChunkTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#include "synergy/ClipboardChunk.h" -#include "synergy/protocol_types.h" +#include "barrier/ClipboardChunk.h" +#include "barrier/protocol_types.h" #include "test/global/gtest.h" diff --git a/src/test/unittests/synergy/ClipboardTests.cpp b/src/test/unittests/barrier/ClipboardTests.cpp similarity index 89% rename from src/test/unittests/synergy/ClipboardTests.cpp rename to src/test/unittests/barrier/ClipboardTests.cpp index 2b1b8494..f7107510 100644 --- a/src/test/unittests/synergy/ClipboardTests.cpp +++ b/src/test/unittests/barrier/ClipboardTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "synergy/Clipboard.h" +#include "barrier/Clipboard.h" #include "test/global/gtest.h" @@ -34,7 +34,7 @@ TEST(ClipboardTests, empty_singleFormat_hasReturnsFalse) { Clipboard clipboard; clipboard.open(0); - clipboard.add(Clipboard::kText, "synergy rocks!"); + clipboard.add(Clipboard::kText, "barrier rocks!"); clipboard.empty(); @@ -47,10 +47,10 @@ TEST(ClipboardTests, add_newValue_valueWasStored) Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("barrier rocks!", actual); } TEST(ClipboardTests, add_replaceValue_valueWasReplaced) @@ -58,7 +58,7 @@ TEST(ClipboardTests, add_replaceValue_valueWasReplaced) Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding. String actual = clipboard.get(IClipboard::kText); @@ -118,7 +118,7 @@ TEST(ClipboardTests, has_withFormatAdded_returnsTrue) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); bool actual = clipboard.has(IClipboard::kText); @@ -149,11 +149,11 @@ TEST(ClipboardTests, get_withFormatAdded_returnsExpected) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("barrier rocks!", actual); } TEST(ClipboardTests, marshall_addNotCalled_firstCharIsZero) @@ -171,7 +171,7 @@ TEST(ClipboardTests, marshall_withTextAdded_typeCharIsText) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); clipboard.close(); String actual = clipboard.marshall(); @@ -184,7 +184,7 @@ TEST(ClipboardTests, marshall_withTextAdded_lastSizeCharIs14) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); // 14 chars + clipboard.add(IClipboard::kText, "barrier rocks!"); // 14 chars clipboard.close(); String actual = clipboard.marshall(); @@ -199,11 +199,11 @@ TEST(ClipboardTests, marshall_withTextSize285_sizeCharsValid) { // 285 chars String data; - data.append("Synergy is Free and Open Source Software that lets you "); + data.append("Barrier is Free and Open Source Software that lets you "); data.append("easily share your mouse and keyboard between multiple "); data.append("computers, where each computer has it's own display. No "); data.append("special hardware is required, all you need is a local area "); - data.append("network. Synergy is supported on Windows, Mac OS X and Linux."); + data.append("network. Barrier is supported on Windows, Mac OS X and Linux."); Clipboard clipboard; clipboard.open(0); @@ -242,7 +242,7 @@ TEST(ClipboardTests, marshall_withHtmlAndText_has2Formats) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks"); + clipboard.add(IClipboard::kText, "barrier rocks"); clipboard.add(IClipboard::kHTML, "html sucks"); clipboard.close(); @@ -260,13 +260,13 @@ TEST(ClipboardTests, marshall_withTextAdded_endsWithAdded) { Clipboard clipboard; clipboard.open(0); - clipboard.add(IClipboard::kText, "synergy rocks!"); + clipboard.add(IClipboard::kText, "barrier rocks!"); clipboard.close(); String actual = clipboard.marshall(); // string contains other data, but should end in the string we added. - EXPECT_EQ("synergy rocks!", actual.substr(12)); + EXPECT_EQ("barrier rocks!", actual.substr(12)); } TEST(ClipboardTests, unmarshall_emptyData_hasTextIsFalse) @@ -292,11 +292,11 @@ TEST(ClipboardTests, unmarshall_withTextSize285_getTextIsValid) // 285 chars String text; - text.append("Synergy is Free and Open Source Software that lets you "); + text.append("Barrier is Free and Open Source Software that lets you "); text.append("easily share your mouse and keyboard between multiple "); text.append("computers, where each computer has it's own display. No "); text.append("special hardware is required, all you need is a local area "); - text.append("network. Synergy is supported on Windows, Mac OS X and Linux."); + text.append("network. Barrier is supported on Windows, Mac OS X and Linux."); String data; data += (char)0; @@ -336,7 +336,7 @@ TEST(ClipboardTests, unmarshall_withTextAndHtml_getTextIsValid) data += (char)0; data += (char)0; data += (char)14; - data += "synergy rocks!"; + data += "barrier rocks!"; data += (char)0; data += (char)0; data += (char)0; @@ -351,7 +351,7 @@ TEST(ClipboardTests, unmarshall_withTextAndHtml_getTextIsValid) clipboard.open(0); String actual = clipboard.get(IClipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("barrier rocks!", actual); } TEST(ClipboardTests, unmarshall_withTextAndHtml_getHtmlIsValid) @@ -370,7 +370,7 @@ TEST(ClipboardTests, unmarshall_withTextAndHtml_getHtmlIsValid) data += (char)0; data += (char)0; data += (char)14; - data += "synergy rocks!"; + data += "barrier rocks!"; data += (char)0; data += (char)0; data += (char)0; @@ -392,7 +392,7 @@ TEST(ClipboardTests, copy_withSingleText_clipboardsAreEqual) { Clipboard clipboard1; clipboard1.open(0); - clipboard1.add(Clipboard::kText, "synergy rocks!"); + clipboard1.add(Clipboard::kText, "barrier rocks!"); clipboard1.close(); Clipboard clipboard2; @@ -400,5 +400,5 @@ TEST(ClipboardTests, copy_withSingleText_clipboardsAreEqual) clipboard2.open(0); String actual = clipboard2.get(Clipboard::kText); - EXPECT_EQ("synergy rocks!", actual); + EXPECT_EQ("barrier rocks!", actual); } diff --git a/src/test/unittests/synergy/DeprecatedArgsParsingTests.cpp b/src/test/unittests/barrier/DeprecatedArgsParsingTests.cpp similarity index 92% rename from src/test/unittests/synergy/DeprecatedArgsParsingTests.cpp rename to src/test/unittests/barrier/DeprecatedArgsParsingTests.cpp index 7996c99b..2856166f 100644 --- a/src/test/unittests/synergy/DeprecatedArgsParsingTests.cpp +++ b/src/test/unittests/barrier/DeprecatedArgsParsingTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" +#include "barrier/ArgParser.h" #include "test/global/gtest.h" -using namespace synergy; +using namespace barrier; TEST(DeprecatedArgsParsingTests, parseDeprecatedArgs_cryptoPass_returnTrue) { diff --git a/src/test/unittests/synergy/GenericArgsParsingTests.cpp b/src/test/unittests/barrier/GenericArgsParsingTests.cpp similarity index 97% rename from src/test/unittests/synergy/GenericArgsParsingTests.cpp rename to src/test/unittests/barrier/GenericArgsParsingTests.cpp index e2fa954a..f43070b3 100644 --- a/src/test/unittests/synergy/GenericArgsParsingTests.cpp +++ b/src/test/unittests/barrier/GenericArgsParsingTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" -#include "synergy/ArgsBase.h" -#include "test/mock/synergy/MockApp.h" +#include "barrier/ArgParser.h" +#include "barrier/ArgsBase.h" +#include "test/mock/barrier/MockApp.h" #include "test/global/gtest.h" -using namespace synergy; +using namespace barrier; using ::testing::_; using ::testing::Invoke; using ::testing::NiceMock; diff --git a/src/test/unittests/synergy/KeyMapTests.cpp b/src/test/unittests/barrier/KeyMapTests.cpp similarity index 98% rename from src/test/unittests/synergy/KeyMapTests.cpp rename to src/test/unittests/barrier/KeyMapTests.cpp index 43847c11..59806339 100644 --- a/src/test/unittests/synergy/KeyMapTests.cpp +++ b/src/test/unittests/barrier/KeyMapTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless * * This package is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "synergy/KeyMap.h" +#include "barrier/KeyMap.h" #include "test/global/gtest.h" #include "test/global/gmock.h" @@ -27,7 +27,7 @@ using ::testing::Return; using ::testing::ReturnRef; using ::testing::SaveArg; -namespace synergy { +namespace barrier { TEST(KeyMapTests, findBestKey_requiredDown_matchExactFirstItem) { diff --git a/src/test/unittests/synergy/KeyStateTests.cpp b/src/test/unittests/barrier/KeyStateTests.cpp similarity index 94% rename from src/test/unittests/synergy/KeyStateTests.cpp rename to src/test/unittests/barrier/KeyStateTests.cpp index bbe3b79f..d4154d8e 100644 --- a/src/test/unittests/synergy/KeyStateTests.cpp +++ b/src/test/unittests/barrier/KeyStateTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -#include "test/mock/synergy/MockKeyState.h" -#include "test/mock/synergy/MockEventQueue.h" -#include "test/mock/synergy/MockKeyMap.h" +#include "test/mock/barrier/MockKeyState.h" +#include "test/mock/barrier/MockEventQueue.h" +#include "test/mock/barrier/MockKeyMap.h" #include "test/global/gtest.h" #include "test/global/gmock.h" @@ -36,16 +36,16 @@ stubPollPressedKeys(IKeyState::KeyButtonSet& pressedKeys); void assertMaskIsOne(ForeachKeyCallback cb, void* userData); -const synergy::KeyMap::KeyItem* +const barrier::KeyMap::KeyItem* stubMapKey( - synergy::KeyMap::Keystrokes& keys, KeyID id, SInt32 group, - synergy::KeyMap::ModifierToKeys& activeModifiers, + barrier::KeyMap::Keystrokes& keys, KeyID id, SInt32 group, + barrier::KeyMap::ModifierToKeys& activeModifiers, KeyModifierMask& currentState, KeyModifierMask desiredMask, bool isAutoRepeat); -synergy::KeyMap::Keystroke s_stubKeystroke(1, false, false); -synergy::KeyMap::KeyItem s_stubKeyItem; +barrier::KeyMap::Keystroke s_stubKeystroke(1, false, false); +barrier::KeyMap::KeyItem s_stubKeyItem; TEST(CKeyStateTests, onKey_aKeyDown_keyStateOne) { @@ -324,14 +324,14 @@ TEST(KeyStateTests, fakeKeyRepeat_nullKey_returnsFalse) KeyStateImpl keyState(eventQueue, keyMap); // set the key to down (we need to make mapKey return a valid key to do this). - synergy::KeyMap::KeyItem keyItem; + barrier::KeyMap::KeyItem keyItem; keyItem.m_client = 0; keyItem.m_button = 1; ON_CALL(keyMap, mapKey(_, _, _, _, _, _, _)).WillByDefault(Return(&keyItem)); keyState.fakeKeyDown(1, 0, 0); // change mapKey to return NULL so that fakeKeyRepeat exits early. - synergy::KeyMap::KeyItem* nullKeyItem = NULL; + barrier::KeyMap::KeyItem* nullKeyItem = NULL; ON_CALL(keyMap, mapKey(_, _, _, _, _, _, _)).WillByDefault(Return(nullKeyItem)); bool actual = keyState.fakeKeyRepeat(1, 0, 0, 0); @@ -346,7 +346,7 @@ TEST(KeyStateTests, fakeKeyRepeat_invalidButton_returnsFalse) KeyStateImpl keyState(eventQueue, keyMap); // set the key to down (we need to make mapKey return a valid key to do this). - synergy::KeyMap::KeyItem keyItem; + barrier::KeyMap::KeyItem keyItem; keyItem.m_client = 0; keyItem.m_button = 1; // set to 1 to make fakeKeyDown work. ON_CALL(keyMap, mapKey(_, _, _, _, _, _, _)).WillByDefault(Return(&keyItem)); @@ -367,7 +367,7 @@ TEST(KeyStateTests, fakeKeyRepeat_validKey_returnsTrue) MockEventQueue eventQueue; KeyStateImpl keyState(eventQueue, keyMap); s_stubKeyItem.m_client = 0; - s_stubKeystroke.m_type = synergy::KeyMap::Keystroke::kButton; + s_stubKeystroke.m_type = barrier::KeyMap::Keystroke::kButton; s_stubKeystroke.m_data.m_button.m_button = 2; // set the button to 1 for fakeKeyDown call @@ -475,10 +475,10 @@ assertMaskIsOne(ForeachKeyCallback cb, void* userData) ASSERT_EQ(1, ((KeyState::AddActiveModifierContext*)userData)->m_mask); } -const synergy::KeyMap::KeyItem* +const barrier::KeyMap::KeyItem* stubMapKey( - synergy::KeyMap::Keystrokes& keys, KeyID id, SInt32 group, - synergy::KeyMap::ModifierToKeys& activeModifiers, + barrier::KeyMap::Keystrokes& keys, KeyID id, SInt32 group, + barrier::KeyMap::ModifierToKeys& activeModifiers, KeyModifierMask& currentState, KeyModifierMask desiredMask, bool isAutoRepeat) diff --git a/src/test/unittests/synergy/ServerArgsParsingTests.cpp b/src/test/unittests/barrier/ServerArgsParsingTests.cpp similarity index 86% rename from src/test/unittests/synergy/ServerArgsParsingTests.cpp rename to src/test/unittests/barrier/ServerArgsParsingTests.cpp index cb330cb6..ed5ed850 100644 --- a/src/test/unittests/synergy/ServerArgsParsingTests.cpp +++ b/src/test/unittests/barrier/ServerArgsParsingTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -#include "synergy/ArgParser.h" -#include "synergy/ServerArgs.h" -#include "test/mock/synergy/MockArgParser.h" +#include "barrier/ArgParser.h" +#include "barrier/ServerArgs.h" +#include "test/mock/barrier/MockArgParser.h" #include "test/global/gtest.h" @@ -37,7 +37,7 @@ server_stubCheckUnexpectedArgs() return false; } -TEST(ServerArgsParsingTests, parseServerArgs_addressArg_setSynergyAddress) +TEST(ServerArgsParsingTests, parseServerArgs_addressArg_setBarrierAddress) { NiceMock argParser; ON_CALL(argParser, parseGenericArgs(_, _, _)).WillByDefault(Invoke(server_stubParseGenericArgs)); @@ -48,7 +48,7 @@ TEST(ServerArgsParsingTests, parseServerArgs_addressArg_setSynergyAddress) argParser.parseServerArgs(serverArgs, argc, kAddressCmd); - EXPECT_EQ("mock_address", serverArgs.m_synergyAddress); + EXPECT_EQ("mock_address", serverArgs.m_barrierAddress); } TEST(ServerArgsParsingTests, parseServerArgs_configArg_setConfigFile) diff --git a/src/test/unittests/base/StringTests.cpp b/src/test/unittests/base/StringTests.cpp index 7d5e939e..39ad6e80 100644 --- a/src/test/unittests/base/StringTests.cpp +++ b/src/test/unittests/base/StringTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2014-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #include "test/global/gtest.h" -using namespace synergy; +using namespace barrier; TEST(StringTests, format_formatWithArguments_formatedString) { diff --git a/src/test/unittests/ipc/IpcLogOutputterTests.cpp b/src/test/unittests/ipc/IpcLogOutputterTests.cpp index 22adfdf1..bbfed9c4 100644 --- a/src/test/unittests/ipc/IpcLogOutputterTests.cpp +++ b/src/test/unittests/ipc/IpcLogOutputterTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2015-2016 Symless Ltd. * * This package is free software; you can redistribute it and/or @@ -38,7 +38,7 @@ using ::testing::Property; using ::testing::StrEq; using ::testing::AtLeast; -using namespace synergy; +using namespace barrier; inline const Matcher IpcLogLineMessageEq(const String& s) { const Matcher m( diff --git a/src/test/unittests/platform/OSXKeyStateTests.cpp b/src/test/unittests/platform/OSXKeyStateTests.cpp index 3222c19f..dd9e80fa 100644 --- a/src/test/unittests/platform/OSXKeyStateTests.cpp +++ b/src/test/unittests/platform/OSXKeyStateTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2011 Nick Bolton * @@ -16,16 +16,16 @@ * along with this program. If not, see . */ -#include "test/mock/synergy/MockKeyMap.h" -#include "test/mock/synergy/MockEventQueue.h" +#include "test/mock/barrier/MockKeyMap.h" +#include "test/mock/barrier/MockEventQueue.h" #include "platform/OSXKeyState.h" #include "test/global/gtest.h" #include "test/global/gmock.h" -TEST(OSXKeyStateTests, mapModifiersFromOSX_OSXMask_returnSynergyMask) +TEST(OSXKeyStateTests, mapModifiersFromOSX_OSXMask_returnBarrierMask) { - synergy::KeyMap keyMap; + barrier::KeyMap keyMap; MockEventQueue eventQueue; OSXKeyState keyState(&eventQueue, keyMap); diff --git a/src/test/unittests/shared/SerialKeyTests.cpp b/src/test/unittests/shared/SerialKeyTests.cpp index 37d811d4..c4af0cec 100644 --- a/src/test/unittests/shared/SerialKeyTests.cpp +++ b/src/test/unittests/shared/SerialKeyTests.cpp @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2016 Symless Inc. * * This package is free software; you can redistribute it and/or @@ -36,7 +36,7 @@ TEST(SerialKeyTests, decode_invalidDigit_returnEmptyString) TEST(SerialKeyTests, decode_validSerial_returnPlainText) { std::string plainText = SerialKey::decode("53796E6572677920726F636B7321"); - EXPECT_EQ("Synergy rocks!", plainText); + EXPECT_EQ("Barrier rocks!", plainText); } TEST(SerialKeyTests, parse_noParty_invalid) @@ -49,7 +49,7 @@ TEST(SerialKeyTests, parse_noParty_invalid) TEST(SerialKeyTests, parse_invalidPartsLenghth_invalid) { SerialKey serial; - bool r = serial.parse("{Synergy;Rocks}"); + bool r = serial.parse("{Barrier;Rocks}"); EXPECT_FALSE(r); }