smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into v1-issue-6538-systemscope-setting

Browse source
This commit is contained in:
Jamie Newbon 2020-03-27 14:53:39 +00:00
commit ab92492d65
16 changed files with 124 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,4 +1,4 @@
v1.11.1-rc2
v1.11.1-stable
===========
Bug fixes:

1
README.md
View file

@ -23,5 +23,6 @@ Not for the faint hearted. Only use these if you know what you're doing.
* [Getting Started](https://github.com/symless/synergy-core/wiki/Getting-Started) - How to checkout the code from git and use the right branch.
* [Compiling](https://github.com/symless/synergy-core/wiki/Compiling) - Instructions on how to compile Synergy Core from source.
* [Translations](https://crowdin.com/project/synergy-core) - If you want to submit translations to the Synergy Core.
* [Text Config](https://github.com/symless/synergy-core/wiki/Text-Config) - Write a text config file when running Synergy Core manually.
* [Command Line](https://github.com/symless/synergy-core/wiki/Command-Line) - Go full manual and run Synergy Core from the command line.

53
azure-pipelines.yml
View file

@ -26,19 +26,15 @@ jobs:
make
displayName: 'Build'
- job: LinuxDeb
- job: LinuxDeb1
pool:
vmImage: 'ubuntu-16.04'
strategy:
matrix:
ubuntu16:
image: symless/ubuntu-sudo:16.04
ubuntu18:
image: symless/ubuntu-sudo:18.04
ubuntu19:
image: symless/ubuntu-sudo:19.04
debian9:
image: symless/debian-sudo:stretch
container: $[ variables['image'] ]
@ -47,13 +43,15 @@ jobs:
sudo ln -snf /usr/share/zoneinfo/Europe/London /etc/localtime
sudo bash -c "echo 'Europe/London' > /etc/timezone"
displayName: 'Sort out timezones for updates'
- script: |
sudo DEBIAN_FRONTEND=noninteractive
sudo DEBIAN_FRONTEND=noninteractive
sudo apt-get -y update
sudo apt-get -y upgrade
sudo apt-get -y install git cmake qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts
sudo apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends #These will try to install gnome if we allow dependancies
displayName: 'Install Pakages'
- script: |
mkdir build
cd build
@ -61,11 +59,50 @@ jobs:
make
displayName: 'Build'
- job: LinuxDeb2
pool:
vmImage: 'ubuntu-16.04'
strategy:
matrix:
ubuntu16:
image: symless/ubuntu-sudo:16.04
debian9:
image: symless/debian-sudo:stretch
container: $[ variables['image'] ]
steps:
- script: |
sudo ln -snf /usr/share/zoneinfo/Europe/London /etc/localtime
sudo bash -c "echo 'Europe/London' > /etc/timezone"
displayName: 'Sort out timezones for updates'
- script: |
sudo DEBIAN_FRONTEND=noninteractive
sudo apt-get -y update
sudo apt-get -y upgrade
sudo apt-get -y install git qtbase5-dev build-essential libx11-dev libxtst-dev libgl1-mesa-dev libssl-dev libavahi-compat-libdnssd-dev debhelper devscripts
sudo apt-get -y install qttools5-dev qttools5-dev-tools --no-install-recommends #These will try to install gnome if we allow dependancies
displayName: 'Install Pakages'
- script: |
sudo DEBIAN_FRONTEND=noninteractive
sudo apt-get -y install wget
wget https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.sh
sudo chmod +x ./cmake-3.14.7-Linux-x86_64.sh
sudo ./cmake-3.14.7-Linux-x86_64.sh --skip-license --prefix=/
displayName: 'Installing CMake 3.14'
- script: |
mkdir build
cd build
cmake ..
make
displayName: 'Build'
- job: MacOS
strategy:
matrix:
sierra:
image: macOS-10.13
mojave:
image: macOS-10.14

2
cmake/Version.cmake
View file

@ -6,7 +6,7 @@ cmake_minimum_required (VERSION 3.4)
set (SYNERGY_VERSION_MAJOR 1)
set (SYNERGY_VERSION_MINOR 11)
set (SYNERGY_VERSION_PATCH 1)
set (SYNERGY_VERSION_PATCH 2)
set (SYNERGY_VERSION_STAGE "snapshot")
#

2
src/CMakeLists.txt
View file

@ -22,3 +22,5 @@ add_subdirectory(cmd)
if (SYNERGY_BUILD_LEGACY_GUI)
add_subdirectory(gui)
endif (SYNERGY_BUILD_LEGACY_GUI)
add_subdirectory(test)

5
src/gui/CMakeLists.txt
View file

@ -12,6 +12,10 @@ file (GLOB LEGACY_ACTIVATION_FILES src/*Activation* src/*License*)
file (GLOB LEGACY_ZEROCONF_FILES src/Zeroconf*)
file (GLOB LEGACY_LANGUAGE_FILES res/lang/*.ts)
configure_file(res/Languages.qrc res/Languages.qrc)
set_source_files_properties(${LEGACY_LANGUAGE_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/res/lang")
qt5_add_translation(QM_FILES ${LEGACY_LANGUAGE_FILES})
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@ -34,6 +38,7 @@ add_executable (synergy WIN32
${LEGACY_GUI_UI_FILES}
${LEGACY_GUI_RC_FILES}
res/Synergy.qrc
${CMAKE_CURRENT_BINARY_DIR}/res/Languages.qrc
${QM_FILES}
)

2
src/gui/lang.cmd
View file

@ -1 +1 @@
lupdate -noobsolete gui.pro -ts gui.ts
lupdate -noobsolete gui.pro -ts gui.ts res/lang/*.ts

46
src/gui/res/Languages.qrc Normal file
View file

@ -0,0 +1,46 @@
<RCC>
<qresource prefix="/res">
<file>lang/gui_ar-SA.qm</file>
<file>lang/gui_lv-LV.qm</file>
<file>lang/gui_bg-BG.qm</file>
<file>lang/gui_mr-IN.qm</file>
<file>lang/gui_ca-ES.qm</file>
<file>lang/gui_nl-NL.qm</file>
<file>lang/gui_cs-CZ.qm</file>
<file>lang/gui_no-NO.qm</file>
<file>lang/gui_cy-GB.qm</file>
<file>lang/gui_pl-PL.qm</file>
<file>lang/gui_da-DK.qm</file>
<file>lang/gui_pt-BR.qm</file>
<file>lang/gui_de-DE.qm</file>
<file>lang/gui_pt-PT.qm</file>
<file>lang/gui_el-GR.qm</file>
<file>lang/gui_ro-RO.qm</file>
<file>lang/gui_ru-RU.qm</file>
<file>lang/gui_es-ES.qm</file>
<file>lang/gui_sk-SK.qm</file>
<file>lang/gui_et-EE.qm</file>
<file>lang/gui_sl-SI.qm</file>
<file>lang/gui_fi-FI.qm</file>
<file>lang/gui_sq-AL.qm</file>
<file>lang/gui_fr-FR.qm</file>
<file>lang/gui_sr-SP.qm</file>
<file>lang/gui_gl-ES.qm</file>
<file>lang/gui_sv-SE.qm</file>
<file>lang/gui_he-IL.qm</file>
<file>lang/gui_th-TH.qm</file>
<file>lang/gui_hr-HR.qm</file>
<file>lang/gui_tr-TR.qm</file>
<file>lang/gui_hu-HU.qm</file>
<file>lang/gui_uk-UA.qm</file>
<file>lang/gui_id-ID.qm</file>
<file>lang/gui_ur-IN.qm</file>
<file>lang/gui_it-IT.qm</file>
<file>lang/gui_vi-VN.qm</file>
<file>lang/gui_ja-JP.qm</file>
<file>lang/gui_zh-CN.qm</file>
<file>lang/gui_ko-KR.qm</file>
<file>lang/gui_zh-TW.qm</file>
<file>lang/gui_lt-LT.qm</file>
</qresource>
</RCC>

1
src/gui/res/Synergy.qrc
View file

@ -18,5 +18,6 @@
<file>icons/64x64/synergy-light-transfering.png</file>
<file>icons/64x64/synergy-light-disconnected.png</file>
<file>icons/64x64/synergy-light-connected.png</file>
<file>icons/16x16/auto-config.png</file>
</qresource>
</RCC>

8
src/gui/src/MainWindow.cpp
View file

@ -17,6 +17,7 @@
*/
#define DOWNLOAD_URL "http://symless.com/?source=gui"
#define HELP_URL "http://symless.com/help?source=gui"
#include <iostream>
@ -312,6 +313,8 @@ void MainWindow::createMenuBar()
m_pMenuWindow->addAction(m_pActionMinimize);
m_pMenuWindow->addAction(m_pActionRestore);
m_pMenuHelp->addAction(m_pActionAbout);
m_pMenuHelp->addAction(m_pActionHelp);
setMenuBar(m_pMenuBar);
}
@ -1270,6 +1273,11 @@ void MainWindow::on_m_pActionAbout_triggered()
dlg.exec();
}
void MainWindow::on_m_pActionHelp_triggered()
{
QDesktopServices::openUrl(QUrl(HELP_URL));
}
void MainWindow::updateZeroconfService()
{
#ifndef SYNERGY_ENTERPRISE

1
src/gui/src/MainWindow.h
View file

@ -149,6 +149,7 @@ public slots:
void on_m_pButtonConfigureServer_clicked();
bool on_m_pActionSave_triggered();
void on_m_pActionAbout_triggered();
void on_m_pActionHelp_triggered();
void on_m_pActionSettings_triggered();
void on_m_pActivate_triggered();
void synergyFinished(int exitCode, QProcess::ExitStatus);

8
src/gui/src/MainWindowBase.ui
View file

@ -535,6 +535,14 @@
<string notr="true"/>
</property>
</action>
<action name="m_pActionHelp">
<property name="text">
<string>Visit &amp;help site</string>
</property>
<property name="shortcut">
<string notr="true"/>
</property>
</action>
<action name="m_pActionQuit">
<property name="text">
<string>&amp;Quit</string>

12
src/gui/src/SetupWizardBase.ui
View file

@ -156,11 +156,7 @@
</size>
</property>
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;My main mouse and keyboard are connected to this computer. This will allow you to move your mouse over to another computer's screen. There can only be one server in your setup.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>My main mouse and keyboard are connected to this computer. This will allow you to move your mouse over to another computer's screen. There can only be one server in your setup.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@ -205,11 +201,7 @@ p, li { white-space: pre-wrap; }
</size>
</property>
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;You have already set up a server. This computer will be controlled using the server's mouse and keyboard. There can be many clients in your setup.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>You have already set up a server. This computer will be controlled using the server's mouse and keyboard. There can be many clients in your setup.</string>
</property>
<property name="wordWrap">
<bool>true</bool>

2
src/test/integtests/CMakeLists.txt
View file

@ -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 synlib gtest gmock ${libs} ${OPENSSL_LIBS})

37
src/test/integtests/arch/ArchInternetTests.cpp
View file

@ -1,37 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2014-2016 Symless Ltd.
*
* This package is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* found in the file LICENSE that should have accompanied this file.
*
* This package is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "arch/Arch.h"
#include "test/global/gtest.h"
#define TEST_URL "https://symless.com/tests/?testString"
//#define TEST_URL "http://localhost/synergy/tests/?testString"
TEST(ArchInternetTests, get)
{
ARCH_INTERNET internet;
String result = internet.get(TEST_URL);
ASSERT_EQ("Hello world!", result);
}
TEST(ArchInternetTests, urlEncode)
{
ARCH_INTERNET internet;
String result = internet.urlEncode("hello=+&world");
ASSERT_EQ("hello%3D%2B%26world", result);
}

2
src/test/unittests/CMakeLists.txt
View file

@ -68,4 +68,4 @@ 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 synlib mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS})