diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6d9888eb5..158b235a6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index f662d61e6..bdb4d1f9d 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -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} ) diff --git a/src/gui/lang.cmd b/src/gui/lang.cmd index 44185934c..9fb094333 100644 --- a/src/gui/lang.cmd +++ b/src/gui/lang.cmd @@ -1 +1 @@ -lupdate -noobsolete gui.pro -ts gui.ts \ No newline at end of file +lupdate -noobsolete gui.pro -ts gui.ts res/lang/*.ts \ No newline at end of file diff --git a/src/gui/res/Languages.qrc b/src/gui/res/Languages.qrc new file mode 100644 index 000000000..f4a718cb3 --- /dev/null +++ b/src/gui/res/Languages.qrc @@ -0,0 +1,46 @@ + + + lang/gui_ar-SA.qm + lang/gui_lv-LV.qm + lang/gui_bg-BG.qm + lang/gui_mr-IN.qm + lang/gui_ca-ES.qm + lang/gui_nl-NL.qm + lang/gui_cs-CZ.qm + lang/gui_no-NO.qm + lang/gui_cy-GB.qm + lang/gui_pl-PL.qm + lang/gui_da-DK.qm + lang/gui_pt-BR.qm + lang/gui_de-DE.qm + lang/gui_pt-PT.qm + lang/gui_el-GR.qm + lang/gui_ro-RO.qm + lang/gui_ru-RU.qm + lang/gui_es-ES.qm + lang/gui_sk-SK.qm + lang/gui_et-EE.qm + lang/gui_sl-SI.qm + lang/gui_fi-FI.qm + lang/gui_sq-AL.qm + lang/gui_fr-FR.qm + lang/gui_sr-SP.qm + lang/gui_gl-ES.qm + lang/gui_sv-SE.qm + lang/gui_he-IL.qm + lang/gui_th-TH.qm + lang/gui_hr-HR.qm + lang/gui_tr-TR.qm + lang/gui_hu-HU.qm + lang/gui_uk-UA.qm + lang/gui_id-ID.qm + lang/gui_ur-IN.qm + lang/gui_it-IT.qm + lang/gui_vi-VN.qm + lang/gui_ja-JP.qm + lang/gui_zh-CN.qm + lang/gui_ko-KR.qm + lang/gui_zh-TW.qm + lang/gui_lt-LT.qm + + diff --git a/src/gui/res/Synergy.qrc b/src/gui/res/Synergy.qrc index d17aab71d..0d73e05fb 100644 --- a/src/gui/res/Synergy.qrc +++ b/src/gui/res/Synergy.qrc @@ -18,5 +18,6 @@ icons/64x64/synergy-light-transfering.png icons/64x64/synergy-light-disconnected.png icons/64x64/synergy-light-connected.png + icons/16x16/auto-config.png diff --git a/src/gui/src/SetupWizardBase.ui b/src/gui/src/SetupWizardBase.ui index 8c0898861..7ec85fb45 100644 --- a/src/gui/src/SetupWizardBase.ui +++ b/src/gui/src/SetupWizardBase.ui @@ -156,11 +156,7 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">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.</span></p></body></html> + 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. true @@ -205,11 +201,7 @@ p, li { white-space: pre-wrap; } - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">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.</span></p></body></html> + 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. true