Merge branch 'master' into master

README.md

@@ -8,7 +8,7 @@ and a [snap](https://snapcraft.io/barrier).
 
 ### Contact info:
 
-- `#barrier` on freenode
+- `#barrier` on libera IRC network
 
 #### CI Build Status
 
@@ -47,6 +47,20 @@ Compatibility. We use more than one operating system and you probably do, too. W
 
 Communication. Everything we do is in the open. Our issue tracker will let you see if others are having the same problem you're having and will allow you to add additional information. You will also be able to see when progress is made and how the issue gets resolved.
 
+### Usage
+
+Install and run barrier on each machine that will be sharing.
+On the machine with the keyboard and mouse, make it the server.
+
+Click the "Configure server" button and drag a new screen onto the grid for each client machine.
+Ensure the "screen name" matches exactly (case-sensitive) for each configured screen -- the clients' barrier windows will tell you their screen names (just above the server IP).
+
+On the client(s), put in the server machine's IP address (or use Bonjour/auto configuration when prompted) and "start" them.
+You should see `Barrier is running` on both server and clients.
+You should now be able to move the mouse between all the screens as if they were the same machine.
+
+Note that if the keyboard's Scroll Lock is active then this will prevent the mouse from switching screens.
+
 ### Contact & support
 
 Please be aware that the *only* way to draw our attention to a bug is to create a new issue in [the issue tracker](https://github.com/debauchee/barrier/issues). Write a clear, concise, detailed report and you will get a clear, concise, detailed response. Priority is always given to issues that affect a wider range of users.
@@ -86,3 +100,14 @@ A:
 Q: Are 32-bit versions of Windows supported?
 
 A: No
+
+Q: How do I load my configuration on startup?
+
+A: Start the binary with the argument `--config <path_to_saved_configuration>`
+
+Q: After loading my configuration on the client the field 'Server IP' is still empty!
+
+A: Edit your configuration to include the servers ip adress manually with 
+	(...)
+	section: options
+		serverhostname=<AAA.BBB.CCC.DDD>

azure-pipelines/download_install_qt.ps1

@@ -21,6 +21,6 @@ Write-Output 'Installed QLI Installer Dependencies'
 
 Write-Output 'Starting QT Installer'
 $Env:QLI_OUT_DIR = ".\deps\Qt\Qt$qt_version"
-$Env:QLI_BASE_URL = "http://mirrors.ocf.berkeley.edu/qt/online/qtsdkrepository/"
+$Env:QLI_BASE_URL = "https://download.qt.io/online/qtsdkrepository/"
 python .\deps\qli-installer\qli-installer.py $qt_version windows desktop win64_msvc2017_64
 Write-Output 'Installed QT Installer'

dist/macos/bundle/build_dist.sh.in

@@ -48,7 +48,7 @@ fi
 # Check for macdeployqt on Homebrew
 if which -s brew ; then
     info "Homebrew found, searching for macdeployqt"
-    DEPLOYQT="$(brew list qt5 | grep --only '/.*macdeployqt' | head -1)"
+    DEPLOYQT="$(brew list qt@5 | grep --only '/.*macdeployqt' | head -1)"
     if [ ! -x "$DEPLOYQT" ]; then
         error Please install package qt
         exit 1

doc/newsfragments/fix-x11-paste.bugfix

@@ -0,0 +1 @@
+ Map more X11 clipboard MIME types to corresponding converters (https://github.com/debauchee/barrier/issues/344).

doc/newsfragments/translation_chinese.bugfix

@@ -0,0 +1 @@
+Updated Chinese translation.

doc/newsfragments/translation_slovak.bugfix

@@ -0,0 +1 @@
+Updated Slovak translation.

osx_environment.sh

@@ -29,7 +29,7 @@ if [ ! $BARRIER_BUILD_ENV ]; then
 
     elif command -v brew; then
         printf "Detected Homebrew\n"
-        QT_PATH=$(brew --prefix qt5)
+        QT_PATH=$(brew --prefix qt@5)
 
         check_dir_exists "$QT_PATH" 'qt5'
 

src/gui/res/lang/gui_ko.ts

@@ -204,7 +204,7 @@ Visit our website for help and info (symless.com).
         <location filename="src/MainWindow.cpp" line="364"/>
         <source>&lt;p&gt;Your version of Barrier is out of date. Version &lt;b&gt;%1&lt;/b&gt; is now available to &lt;a href=&quot;%2&quot;&gt;download&lt;/a&gt;.&lt;/p&gt;</source>
         <oldsource>&lt;p&gt;Version %1 is now available, &lt;a href=&quot;%2&quot;&gt;visit website&lt;/a&gt;.&lt;/p&gt;</oldsource>
-        <translation type="finished">&lt;p&gt;사용 중인 시너지는 최신 버전이 아닙니다. 새 버전(&lt;b&gt;%1&lt;/b&gt;)을 &lt;a href=&quot;%2&quot;&gt;다운로드&lt;/a&gt; 받을 수 있습니다.&lt;/p&gt;</translation>
+        <translation type="finished">&lt;p&gt;사용 중인 배리어는 최신 버전이 아닙니다. 새 버전(&lt;b&gt;%1&lt;/b&gt;)을 &lt;a href=&quot;%2&quot;&gt;다운로드&lt;/a&gt; 받을 수 있습니다.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="src/MainWindow.cpp" line="577"/>
@@ -600,7 +600,7 @@ To automatically trust this fingerprint for future connections, click Yes. To re
     <message>
         <location filename="res/PluginWizardPageBase.ui" line="14"/>
         <source>Setup Barrier</source>
-        <translation type="finished">시너지 설정</translation>
+        <translation type="finished">배리어 설정</translation>
     </message>
     <message>
         <location filename="res/PluginWizardPageBase.ui" line="101"/>
@@ -1176,7 +1176,7 @@ This allows Barrier to interact with elevated processes and the UAC dialog, but
     <message>
         <location filename="src/SetupWizard.cpp" line="72"/>
         <source>Setup Barrier</source>
-        <translation type="finished">시너지 설정</translation>
+        <translation type="finished">배리어 설정</translation>
     </message>
     <message>
         <location filename="src/SetupWizard.cpp" line="113"/>
@@ -1194,7 +1194,7 @@ This allows Barrier to interact with elevated processes and the UAC dialog, but
     <message>
         <location filename="res/SetupWizardBase.ui" line="26"/>
         <source>Setup Barrier</source>
-        <translation type="finished">시너지 설정</translation>
+        <translation type="finished">배리어 설정</translation>
     </message>
     <message>
         <location filename="res/SetupWizardBase.ui" line="30"/>
@@ -1204,7 +1204,7 @@ This allows Barrier to interact with elevated processes and the UAC dialog, but
     <message>
         <location filename="res/SetupWizardBase.ui" line="39"/>
         <source>Thanks for installing Barrier!</source>
-        <translation type="finished">시너지를 설치하여 주셔서 감사합니다.</translation>
+        <translation type="finished">배리어를 설치하여 주셔서 감사합니다.</translation>
     </message>
     <message>
         <location filename="res/SetupWizardBase.ui" line="114"/>

src/lib/net/SecureSocket.cpp

@@ -829,7 +829,7 @@ SecureSocket::showSecureCipherInfo()
         showCipherStackDesc(sStack);
     }
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 	// m_ssl->m_ssl->session->ciphers is not forward compatable,
 	// In future release of OpenSSL, it's not visible,
     STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;

src/lib/platform/XWindowsClipboard.cpp

@@ -84,9 +84,13 @@ XWindowsClipboard::XWindowsClipboard(IXWindowsImpl* impl, Display* display,
     // add converters, most desired first
     m_converters.push_back(new XWindowsClipboardHTMLConverter(m_display,
                                 "text/html"));
+    m_converters.push_back(new XWindowsClipboardHTMLConverter(m_display,
+                                "application/x-moz-nativehtml"));
     m_converters.push_back(new XWindowsClipboardBMPConverter(m_display));
     m_converters.push_back(new XWindowsClipboardUTF8Converter(m_display,
                                 "text/plain;charset=UTF-8"));
+    m_converters.push_back(new XWindowsClipboardUTF8Converter(m_display,
+                                "text/plain;charset=utf-8"));
     m_converters.push_back(new XWindowsClipboardUTF8Converter(m_display,
                                 "UTF8_STRING"));
     m_converters.push_back(new XWindowsClipboardUCS2Converter(m_display,