diff -Nru x2goclient-4.1.2.3/config_linux_static.sh x2goclient-4.1.2.4/config_linux_static.sh --- x2goclient-4.1.2.3/config_linux_static.sh 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/config_linux_static.sh 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/bash make distclean -X2GO_LINUX_STATIC=x2go_linux_static /usr/local/Trolltech/Qt-4.7.1/bin/qmake -config release -spec linux-g++ +X2GO_LINUX_STATIC=x2go_linux_static /usr/local/Trolltech/Qt-4.7.1/bin/qmake CONFIG+='release' -spec linux-g++ diff -Nru x2goclient-4.1.2.3/copy-deps-win32.bat x2goclient-4.1.2.4/copy-deps-win32.bat --- x2goclient-4.1.2.3/copy-deps-win32.bat 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/copy-deps-win32.bat 2023-07-12 16:20:52.000000000 +0000 @@ -10,7 +10,7 @@ xcopy /E /Y %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libwinpthread-1.dll %3\ || exit /b %errorlevel% xcopy /E /Y %1\MSVC-DLLs\2013-12.0.21005.1-x86\msvcr120.dll %3\ || exit /b %errorlevel% xcopy /E /Y %1\pulse\13.0-lp151.19.1_bin %3\ || exit /b %errorlevel% -xcopy /E /Y %1\PuTTY\0.73_bin %3\ || exit /b %errorlevel% +xcopy /E /Y %1\PuTTY\0.78_bin %3\ || exit /b %errorlevel% xcopy /E /Y /I %1\VcXsrv\1.20.6.0_bin %3\VcXsrv || exit /b %errorlevel% xcopy /E /Y /I %1\x3270-fonts\3.6ga4\misc %3\VcXsrv\fonts\misc || exit /b %errorlevel% xcopy /E /Y %1\x3270-fonts\3.6ga4\copyright-x3270-fonts %3\VcXsrv\ || exit /b %errorlevel% diff -Nru x2goclient-4.1.2.3/COPYRIGHT.x2go-logos x2goclient-4.1.2.4/COPYRIGHT.x2go-logos --- x2goclient-4.1.2.3/COPYRIGHT.x2go-logos 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/COPYRIGHT.x2go-logos 2023-07-12 16:20:52.000000000 +0000 @@ -3,14 +3,14 @@ Upstream-Contact: Heinz-M. Graesing Files: res/img/x2go-logos/mksizedsymbols.sh -Copyright: 2005-2020 Heinz-M. Graesing +Copyright: 2005-2023 Heinz-M. Graesing License: GPL-2.0+ res/img/x2go-logos/x2go-logo-colored.svg res/img/x2go-logos/x2go-logo.svg res/img/x2go-logos/x2go-logo-rotated.svg res/img/x2go-logos/x2go-mascot.svg -Copyright: 2005-2020 Heinz-M. Grasesing +Copyright: 2005-2023 Heinz-M. Grasesing License: GPL-2.0+ Files: res/img/icons/16x16/x2goclient.png @@ -18,5 +18,5 @@ res/img/icons/48x48/x2goclient.png res/img/icons/64x64/x2goclient.png res/img/icons/128x128/x2goclient.png -Copyright: 2005-2020 Heinz-M. Graesing +Copyright: 2005-2023 Heinz-M. Graesing License: GPL-2.0+ diff -Nru x2goclient-4.1.2.3/debian/changelog x2goclient-4.1.2.4/debian/changelog --- x2goclient-4.1.2.3/debian/changelog 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/debian/changelog 2023-07-12 16:20:52.000000000 +0000 @@ -1,10 +1,22 @@ -x2goclient (4.1.2.3-0~202208222116~ubuntu22.04.1) jammy; urgency=low +x2goclient (4.1.2.4-0~202307121620~ubuntu22.04.1) jammy; urgency=low * Auto build. - -- X2Go Mon, 22 Aug 2022 21:16:33 +0000 + -- X2Go Wed, 12 Jul 2023 16:20:52 +0000 -x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium +x2goclient (4.1.2.4-0x2go1) UNRELEASED; urgency=medium + + [ X2Go Release Manager ] + * Continue development + + [ Oleksandr Shneyder ] + * Fix crashes when syn reply arriving after the session is started, when using broker + * In direct RDP mode, when using broker, forward username and password to the RDP client + if user enetered any. + + -- X2Go Release Manager Thu, 29 Jun 2023 20:54:03 +0200 + +x2goclient (4.1.2.3-0x2go1) unstable; urgency=medium [ Oleksandr Shneyder ] * New upstream version (4.1.2.3): @@ -59,6 +71,9 @@ client. - add "noresize" setting, which makes the proxy window not resizable for user. + - on Windows SSHD will only listen 127.0.0.1 to avoid FW warnings. + - on Windows check the location of cgwin binaries in and + in /bin. [ Ryan Schmidt ] * New upstream version (4.1.2.3): @@ -140,6 +155,21 @@ dates for more than 10 years and nobody noticed. Go figure. - src/onmainwindow.cpp: convert server-reported time to human readable time in Qt's standard format in session list view. + - handle_mxe.sh: rework, make most variables lowercase, change spacing, + use proper if-else blocks, do not use special bash features for string + comparison etc. + - macbuild.sh: qmake never supported -config, it was always + CONFIG(+)='something'. + - config_linux_static.sh: also switch from -config to CONFIG+='...'. + - {handle_mxe.sh,x2goclient.pro}: make mxe selectable via CONFIG option + and prepare selector in x2goclient.pro. + - x2goclient.pro: also select on win32 and not just win32-*, fix + whitespace. + - x2gohelper/Makefile.mxe: more quoting. + - Windows: Update PuTTY from 0.73 to 0.78. + - debian/preprocessor.pl: typo fixes only. + - misc: pre-release copyright update. + - man/man1/x2goclient.1: pre-release date update. * debian/control: + Move to debian/control.in. * debian/control.in: @@ -175,6 +205,10 @@ allowing passed-in values through the environment. + Utilize new version switching in main Makefile by overriding the QT_VERSION make variable. + + Fix version detection on testing and unstable. lsb_release -r currently + only outputs n/a on these suites, so fall back to a rather fragile + detection via apt-cache policy instead. + + Fix version detection on testing and unstable V2. Remove a= tag. * debian/: + New file "watch". We won't need this per se (since we're upstream and there cannot be a newer version of the Debian package without releasing @@ -198,7 +232,25 @@ + Install x-x2go.xml into bin:pkg and run update-mime-database during postinst. - -- X2Go Release Manager Thu, 13 Feb 2020 12:31:20 +0100 + [ Ulrich Sibiller ] + * New upstream version (4.1.2.3): + - desktop/x2goclient.desktop: drop Maemo support. + - res/img/icons: drop Maemo support, remove hildon subdirectory. + - res/img/svg: drop Maemo support, remove bg_hildon.svg. + - res/resources.qrc: drop Maemo support, remove bg_hildon.svg entry. + - src/{{InteractionDialog,configdialog,connectionwidget, + editconnectiondialog,folderbutton,mediawidget,ongetpass, + onmainwindow,printprocess,printwidget,sessionbutton, + sessionmanagedialog,sessionwidget,settingswidget, + sharewidget}.cpp,x2goclientconfig.h}: drop Maemo support. + - /: drop Maemo support, remove x2goclient.pro.maemo. + - /: add README.mxe, describing MXE builds. + - /: add handle_mxe.sh, MXE control script. + - x2goclient.pro: use different parameters for MXE builds. + - x2gohelper/x2gohelper.cpp: use lower-case header files. + - x2gohelper/: add Makefile.mxe. + + -- X2Go Release Manager Wed, 28 Jun 2023 22:00:51 +0200 x2goclient (4.1.2.2-0x2go1) unstable; urgency=medium diff -Nru x2goclient-4.1.2.3/debian/copyright x2goclient-4.1.2.4/debian/copyright --- x2goclient-4.1.2.3/debian/copyright 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/debian/copyright 2023-07-12 16:20:52.000000000 +0000 @@ -4,23 +4,23 @@ Source: https://wiki.x2go.org Files: * -Copyright: 2005-2021, Oleksandr Shneyder - 2005-2021, Heinz-Markus Graesing - 2005-2021, obviously nice - https://www.obviously-nice.de - 2005-2021, X2Go Project - 2015-2021, Mihai Moldovan +Copyright: 2005-2023, Oleksandr Shneyder + 2005-2023, Heinz-Markus Graesing + 2005-2023, obviously nice - https://www.obviously-nice.de + 2005-2023, X2Go Project + 2015-2023, Mihai Moldovan License: GPL-2+~OpenSSL Files: Makefile.docupload -Copyright: 2010-2021, Mike Gabriel +Copyright: 2010-2023, Mike Gabriel License: GPL-3 Files: debian/* -Copyright: 2007-2021, Oleksandr Shneyder - 2011-2021, Reinhard Tartler - 2011-2021, Mike Gabriel - 2007-2021, X2Go Project - 2015-2021, Mihai Moldovan +Copyright: 2007-2023, Oleksandr Shneyder + 2011-2023, Reinhard Tartler + 2011-2023, Mike Gabriel + 2007-2023, X2Go Project + 2015-2023, Mihai Moldovan License: GPL-2+ or GPL-2+~OpenSSL License: GPL-2+ diff -Nru x2goclient-4.1.2.3/debian/git-build-recipe.manifest x2goclient-4.1.2.4/debian/git-build-recipe.manifest --- x2goclient-4.1.2.3/debian/git-build-recipe.manifest 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/debian/git-build-recipe.manifest 2023-07-12 16:20:52.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version {debupstream}-0~202208222116 +# git-build-recipe format 0.4 deb-version {debupstream}-0~202307121620 lp:~x2go/x2go/+git/x2goclient git-commit:70fbc7c17e6b5e0c802a00a576d8fe99acae9972 -merge master lp:~x2go/x2go/+git/x2goclient git-commit:ba65703ca715eb6e920069f75b8d8382bb3d2d28 +merge build-main lp:~x2go/x2go/+git/x2goclient git-commit:e1489909b5c139b6a86a19652387f50af3bb9841 diff -Nru x2goclient-4.1.2.3/debian/preprocessor.pl x2goclient-4.1.2.4/debian/preprocessor.pl --- x2goclient-4.1.2.3/debian/preprocessor.pl 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/debian/preprocessor.pl 2023-07-12 16:20:52.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2021 X2Go Project - https://wiki.x2go.org +# Copyright (C) 2021-2023 X2Go Project - https://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -128,7 +128,7 @@ # # Takes a string as its only parameter. # -# Returns the deitected token as an offset/index in the tokens array. +# Returns the detected token as an offset/index in the tokens array. # # On error, returns undef. sub fetch_token { @@ -162,7 +162,7 @@ # Takes the (probable) condition as a string, and a boolean value denoting # whether debugging is requested or not as its parameters. # -# Returns a boolean value . +# Returns a boolean value. # # On error, returns undef. sub parse_condition { diff -Nru x2goclient-4.1.2.3/debian/rules x2goclient-4.1.2.4/debian/rules --- x2goclient-4.1.2.3/debian/rules 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/debian/rules 2023-07-12 16:20:52.000000000 +0000 @@ -35,6 +35,26 @@ ifeq ($(VENDOR_DEBIAN),yes) RELEASE_VER := $(shell /usr/bin/lsb_release -r | /bin/sed -e 's/[ ]*//g' | /usr/bin/cut -d ':' -f '2' | /usr/bin/cut -d '.' -f '1') + + # Newer Debian versions might report "n/a" for testing and unstable. + ifeq ($(RELEASE_VER),n/a) + # On these platforms, the best way to determine the system version is by + # going through "apt-cache policy". + # Note that this should only be the case for either testing or unstable. + # Other systems should have a proper version number. + # This is also why we can just drop any suites/archive names (this is + # what a= means) containing a dash character (e.g., "stable-updates") + # and only pick the first match. + RELEASE_VER := $(shell /usr/bin/apt-cache policy | grep -E 'o=(De|Rasp)bian,' | grep -E 'l=(De|Rasp)bian,' | grep -F 'c=main,' | grep -Eo 'a=[^, ]*' | sed -e 's/^a=//' | grep -v -- '-' | head -n '1') + + # Do error checking. + ifneq ($(RELEASE_VER),testing) + ifneq ($(RELEASE_VER),unstable) + $(error Release version could not be determined, sorry. Extracted value: $(RELEASE_VER)) + endif + endif + endif + # Let's fake testing's and unstable's "release version"... ifeq ($(RELEASE_VER),testing) RELEASE_VER := 999 diff -Nru x2goclient-4.1.2.3/desktop/x2goclient.desktop x2goclient-4.1.2.4/desktop/x2goclient.desktop --- x2goclient-4.1.2.3/desktop/x2goclient.desktop 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/desktop/x2goclient.desktop 2023-07-12 16:20:52.000000000 +0000 @@ -6,7 +6,6 @@ Icon=x2goclient StartupWMClass=x2goclient X-Window-Icon=x2goclient -X-HildonDesk-ShowInToolbar=true X-Osso-Type=application/x-executable Terminal=false Categories=Qt;KDE;Network; diff -Nru x2goclient-4.1.2.3/examples/x2goclient-cli x2goclient-4.1.2.4/examples/x2goclient-cli --- x2goclient-4.1.2.3/examples/x2goclient-cli 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/examples/x2goclient-cli 2023-07-12 16:20:52.000000000 +0000 @@ -1,8 +1,8 @@ #!/usr/bin/perl ############################################################################ -# Copyright (C) 2005-2020 by Oleksandr Shneyder # -# oleksandr.shneyder@obviously-nice.de # +# Copyright (C) 2005-2023 by Oleksandr Shneyder # +# # # # # This program is free software; you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff -Nru x2goclient-4.1.2.3/.gitignore x2goclient-4.1.2.4/.gitignore --- x2goclient-4.1.2.3/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ x2goclient-4.1.2.4/.gitignore 2023-07-12 16:20:52.000000000 +0000 @@ -0,0 +1,39 @@ +# Temporary object files/static libs. +*.dylib +*.so +*.so.* +*.[oa] +*.exe +*.lib +*.dll + +client_build/ +plugin_build/ +.build_man2html +x2goclient + +# Generated by qmake. +moc_*.cpp +ui_*.h +qrc_resources.cpp + +# VIM temporary files. +.*.sw* + +# Generated by lrelease. +x2goclient_*.qm + +# Generated by qmake when building on OS X. +x2goclient.app +x2goclient.dmg + +x2goclient.pro.user + +# This file. +.gitignore + +# Generated by Visual Studio. +.vscode/ + +# Auto-generated from template. +debian/control diff -Nru x2goclient-4.1.2.3/handle_mxe.sh x2goclient-4.1.2.4/handle_mxe.sh --- x2goclient-4.1.2.3/handle_mxe.sh 1970-01-01 00:00:00.000000000 +0000 +++ x2goclient-4.1.2.4/handle_mxe.sh 2023-07-12 16:20:52.000000000 +0000 @@ -0,0 +1,78 @@ +#!/bin/bash +# +# prepare or build x2goclient and x2gohelper for Windows using MXE +# cross build environment for Linux (https://mxe.cc/). +# +# Usage: $0 [prepare] [] +# +# prepare means only prepare the build dirs (create them, clean +# them). If omitted, it will build the binaries instead. +# can be "debug" or "release". Default is "release". +# +# +# Adjust these values to match your MXE installation: +MXE_BASE='/usr/lib/mxe/usr' +#MXE_TARGET='i686-w64-mingw32.shared +MXE_TARGET='i686-w64-mingw32.static' +#MXE_TARGET='x86-64-w64-mingw32.shared' +#MXE_TARGET='x86-64-w64-mingw32.static' +mxe_path="${MXE_BASE}/${MXE_TARGET}" + +if ! test -d "${mxe_path}"; then + printf 'Cannot find MXE installation at "%s".' "${mxe_path}" >&2 + exit '1' +fi + +BUILD_DIR='client_build_mxe' +BUILD_CONFIG='release' + +mode='build' +if [ 'prepare' = "${1}" ]; then + mode='prepare' + shift +fi + +if [ 'debug' = "${1}" ]; then + BUILD_CONFIG='debug' + shift +fi + +export 'MXE_BASE' 'MXE_TARGETS' 'BUILD_DIR' 'BUILD_CONFIG' + +X2GO_CLIENT_TARGET='' +export 'X2GO_CLIENT_TARGET' + +if [ 'build' = "${mode}" ] && [ ! -d "${BUILD_DIR}" ]; then + printf 'Please run "%s prepare" first.' "${0}" >&2 + exit '2' +fi + +if [ 'prepare' = "${mode}" ]; then + if test -e "${BUILD_DIR}"; then + rm -rf "${BUILD_DIR}" + fi + make clean + + mkdir -p "${BUILD_DIR}/${BUILD_CONFIG}" + pushd "${BUILD_DIR}" + + "${mxe_path}/qt5/bin/lrelease" '../x2goclient.pro' + + # no special Makefile required as qmake will create that + "${mxe_path}/qt5/bin/qmake" '../x2goclient.pro' CONFIG+="${BUILD_CONFIG} mxe" + + popd +else + pushd "${BUILD_DIR}" + make + popd +fi + +pushd 'x2gohelper' +# Here we do not have qmake but a unique Makefile for MXE. +if [ 'prepare' = "${mode}" ]; then + make -f 'Makefile.mxe' 'clean' +else + make -f 'Makefile.mxe' +fi +popd diff -Nru x2goclient-4.1.2.3/LICENSE x2goclient-4.1.2.4/LICENSE --- x2goclient-4.1.2.3/LICENSE 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/LICENSE 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ -Copyright (C) 2005-2020 Obviously Nice -- https://www.obviously-nice.de -Copyright (C) 2007-2020 X2Go Project -- https://wiki.x2go.org +Copyright (C) 2005-2023 Obviously Nice -- https://www.obviously-nice.de +Copyright (C) 2007-2023 X2Go Project -- https://wiki.x2go.org This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,6 +14,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . -Copyright (C) 2005-2020 Oleksandr Shneyder -Copyright (C) 2005-2020 Heinz-Markus Graesing -Copyright (C) 2007-2020 X2Go Project +Copyright (C) 2005-2023 Oleksandr Shneyder +Copyright (C) 2005-2023 Heinz-Markus Graesing +Copyright (C) 2007-2023 X2Go Project diff -Nru x2goclient-4.1.2.3/macbuild.sh x2goclient-4.1.2.4/macbuild.sh --- x2goclient-4.1.2.3/macbuild.sh 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/macbuild.sh 2023-07-12 16:20:52.000000000 +0000 @@ -316,8 +316,7 @@ lrelease "${PROJECT}" phase "Running qmake" -qmake -config "${BUILD_MODE}" -spec macx-g++ "${PROJECT}" \ - CONFIG+="${BUILD_ARCH}" \ +qmake CONFIG+="${BUILD_MODE} ${BUILD_ARCH}" -spec macx-g++ "${PROJECT}" \ QMAKE_MAC_SDK="${SDK}" \ QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \ OSX_STDLIB="${STDLIB}" \ diff -Nru x2goclient-4.1.2.3/Makefile.docupload x2goclient-4.1.2.4/Makefile.docupload --- x2goclient-4.1.2.3/Makefile.docupload 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/Makefile.docupload 2023-07-12 16:20:52.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for x2goclient -# Copyright (C) 2010-2020 by Mike Gabriel , GPLv3 applies to this file +# Copyright (C) 2010-2023 by Mike Gabriel , GPLv3 applies to this file VERSION=$(head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1) DOC_HOST="code.x2go.org" diff -Nru x2goclient-4.1.2.3/man/man1/x2goclient.1 x2goclient-4.1.2.4/man/man1/x2goclient.1 --- x2goclient-4.1.2.3/man/man1/x2goclient.1 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/man/man1/x2goclient.1 2023-07-12 16:20:52.000000000 +0000 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goclient 1 "Feb 2020" "Version 4.1.2.3" "X2Go Client (Qt4)" +.TH x2goclient 1 "Jun 2023" "Version 4.1.2.4" "X2Go Client (Qt4)" .SH NAME x2goclient \- Client application to launch server-side X2Go sessions. .SH SYNOPSIS diff -Nru x2goclient-4.1.2.3/portable/stopu3client.cpp x2goclient-4.1.2.4/portable/stopu3client.cpp --- x2goclient-4.1.2.3/portable/stopu3client.cpp 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/portable/stopu3client.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,6 +1,6 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * -* oleksandr.shneyder@obviously-nice.de * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * +* * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/README.mxe x2goclient-4.1.2.4/README.mxe --- x2goclient-4.1.2.3/README.mxe 1970-01-01 00:00:00.000000000 +0000 +++ x2goclient-4.1.2.4/README.mxe 2023-07-12 16:20:52.000000000 +0000 @@ -0,0 +1,103 @@ +To build Windows binaries you can use the MXE cross build environment +(https://mxe.cc). Currently only 32bit static builds are working. + +Install MXE as described on the MXE site (I suggest to use the system +wide installation). Next, adjust the MXE_BASE variable in +handle_mxe.sh. Then run ./handle_mxe.sh prepare && +handle_mxe.sh. That's it. + +Following is the list of packages on Debian Buster that will be +sufficient to make the magic happen (many of these seem unrelated but +have to be installed due to depencies). In addition you need GNU make. + +ii mxe-i686-w64-mingw32.static-assimp 3.2-buster-build-2021-01-10 amd64 MXE package assimp for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-binutils 2.28-buster-build-2021-01-10 amd64 MXE package binutils for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-boost 1.60.0-buster-build-2021-01-10 amd64 MXE package boost for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-bzip2 1.0.6-buster-build-2021-01-10 amd64 MXE package bzip2 for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-cairo 1.16.0-buster-build-2021-01-10 amd64 MXE package cairo for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-cc 1-buster-build-2021-01-10 amd64 MXE package cc for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-ccache 3.6-buster-build-2021-01-10 amd64 MXE package ccache for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-cmake-conf 1-buster-build-2021-01-10 amd64 MXE package cmake-conf for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-dbus 1.13.18-buster-build-2021-01-10 amd64 MXE package dbus for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-expat 2.2.10-buster-build-2021-01-10 amd64 MXE package expat for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-fontconfig 2.13.1-buster-build-2021-01-10 amd64 MXE package fontconfig for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-freetds 1.2.18-buster-build-2021-01-10 amd64 MXE package freetds for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-freetype 2.10.4-buster-build-2021-01-10 amd64 MXE package freetype for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-freetype-bootstrap 2.10.4-buster-build-2021-01-10 amd64 MXE package freetype-bootstrap for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-gcc 5.5.0-buster-build-2021-01-10 amd64 MXE package gcc for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-gettext 0.21-buster-build-2021-01-10 amd64 MXE package gettext for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-glib 2.50.2-buster-build-2021-01-10 amd64 MXE package glib for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-gpgme 1.14.0-buster-build-2021-01-10 amd64 MXE package gpgme for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-harfbuzz 2.7.4-buster-build-2021-01-10 amd64 MXE package harfbuzz for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-icu4c 66.1-buster-build-2021-01-10 amd64 MXE package icu4c for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-jasper 2.0.23-buster-build-2021-01-10 amd64 MXE package jasper for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-jpeg 9d-buster-build-2021-01-10 amd64 MXE package jpeg for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-lcms 2.11-buster-build-2021-01-10 amd64 MXE package lcms for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libassuan 2.5.3-buster-build-2021-01-10 amd64 MXE package libassuan for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libffi 3.2.1-buster-build-2021-01-10 amd64 MXE package libffi for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libgcrypt 1.8.7-buster-build-2021-01-10 amd64 MXE package libgcrypt for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libgpg-error 1.41-buster-build-2021-01-10 amd64 MXE package libgpg_error for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libiconv 1.16-buster-build-2021-01-10 amd64 MXE package libiconv for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libidn2 2.3.0-buster-build-2021-01-10 amd64 MXE package libidn2 for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libmng 2.0.3-buster-build-2021-01-10 amd64 MXE package libmng for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libmysqlclient 6.1.6-buster-build-2021-01-10 amd64 MXE package libmysqlclient for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libpng 1.6.37-buster-build-2021-01-10 amd64 MXE package libpng for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libssh 0.9.1-buster-build-2021-01-10 amd64 MXE package libssh for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libunistring 0.9.10-buster-build-2021-01-10 amd64 MXE package libunistring for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-libwebp 1.0.3-buster-build-2021-01-10 amd64 MXE package libwebp for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-lzo 2.10-buster-build-2021-01-10 amd64 MXE package lzo for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-mesa 20.3.0-buster-build-2021-01-10 amd64 MXE package mesa for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-mingw-w64 8.0.0-buster-build-2021-01-10 amd64 MXE package mingw-w64 for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-minizip 2aa369c-buster-build-2021-01-10 amd64 MXE package minizip for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-mxe-conf 1-buster-build-2021-01-10 amd64 MXE package mxe-conf for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-openssl 1.1.1i-buster-build-2021-01-10 amd64 MXE package openssl for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pcre 8.44-buster-build-2021-01-10 amd64 MXE package pcre for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pcre2 10.36-buster-build-2021-01-10 amd64 MXE package pcre2 for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pe-parse 64989f6-buster-build-2021-01-10 amd64 MXE package pe-parse for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pe-util 5b07cb3-buster-build-2021-01-10 amd64 MXE package pe-util for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pixman 0.33.6-buster-build-2021-01-10 amd64 MXE package pixman for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pkgconf 0.da179fd-buster-build-2021-01-10 amd64 MXE package pkgconf for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-postgresql 9.2.4-buster-build-2021-01-10 amd64 MXE package postgresql for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-pthreads 0.POSIX-1003.1-2001-buster-build-2021-01-10 amd64 MXE package pthreads for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qt3d 5.15.2-buster-build-2021-01-10 amd64 MXE package qt3d for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qt5 5.15.2-buster-build-2021-01-10 amd64 MXE package qt5 for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtactiveqt 5.15.2-buster-build-2021-01-10 amd64 MXE package qtactiveqt for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtbase 5.15.2-buster-build-2021-01-10 amd64 MXE package qtbase for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtcharts 5.15.2-buster-build-2021-01-10 amd64 MXE package qtcharts for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtconnectivity 5.15.2-buster-build-2021-01-10 amd64 MXE package qtconnectivity for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtdatavis3d 5.15.2-buster-build-2021-01-10 amd64 MXE package qtdatavis3d for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtdeclarative 5.15.2-buster-build-2021-01-10 amd64 MXE package qtdeclarative for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtgamepad 5.15.2-buster-build-2021-01-10 amd64 MXE package qtgamepad for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtgraphicaleffects 5.15.2-buster-build-2021-01-10 amd64 MXE package qtgraphicaleffects for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtimageformats 5.15.2-buster-build-2021-01-10 amd64 MXE package qtimageformats for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtlocation 5.15.2-buster-build-2021-01-10 amd64 MXE package qtlocation for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtlottie 5.15.2-buster-build-2021-01-10 amd64 MXE package qtlottie for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtmultimedia 5.15.2-buster-build-2021-01-10 amd64 MXE package qtmultimedia for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtnetworkauth 5.15.2-buster-build-2021-01-10 amd64 MXE package qtnetworkauth for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtpurchasing 5.15.2-buster-build-2021-01-10 amd64 MXE package qtpurchasing for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtquick3d 5.15.2-buster-build-2021-01-10 amd64 MXE package qtquick3d for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtquickcontrols 5.15.2-buster-build-2021-01-10 amd64 MXE package qtquickcontrols for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtquickcontrols2 5.15.2-buster-build-2021-01-10 amd64 MXE package qtquickcontrols2 for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtremoteobjects 5.15.2-buster-build-2021-01-10 amd64 MXE package qtremoteobjects for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtscript 5.15.2-buster-build-2021-01-10 amd64 MXE package qtscript for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtscxml 5.15.2-buster-build-2021-01-10 amd64 MXE package qtscxml for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtsensors 5.15.2-buster-build-2021-01-10 amd64 MXE package qtsensors for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtserialbus 5.15.2-buster-build-2021-01-10 amd64 MXE package qtserialbus for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtserialport 5.15.2-buster-build-2021-01-10 amd64 MXE package qtserialport for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtspeech 5.15.2-buster-build-2021-01-10 amd64 MXE package qtspeech for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtsvg 5.15.2-buster-build-2021-01-10 amd64 MXE package qtsvg for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qttools 5.15.2-buster-build-2021-01-10 amd64 MXE package qttools for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qttranslations 5.15.2-buster-build-2021-01-10 amd64 MXE package qttranslations for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtvirtualkeyboard 5.15.2-buster-build-2021-01-10 amd64 MXE package qtvirtualkeyboard for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtwebchannel 5.15.2-buster-build-2021-01-10 amd64 MXE package qtwebchannel for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtwebsockets 5.15.2-buster-build-2021-01-10 amd64 MXE package qtwebsockets for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtwebview 5.15.2-buster-build-2021-01-10 amd64 MXE package qtwebview for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtwinextras 5.15.2-buster-build-2021-01-10 amd64 MXE package qtwinextras for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-qtxmlpatterns 5.15.2-buster-build-2021-01-10 amd64 MXE package qtxmlpatterns for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-sqlite 3340000-buster-build-2021-01-10 amd64 MXE package sqlite for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-tiff 4.2.0-buster-build-2021-01-10 amd64 MXE package tiff for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-xz 5.2.5-buster-build-2021-01-10 amd64 MXE package xz for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-zlib 1.2.11-buster-build-2021-01-10 amd64 MXE package zlib for i686-w64-mingw32.static +ii mxe-i686-w64-mingw32.static-zstd 1.4.8-buster-build-2021-01-10 amd64 MXE package zstd for i686-w64-mingw32.static +ii mxe-requirements 2.23-buster-build-2021-01-10 amd64 MXE requirements package +ii mxe-source 2.23-buster-build-2021-01-10 amd64 MXE source diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_cs.ts x2goclient-4.1.2.4/res/i18n/x2goclient_cs.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_cs.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_cs.ts 2023-07-12 16:20:52.000000000 +0000 @@ -2310,13 +2310,13 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_da.ts x2goclient-4.1.2.4/res/i18n/x2goclient_da.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_da.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_da.ts 2023-07-12 16:20:52.000000000 +0000 @@ -2848,12 +2848,12 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_de.ts x2goclient-4.1.2.4/res/i18n/x2goclient_de.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_de.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_de.ts 2023-07-12 16:20:52.000000000 +0000 @@ -2496,13 +2496,13 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_es.ts x2goclient-4.1.2.4/res/i18n/x2goclient_es.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_es.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_es.ts 2023-07-12 16:20:52.000000000 +0000 @@ -2932,13 +2932,13 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> - <br>(C) 2005-2020 de <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> + <br>(C) 2005-2023 de <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_et.ts x2goclient-4.1.2.4/res/i18n/x2goclient_et.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_et.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_et.ts 2023-07-12 16:20:52.000000000 +0000 @@ -2146,13 +2146,13 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> - <b>(C) 2005-2020 <b>tublid</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> + <b>(C) 2005-2023 <b>tublid</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_fi.ts x2goclient-4.1.2.4/res/i18n/x2goclient_fi.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_fi.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_fi.ts 2023-07-12 16:20:52.000000000 +0000 @@ -2164,13 +2164,13 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Suomenkielinen versio: Martti Pitkänen, martti@aplcomp.fi<br> diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_fr.ts x2goclient-4.1.2.4/res/i18n/x2goclient_fr.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_fr.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_fr.ts 2023-07-12 16:20:52.000000000 +0000 @@ -2477,13 +2477,13 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> - <br>(C) 2005-2020 par <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> + <br>(C) 2005-2023 par <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_nb_no.ts x2goclient-4.1.2.4/res/i18n/x2goclient_nb_no.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_nb_no.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_nb_no.ts 2023-07-12 16:20:52.000000000 +0000 @@ -2944,13 +2944,13 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> - <br>(C) 2005-2020 av <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> + <br>(C) 2005-2023 av <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_nl.ts x2goclient-4.1.2.4/res/i18n/x2goclient_nl.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_nl.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_nl.ts 2023-07-12 16:20:52.000000000 +0000 @@ -2170,13 +2170,13 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_pt.ts x2goclient-4.1.2.4/res/i18n/x2goclient_pt.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_pt.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_pt.ts 2023-07-12 16:20:52.000000000 +0000 @@ -1939,12 +1939,12 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_ru.ts x2goclient-4.1.2.4/res/i18n/x2goclient_ru.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_ru.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_ru.ts 2023-07-12 16:20:52.000000000 +0000 @@ -3377,12 +3377,12 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_sv.ts x2goclient-4.1.2.4/res/i18n/x2goclient_sv.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_sv.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_sv.ts 2023-07-12 16:20:52.000000000 +0000 @@ -2100,13 +2100,13 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> - <br>(C) 2005-2020 av <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> + <br>(C) 2005-2023 av <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_tr.ts x2goclient-4.1.2.4/res/i18n/x2goclient_tr.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_tr.ts 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_tr.ts 2023-07-12 16:20:52.000000000 +0000 @@ -2129,12 +2129,12 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> diff -Nru x2goclient-4.1.2.3/res/i18n/x2goclient_zh_tw.ts x2goclient-4.1.2.4/res/i18n/x2goclient_zh_tw.ts --- x2goclient-4.1.2.3/res/i18n/x2goclient_zh_tw.ts 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/res/i18n/x2goclient_zh_tw.ts 2023-07-12 16:20:52.000000000 +0000 @@ -2727,12 +2727,12 @@ - <br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> + <br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br> Translators, feel free to add a localized version of your translation including a copyright notice and your name(s). Remember to keep a <br> at the end, though. English example for a potential translation: -<br>(C) 2005-2020 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> +<br>(C) 2005-2023 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>English version: (C) 20AB-20CD Trans Lator <trans@la.tor><br> Binary files /tmp/tmp82ub8vni/AON3HAVvPT/x2goclient-4.1.2.3/res/img/icons/hildon/x2goclient_26.png and /tmp/tmp82ub8vni/14aTPx0dnH/x2goclient-4.1.2.4/res/img/icons/hildon/x2goclient_26.png differ Binary files /tmp/tmp82ub8vni/AON3HAVvPT/x2goclient-4.1.2.3/res/img/icons/hildon/x2goclient_40.png and /tmp/tmp82ub8vni/14aTPx0dnH/x2goclient-4.1.2.4/res/img/icons/hildon/x2goclient_40.png differ Binary files /tmp/tmp82ub8vni/AON3HAVvPT/x2goclient-4.1.2.3/res/img/icons/hildon/x2goclient_64.png and /tmp/tmp82ub8vni/14aTPx0dnH/x2goclient-4.1.2.4/res/img/icons/hildon/x2goclient_64.png differ diff -Nru x2goclient-4.1.2.3/res/img/icons/hildon/x2goclient_hildon.svg x2goclient-4.1.2.4/res/img/icons/hildon/x2goclient_hildon.svg --- x2goclient-4.1.2.3/res/img/icons/hildon/x2goclient_hildon.svg 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/res/img/icons/hildon/x2goclient_hildon.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,174 +0,0 @@ - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru x2goclient-4.1.2.3/res/img/svg/bg_hildon.svg x2goclient-4.1.2.4/res/img/svg/bg_hildon.svg --- x2goclient-4.1.2.3/res/img/svg/bg_hildon.svg 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/res/img/svg/bg_hildon.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,404 +0,0 @@ - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff -Nru x2goclient-4.1.2.3/res/img/x2go-logos/mksizedsymbols.sh x2goclient-4.1.2.4/res/img/x2go-logos/mksizedsymbols.sh --- x2goclient-4.1.2.3/res/img/x2go-logos/mksizedsymbols.sh 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/res/img/x2go-logos/mksizedsymbols.sh 2023-07-12 16:20:52.000000000 +0000 @@ -2,7 +2,7 @@ # Use this script to build typical iconsized PNGs based on a svg sourcefile. # ---------------------------------------------------------------------------- # Written by Heinz-M. Graesing -# (C) 2012-2020 Heinz-M. Graesing GNU GPL v2.0+ +# (C) 2012-2023 Heinz-M. Graesing GNU GPL v2.0+ # Last updated on: Dec/01/2012 by Heinz-M. Graesing # ---------------------------------------------------------------------------- diff -Nru x2goclient-4.1.2.3/res/resources.qrc x2goclient-4.1.2.4/res/resources.qrc --- x2goclient-4.1.2.3/res/resources.qrc 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/res/resources.qrc 2023-07-12 16:20:52.000000000 +0000 @@ -1,7 +1,6 @@ img/svg/bg.svg - img/svg/bg_hildon.svg img/svg/line.svg img/svg/onlogo.svg img/svg/x2gologo.svg diff -Nru x2goclient-4.1.2.3/src/appdialog.cpp x2goclient-4.1.2.4/src/appdialog.cpp --- x2goclient-4.1.2.3/src/appdialog.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/appdialog.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/appdialog.h x2goclient-4.1.2.4/src/appdialog.h --- x2goclient-4.1.2.3/src/appdialog.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/appdialog.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/brokerpassdlg.cpp x2goclient-4.1.2.4/src/brokerpassdlg.cpp --- x2goclient-4.1.2.3/src/brokerpassdlg.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/brokerpassdlg.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/brokerpassdlg.h x2goclient-4.1.2.4/src/brokerpassdlg.h --- x2goclient-4.1.2.3/src/brokerpassdlg.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/brokerpassdlg.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/clicklineedit.cpp x2goclient-4.1.2.4/src/clicklineedit.cpp --- x2goclient-4.1.2.3/src/clicklineedit.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/clicklineedit.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/clicklineedit.h x2goclient-4.1.2.4/src/clicklineedit.h --- x2goclient-4.1.2.3/src/clicklineedit.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/clicklineedit.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/compat.cpp x2goclient-4.1.2.4/src/compat.cpp --- x2goclient-4.1.2.3/src/compat.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/compat.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2020 by Mihai Moldovan * + * Copyright (C) 2015-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/compat.h x2goclient-4.1.2.4/src/compat.h --- x2goclient-4.1.2.3/src/compat.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/compat.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2020 by Mihai Moldovan * + * Copyright (C) 2015-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/configdialog.cpp x2goclient-4.1.2.4/src/configdialog.cpp --- x2goclient-4.1.2.3/src/configdialog.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/configdialog.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -308,23 +308,6 @@ "/32x32/edit_settings.png" ) ) ); setWindowTitle ( tr ( "Settings" ) ); -#ifdef Q_WS_HILDON - QFont fnt=font(); - fnt.setPointSize ( 10 ); - setFont ( fnt ); - QSize sz=ok->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - ok->setFixedSize ( sz ); - sz=cancel->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - cancel->setFixedSize ( sz ); - clientSshPort->setFixedHeight ( - int ( clientSshPort->sizeHint().height() *1.5 ) ); - defaults->hide(); -#endif - pwid=new PrintWidget ( this ); tabWidg->addTab ( pwid,tr ( "Printing" ) ); diff -Nru x2goclient-4.1.2.3/src/configdialog.h x2goclient-4.1.2.4/src/configdialog.h --- x2goclient-4.1.2.3/src/configdialog.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/configdialog.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/configwidget.cpp x2goclient-4.1.2.4/src/configwidget.cpp --- x2goclient-4.1.2.3/src/configwidget.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/configwidget.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/configwidget.h x2goclient-4.1.2.4/src/configwidget.h --- x2goclient-4.1.2.3/src/configwidget.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/configwidget.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/connectionwidget.cpp x2goclient-4.1.2.4/src/connectionwidget.cpp --- x2goclient-4.1.2.3/src/connectionwidget.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/connectionwidget.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -35,14 +35,8 @@ : ConfigWidget ( id,mw,parent,f ) { QVBoxLayout *connLay=new QVBoxLayout ( this ); -#ifndef Q_WS_HILDON QGroupBox* netSpd=new QGroupBox ( tr ( "&Connection speed" ),this ); QVBoxLayout *spdLay=new QVBoxLayout ( netSpd ); -#else - QFrame* netSpd=this ; - QVBoxLayout *spdLay=new QVBoxLayout (); - spdLay->addWidget ( new QLabel ( tr ( "Connection speed:" ),netSpd ) ); -#endif spd=new QSlider ( Qt::Horizontal,netSpd ); spd->setMinimum ( 0 ); spd->setMaximum ( 4 ); @@ -70,28 +64,16 @@ slideLay->insertSpacing ( 0,fm.width ( "MODEM" ) /2 ); slideLay->addSpacing ( fm.width ( "LAN" ) /2 ); -#ifndef Q_WS_HILDON QGroupBox* compr=new QGroupBox ( tr ( "C&ompression" ),this ); QHBoxLayout* comprLay=new QHBoxLayout ( compr ); -#else - QFrame* compr=this; - QHBoxLayout* comprLay=new QHBoxLayout (); -#endif packMethode = new QComboBox ( this ); quali= new QSpinBox ( this ); quali->setRange ( 0,9 ); -#ifdef Q_WS_HILDON - quali->setFixedHeight ( int ( quali->sizeHint().height() *1.5 ) ); -#endif QVBoxLayout* colLay=new QVBoxLayout(); QVBoxLayout* cowLay=new QVBoxLayout(); QHBoxLayout* spbl=new QHBoxLayout(); -#ifndef Q_WS_HILDON colLay->addWidget ( new QLabel ( tr ( "Method:" ),compr ) ); -#else - colLay->addWidget ( new QLabel ( tr ( "Compression method:" ),compr ) ); -#endif colLay->addWidget ( qualiLabel=new QLabel ( tr ( "Image quality:" ), compr ) ); cowLay->addWidget ( packMethode ); @@ -100,13 +82,8 @@ cowLay->addLayout ( spbl ); comprLay->addLayout ( colLay ); comprLay->addLayout ( cowLay ); -#ifndef Q_WS_HILDON connLay->addWidget ( netSpd ); connLay->addWidget ( compr ); -#else - connLay->addLayout ( spdLay ); - connLay->addLayout ( comprLay ); -#endif connLay->addStretch(); connect ( packMethode,SIGNAL ( activated ( const QString& ) ),this, diff -Nru x2goclient-4.1.2.3/src/connectionwidget.h x2goclient-4.1.2.4/src/connectionwidget.h --- x2goclient-4.1.2.3/src/connectionwidget.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/connectionwidget.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/contest.cpp x2goclient-4.1.2.4/src/contest.cpp --- x2goclient-4.1.2.3/src/contest.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/contest.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/contest.h x2goclient-4.1.2.4/src/contest.h --- x2goclient-4.1.2.3/src/contest.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/contest.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/cupsprint.cpp x2goclient-4.1.2.4/src/cupsprint.cpp --- x2goclient-4.1.2.3/src/cupsprint.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/cupsprint.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/cupsprintersettingsdialog.cpp x2goclient-4.1.2.4/src/cupsprintersettingsdialog.cpp --- x2goclient-4.1.2.3/src/cupsprintersettingsdialog.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/cupsprintersettingsdialog.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/cupsprintersettingsdialog.h x2goclient-4.1.2.4/src/cupsprintersettingsdialog.h --- x2goclient-4.1.2.3/src/cupsprintersettingsdialog.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/cupsprintersettingsdialog.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/cupsprint.h x2goclient-4.1.2.4/src/cupsprint.h --- x2goclient-4.1.2.3/src/cupsprint.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/cupsprint.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/cupsprintwidget.cpp x2goclient-4.1.2.4/src/cupsprintwidget.cpp --- x2goclient-4.1.2.3/src/cupsprintwidget.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/cupsprintwidget.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/cupsprintwidget.h x2goclient-4.1.2.4/src/cupsprintwidget.h --- x2goclient-4.1.2.3/src/cupsprintwidget.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/cupsprintwidget.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/editconnectiondialog.cpp x2goclient-4.1.2.4/src/editconnectiondialog.cpp --- x2goclient-4.1.2.3/src/editconnectiondialog.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/editconnectiondialog.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -34,20 +34,13 @@ : QDialog ( par,f ) { QVBoxLayout* ml=new QVBoxLayout ( this ); -#ifdef Q_WS_HILDON - ml->setMargin ( 2 ); -#endif fr=new QTabWidget ( this ); ml->addWidget ( fr ); ONMainWindow* parent= ( ONMainWindow* ) par; QFont fnt=font(); if ( parent->retMiniMode() ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif setFont ( fnt ); sessSet=new SessionWidget ( newSession, id,parent ); @@ -73,9 +66,6 @@ bLay->addWidget ( cancel ); bLay->addWidget ( def ); ml->addLayout ( bLay ); -#ifdef Q_WS_HILDON - bLay->setMargin ( 2 ); -#endif setSizeGripEnabled ( true ); setWindowIcon ( QIcon ( parent->iconsPath ( "/32x32/edit.png" ) ) ); @@ -94,20 +84,6 @@ #endif ok->setDefault ( true ); -#ifdef Q_WS_HILDON - QSize sz=ok->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - ok->setFixedSize ( sz ); - sz=cancel->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - cancel->setFixedSize ( sz ); - sz=def->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - def->setFixedSize ( sz ); -#endif if ( parent->retMiniMode() ) setContentsMargins ( 3,3,3,3 ); fr->setCurrentIndex ( ind ); diff -Nru x2goclient-4.1.2.3/src/editconnectiondialog.h x2goclient-4.1.2.4/src/editconnectiondialog.h --- x2goclient-4.1.2.3/src/editconnectiondialog.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/editconnectiondialog.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/exportdialog.cpp x2goclient-4.1.2.4/src/exportdialog.cpp --- x2goclient-4.1.2.3/src/exportdialog.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/exportdialog.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/exportdialog.h x2goclient-4.1.2.4/src/exportdialog.h --- x2goclient-4.1.2.3/src/exportdialog.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/exportdialog.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/folderbutton.cpp x2goclient-4.1.2.4/src/folderbutton.cpp --- x2goclient-4.1.2.3/src/folderbutton.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/folderbutton.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -52,11 +52,7 @@ QFont fnt=font(); if ( mw->retMiniMode() ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif setFont ( fnt ); setFocusPolicy ( Qt::NoFocus ); bool miniMode=mw->retMiniMode(); diff -Nru x2goclient-4.1.2.3/src/folderbutton.h x2goclient-4.1.2.4/src/folderbutton.h --- x2goclient-4.1.2.3/src/folderbutton.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/folderbutton.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/folderexplorer.cpp x2goclient-4.1.2.4/src/folderexplorer.cpp --- x2goclient-4.1.2.3/src/folderexplorer.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/folderexplorer.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/folderexplorer.h x2goclient-4.1.2.4/src/folderexplorer.h --- x2goclient-4.1.2.3/src/folderexplorer.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/folderexplorer.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/help.cpp x2goclient-4.1.2.4/src/help.cpp --- x2goclient-4.1.2.3/src/help.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/help.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2015-2020 by Mihai Moldovan +49 721 14595728 * + * Copyright (C) 2015-2023 by Mihai Moldovan +49 721 14595728 * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/helpdialog.cpp x2goclient-4.1.2.4/src/helpdialog.cpp --- x2goclient-4.1.2.3/src/helpdialog.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/helpdialog.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,7 +1,7 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * -* Copyright (C) 2015-2020 by Mihai Moldovan * +* Copyright (C) 2015-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/helpdialog.h x2goclient-4.1.2.4/src/helpdialog.h --- x2goclient-4.1.2.3/src/helpdialog.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/helpdialog.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,7 +1,7 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * -* Copyright (C) 2015-2020 by Mihai Moldovan * +* Copyright (C) 2015-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/help.h x2goclient-4.1.2.4/src/help.h --- x2goclient-4.1.2.3/src/help.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/help.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (C) 2015-2020 by Mihai Moldovan +49 721 14595728 * + * Copyright (C) 2015-2023 by Mihai Moldovan +49 721 14595728 * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/httpbrokerclient.cpp x2goclient-4.1.2.4/src/httpbrokerclient.cpp --- x2goclient-4.1.2.3/src/httpbrokerclient.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/httpbrokerclient.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/httpbrokerclient.h x2goclient-4.1.2.4/src/httpbrokerclient.h --- x2goclient-4.1.2.3/src/httpbrokerclient.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/httpbrokerclient.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/imgframe.cpp x2goclient-4.1.2.4/src/imgframe.cpp --- x2goclient-4.1.2.3/src/imgframe.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/imgframe.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/imgframe.h x2goclient-4.1.2.4/src/imgframe.h --- x2goclient-4.1.2.3/src/imgframe.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/imgframe.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/InteractionDialog.cpp x2goclient-4.1.2.4/src/InteractionDialog.cpp --- x2goclient-4.1.2.3/src/InteractionDialog.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/InteractionDialog.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -62,11 +62,7 @@ QFont fnt=this->font(); if ( mw->retMiniMode() ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif this->setFont ( fnt ); this->hide(); diff -Nru x2goclient-4.1.2.3/src/InteractionDialog.h x2goclient-4.1.2.4/src/InteractionDialog.h --- x2goclient-4.1.2.3/src/InteractionDialog.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/InteractionDialog.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/LDAPSession.cpp x2goclient-4.1.2.4/src/LDAPSession.cpp --- x2goclient-4.1.2.3/src/LDAPSession.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/LDAPSession.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/LDAPSession.h x2goclient-4.1.2.4/src/LDAPSession.h --- x2goclient-4.1.2.3/src/LDAPSession.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/LDAPSession.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/mediawidget.cpp x2goclient-4.1.2.4/src/mediawidget.cpp --- x2goclient-4.1.2.3/src/mediawidget.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/mediawidget.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -38,13 +38,7 @@ QWidget * parent, Qt::WindowFlags f ) : ConfigWidget ( id,mw,parent,f ) { -#ifdef Q_WS_HILDON - QTabWidget* tabSettings=new QTabWidget ( this ); - QFrame* sbgr=new QFrame(); - tabSettings->addTab ( sbgr,tr ( "Sound" ) ); -#else sbgr=new QGroupBox ( tr ( "Sound" ),this ); -#endif QVBoxLayout *sndLay=new QVBoxLayout ( sbgr ); QHBoxLayout* sLay=new QHBoxLayout ( ); QVBoxLayout* sLay_sys=new QVBoxLayout ( ); diff -Nru x2goclient-4.1.2.3/src/mediawidget.h x2goclient-4.1.2.4/src/mediawidget.h --- x2goclient-4.1.2.3/src/mediawidget.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/mediawidget.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/non_modal_messagebox.cpp x2goclient-4.1.2.4/src/non_modal_messagebox.cpp --- x2goclient-4.1.2.3/src/non_modal_messagebox.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/non_modal_messagebox.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2015-2020 by Mihai Moldovan * +* Copyright (C) 2015-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/non_modal_messagebox.h x2goclient-4.1.2.4/src/non_modal_messagebox.h --- x2goclient-4.1.2.3/src/non_modal_messagebox.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/non_modal_messagebox.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2015-2020 by Mihai Moldovan * +* Copyright (C) 2015-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/ongetpass.cpp x2goclient-4.1.2.4/src/ongetpass.cpp --- x2goclient-4.1.2.3/src/ongetpass.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/ongetpass.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -51,7 +51,6 @@ { QApplication app ( argc,argv ); -#ifndef Q_WS_HILDON #ifdef Q_OS_LINUX #if QT_VERSION < 0x050000 app.setStyle ( new QPlastiqueStyle() ); @@ -59,7 +58,6 @@ app.setStyle ("fusion"); #endif #endif -#endif QStringList args; if ( argc > 1 ) args=app.arguments(); diff -Nru x2goclient-4.1.2.3/src/ongetpass.h x2goclient-4.1.2.4/src/ongetpass.h --- x2goclient-4.1.2.3/src/ongetpass.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/ongetpass.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/onmainwindow.cpp x2goclient-4.1.2.4/src/onmainwindow.cpp --- x2goclient-4.1.2.3/src/onmainwindow.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/onmainwindow.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -78,6 +78,7 @@ setFocusPolicy ( Qt::NoFocus ); installTranslator(); + ignoreBrokerSessions=false; autoresume=true; cleanAllFiles=false; drawMenu=true; @@ -401,7 +402,6 @@ setCentralWidget ( fr ); -#ifndef Q_WS_HILDON // See if BGFile is a directory and retrieve an SVG file randomly from within QFileInfo bg_dir(BGFile); @@ -431,9 +431,6 @@ bgFrame=new SVGFrame ( ( QString ) images_resource_path("/svg/bg.svg"),true,fr ); } } -#else - bgFrame=new SVGFrame ( ( QString ) images_resource_path("/svg/bg_hildon.svg"),true,fr ); -#endif //bgFrame=new SVGFrame((QString)"/home/admin/test.svg",false,fr); QString x2gologopath=images_resource_path("/svg/x2gologo.svg"); @@ -838,12 +835,10 @@ u->hide(); QFont fnt=u->font(); fnt.setPointSize ( 16 ); -#ifndef Q_WS_HILDON if ( miniMode ) { fnt.setPointSize ( 12 ); } -#endif u->setFont ( fnt ); @@ -978,7 +973,7 @@ { menu_sess->addAction ( act_new ); menu_sess->addAction ( act_edit ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !portable ) menu_sess->addAction ( act_sessicon ); #endif @@ -1005,7 +1000,7 @@ { stb->addAction ( act_new ); stb->addAction ( act_edit ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !portable ) stb->addAction ( act_sessicon ); #endif @@ -2355,6 +2350,11 @@ void ONMainWindow::slotReadSessions() { + if(brokerMode&&ignoreBrokerSessions) + { + x2goDebug<<"Looks like session is already started, not reading sessions"; + return; + } users->show(); ln->show(); @@ -3319,6 +3319,11 @@ activateWindow(); raise(); } + if(brokerMode) + { + ignoreBrokerSessions=false; + } + if(brokerMode && config.brokerSyncTimeout && !(brokerSyncTimer->isActive())) { brokerSyncTimer->start(); @@ -3458,6 +3463,11 @@ pass->setFocus(); pass->selectAll(); passForm->setEnabled ( true ); + if(brokerMode) + { + ignoreBrokerSessions=false; + } + if(brokerMode && config.brokerSyncTimeout && !(brokerSyncTimer->isActive())) { brokerSyncTimer->start(); @@ -3623,6 +3633,14 @@ { user=st->setting()->value ( sid+"/user", ( QVariant ) "").toString(); + if(getCurrentUname().length()>0) + { + user=getCurrentUname(); + } + if(getCurrentPass().length()>0) + { + password=getCurrentPass(); + } } nxproxy=new QProcess; @@ -3836,7 +3854,10 @@ bool proxyKrbLogin=false; if(brokerMode) + { brokerSyncTimer->stop(); + ignoreBrokerSessions=true; + } user=getCurrentUname(); runRemoteCommand=true; @@ -3875,6 +3896,10 @@ setEnabled(true); passForm->setEnabled(true); + if(brokerMode) + { + ignoreBrokerSessions=false; + } if(config.brokerSyncTimeout && !(brokerSyncTimer->isActive())) { brokerSyncTimer->start(); @@ -5570,6 +5595,10 @@ } else { + if(brokerMode) + { + ignoreBrokerSessions=false; + } if(brokerMode && config.brokerSyncTimeout && !(brokerSyncTimer->isActive())) { brokerSyncTimer->start(); @@ -5671,6 +5700,11 @@ } if ( selectSessionDlg->isVisible() ) selectSessionDlg->setEnabled ( true ); + if(brokerMode) + { + ignoreBrokerSessions=false; + } + if(brokerMode && config.brokerSyncTimeout && !(brokerSyncTimer->isActive())) { brokerSyncTimer->start(); @@ -6320,7 +6354,14 @@ QString proxyCmd="nxproxy -S nx/nx,options="+dirpath+"/options:"+ resumingSession.display; #ifdef Q_OS_WIN - proxyCmd="bin\\"+proxyCmd; + if(! QFile::exists(appDir+"/nxproxy.exe")) + { + if(QFile::exists(appDir+"/bin/nxproxy.exe")) + { + proxyCmd="bin\\"+proxyCmd; + } + } + x2goDebug<<"NX proxy: "<(C) 2005-2020 by obviously nice: \ +
(C) 2005-2023 by obviously nice: \ Oleksandr Shneyder, Heinz-Markus Graesing
\ English version: (C) 20AB-20CD Trans Lator
*/ - QString aboutStr=tr ("
(C) 2005-2020 by obviously nice: " + QString aboutStr=tr ("
(C) 2005-2023 by obviously nice: " "Oleksandr Shneyder, Heinz-Markus Graesing
" ); aboutStr+= tr ( @@ -10188,51 +10214,6 @@ void ONMainWindow::slotExecXmodmap() { -#ifdef Q_WS_HILDON - QString passwd=getCurrentPass(); - QString user=getCurrentUname(); - QString host=resumingSession.server; - QString cmd; - - cmd="(xmodmap -pke ;" - "echo keycode 73= ;" -// "echo clear shift ;" -// "echo clear lock ;" -// "echo clear control ;" -// "echo clear mod1 ;" -// "echo clear mod2 ;" -// "echo clear mod3 ;" -// "echo clear mod4 ;" -// "echo clear mod5 ;" -// "echo add shift = Shift_L ;" - "echo add control = Control_R " -// "echo add mod5 = ISO_Level3_Shift" - ")| DISPLAY=:" - +resumingSession.display+" xmodmap - "; - - x2goDebug<<"Executing xmodmap with cmd: "<environment(); - env+=sshEnv; - xmodProc->setEnvironment ( env ); - } - xmodProc->setFwX ( true ); - xmodProc->startNormal(); -#endif } void ONMainWindow::check_cmd_status() @@ -10461,9 +10442,7 @@ QString cuser; -#ifdef Q_WS_HILDON - cuser="user"; -#elif defined (Q_OS_WIN) +#if defined (Q_OS_WIN) cuser=wapiGetUserName(); #else for ( int i=0; ifont(); if ( miniMode ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif passForm->setFont ( fnt ); fotoLabel=new QLabel ( passForm ); @@ -12696,19 +12721,8 @@ -#ifndef Q_WS_HILDON ok->setFixedSize ( ok->sizeHint() ); cancel->setFixedSize ( cancel->sizeHint() ); -#else - QSize sz=cancel->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - cancel->setFixedSize ( sz ); - sz=ok->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - ok->setFixedSize ( sz ); -#endif QVBoxLayout *layout=new QVBoxLayout ( passForm ); QHBoxLayout *labelLay=new QHBoxLayout(); @@ -12798,11 +12812,7 @@ sessionStatusDlg->setFixedSize ( 310,200 ); QFont fnt=sessionStatusDlg->font(); if ( miniMode ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif sessionStatusDlg->setFont ( fnt ); username->addWidget ( sessionStatusDlg ); QPalette pal=sessionStatusDlg->palette(); @@ -13000,11 +13010,7 @@ QFont fnt=selectSessionDlg->font(); if ( miniMode ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif selectSessionDlg->setFont ( fnt ); selectSessionLabel=new QLabel ( tr ( "Select session:" ), selectSessionDlg ); @@ -13057,29 +13063,8 @@ SLOT ( slotCloseSelectDlg() ) ); selectSessionDlg->show(); -#ifndef Q_WS_HILDON sOk->setFixedSize ( ok->sizeHint() ); sCancel->setFixedSize ( cancel->sizeHint() ); -#else - QSize sz=sCancel->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - sCancel->setFixedSize ( sz ); - sz=sOk->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - sOk->setFixedSize ( sz ); - sz=bSusp->sizeHint(); - if ( bTerm->sizeHint().width() > sz.width() ) - sz=bTerm->sizeHint(); - if ( bNew->sizeHint().width() > sz.width() ) - sz=bNew->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - bSusp->setFixedSize ( sz ); - bTerm->setFixedSize ( sz ); - bNew->setFixedSize ( sz ); -#endif int bmaxw=bNew->size().width(); if ( bSusp->size().width() >bmaxw ) bmaxw=bSusp->size().width(); diff -Nru x2goclient-4.1.2.3/src/onmainwindow.h x2goclient-4.1.2.4/src/onmainwindow.h --- x2goclient-4.1.2.3/src/onmainwindow.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/onmainwindow.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -594,6 +594,8 @@ QStringList _transApplicationsNames; QString portableDataPath; QString proxyErrString; +/* don't sync sessions from broker if the session already started */ + bool ignoreBrokerSessions; bool haveTerminal; bool proxyRunning; bool drawMenu; diff -Nru x2goclient-4.1.2.3/src/onmainwindow_privat.h x2goclient-4.1.2.4/src/onmainwindow_privat.h --- x2goclient-4.1.2.3/src/onmainwindow_privat.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/onmainwindow_privat.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/printdialog.cpp x2goclient-4.1.2.4/src/printdialog.cpp --- x2goclient-4.1.2.3/src/printdialog.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/printdialog.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/printdialog.h x2goclient-4.1.2.4/src/printdialog.h --- x2goclient-4.1.2.3/src/printdialog.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/printdialog.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/printercmddialog.cpp x2goclient-4.1.2.4/src/printercmddialog.cpp --- x2goclient-4.1.2.3/src/printercmddialog.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/printercmddialog.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/printercmddialog.h x2goclient-4.1.2.4/src/printercmddialog.h --- x2goclient-4.1.2.3/src/printercmddialog.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/printercmddialog.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/printprocess.cpp x2goclient-4.1.2.4/src/printprocess.cpp --- x2goclient-4.1.2.3/src/printprocess.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/printprocess.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -22,7 +22,7 @@ #include "x2gosettings.h" #include #include "printdialog.h" -#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON) +#if (!defined Q_OS_WIN) #include "cupsprint.h" #else #include "printwidget.h" @@ -124,13 +124,6 @@ st.setting()->value ( "print/defaultprinter", wapiGetDefaultPrinter() ).toString(); #endif -#ifdef Q_WS_HILDON - pdfOpenCmd="run-standalone.sh dbus-send --print-reply" - " --dest=com.nokia.osso_pdfviewer " - "/com/nokia/osso_pdfviewer " - "com.nokia.osso_pdfviewer.mime_open string:file://"; - viewPdf=true; -#endif return true; } @@ -142,11 +135,7 @@ if ( pdfOpen ) { #ifndef Q_OS_WIN -#ifndef Q_WS_HILDON QString cmd=pdfOpenCmd+" \""+pdfFile+"\""; -#else - QString cmd=pdfOpenCmd+"\""+pdfFile+"\""; -#endif x2goDebug<<"Using PDF viewer command: "< * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/printwidget.cpp x2goclient-4.1.2.4/src/printwidget.cpp --- x2goclient-4.1.2.3/src/printwidget.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/printwidget.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -16,7 +16,7 @@ ***************************************************************************/ #include "printwidget.h" -#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON) +#if (!defined Q_OS_WIN) #include "cupsprintwidget.h" #endif #include "printercmddialog.h" @@ -34,16 +34,7 @@ ui.rbPrint->setChecked ( true ); ui.gbView->setVisible ( false ); QVBoxLayout* lay= ( QVBoxLayout* ) ui.gbPrint->layout(); -#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON) - ui.cbWinPrinter->hide(); - ui.lWinPrinter->hide(); - ui.lWinInfo->hide(); - pwid=new CUPSPrintWidget ( ui.gbPrint ); - lay->insertWidget ( 0,pwid ); - connect ( ui.cbPrintCmd,SIGNAL ( toggled ( bool ) ),pwid, - SLOT ( setDisabled ( bool ) ) ); -#else -#ifdef Q_OS_WIN +#if defined (Q_OS_WIN) connect ( ui.cbPrintCmd,SIGNAL ( toggled ( bool ) ),ui.cbWinPrinter, SLOT ( setDisabled ( bool ) ) ); connect ( ui.cbPrintCmd,SIGNAL ( toggled ( bool ) ),ui.lWinPrinter, @@ -70,7 +61,14 @@ rtfm->setWordWrap ( true ); rtfm->setOpenExternalLinks ( true ); lay->insertWidget ( 6,rtfm ); -#endif +#else + ui.cbWinPrinter->hide(); + ui.lWinPrinter->hide(); + ui.lWinInfo->hide(); + pwid=new CUPSPrintWidget ( ui.gbPrint ); + lay->insertWidget ( 0,pwid ); + connect ( ui.cbPrintCmd,SIGNAL ( toggled ( bool ) ),pwid, + SLOT ( setDisabled ( bool ) ) ); #endif connect ( ui.pbPrintCmd,SIGNAL ( clicked() ),this, SLOT ( slot_editPrintCmd() ) ); @@ -85,13 +83,6 @@ ui.label->hide(); ui.leOpenCmd->hide(); #endif -#ifdef Q_WS_HILDON - ui.rbView->setChecked ( true ); - ui.rbPrint->hide(); - ui.rbView->hide(); - ui.label->hide(); - ui.leOpenCmd->hide(); -#endif } @@ -190,8 +181,7 @@ #ifdef Q_OS_WIN st.setting()->setValue ( "print/defaultprinter", QVariant ( ui.cbWinPrinter->currentText()) ); -#endif -#if (!defined Q_OS_WIN) && (!defined Q_WS_HILDON) +#else pwid->savePrinter(); #endif } diff -Nru x2goclient-4.1.2.3/src/printwidget.h x2goclient-4.1.2.4/src/printwidget.h --- x2goclient-4.1.2.3/src/printwidget.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/printwidget.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/pulsemanager.cpp x2goclient-4.1.2.4/src/pulsemanager.cpp --- x2goclient-4.1.2.3/src/pulsemanager.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/pulsemanager.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2020 by Mihai Moldovan * + * Copyright (C) 2012-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/pulsemanager.h x2goclient-4.1.2.4/src/pulsemanager.h --- x2goclient-4.1.2.3/src/pulsemanager.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/pulsemanager.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2020 by Mihai Moldovan * + * Copyright (C) 2012-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/sessionbutton.cpp x2goclient-4.1.2.4/src/sessionbutton.cpp --- x2goclient-4.1.2.3/src/sessionbutton.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sessionbutton.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -63,11 +63,7 @@ QFont fnt=font(); if ( mw->retMiniMode() ) -#ifdef Q_WS_HILDON - fnt.setPointSize ( 10 ); -#else fnt.setPointSize ( 9 ); -#endif setFont ( fnt ); setFocusPolicy ( Qt::NoFocus ); bool miniMode=mw->retMiniMode(); @@ -169,7 +165,7 @@ QIcon ( mw->iconsPath ( "/16x16/edit.png" ) ), tr ( "Session preferences ..." ) ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) act_createIcon=sessMenu->addAction ( QIcon ( mw->iconsPath ( "/16x16/create_file.png" ) ), tr ( @@ -185,7 +181,7 @@ connect ( act_remove,SIGNAL ( triggered ( bool ) ),this, SLOT ( slotRemove() ) ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) connect ( act_createIcon,SIGNAL ( triggered ( bool ) ),this, SLOT ( slotCreateSessionIcon() ) ); #endif @@ -637,16 +633,12 @@ } -#ifndef Q_WS_HILDON geomBox->addItem ( "1440x900" ); geomBox->addItem ( "1280x1024" ); geomBox->addItem ( "1024x768" ); geomBox->addItem ( "800x600" ); -#else - geomBox->addItem ( tr ( "window" ) ); -#endif if ( st->setting()->value ( sid+"/fullscreen", ( QVariant ) false ).toBool() ) { @@ -674,7 +666,6 @@ } else { -#ifndef Q_WS_HILDON QString g=QString::number ( st->setting()->value ( sid+"/width" ).toInt() ); g+="x"+QString::number ( st->setting()->value ( @@ -683,10 +674,6 @@ if ( geomBox->findText ( g ) ==-1 ) geomBox->addItem ( g ); geomBox->setCurrentIndex ( geomBox->findText ( g ) ); -#else - geom->setText ( tr ( "window" ) ); - geomBox->setCurrentIndex ( 1 ); -#endif } if (directRDP) @@ -1086,9 +1073,6 @@ else { QString new_geom=new_g; -#ifdef Q_WS_HILDON - new_geom="800x600"; -#endif st.setting()->setValue ( sid+"/fullscreen", ( QVariant ) false ); st.setting()->setValue ( sid+"/multidisp", ( QVariant ) false ); st.setting()->setValue ( sid+"/maxdim", ( QVariant ) false ); diff -Nru x2goclient-4.1.2.3/src/sessionbutton.h x2goclient-4.1.2.4/src/sessionbutton.h --- x2goclient-4.1.2.3/src/sessionbutton.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sessionbutton.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/sessionexplorer.cpp x2goclient-4.1.2.4/src/sessionexplorer.cpp --- x2goclient-4.1.2.3/src/sessionexplorer.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sessionexplorer.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/sessionexplorer.h x2goclient-4.1.2.4/src/sessionexplorer.h --- x2goclient-4.1.2.3/src/sessionexplorer.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sessionexplorer.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/sessionmanagedialog.cpp x2goclient-4.1.2.4/src/sessionmanagedialog.cpp --- x2goclient-4.1.2.3/src/sessionmanagedialog.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sessionmanagedialog.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -53,7 +53,7 @@ QPushButton* newSession=new QPushButton ( tr ( "&New session" ),fr ); editSession=new QPushButton ( tr ( "&Session preferences" ),fr ); removeSession=new QPushButton ( tr ( "&Delete session" ),fr ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !ONMainWindow::getPortable() ) createSessionIcon=new QPushButton ( tr ( "&Create session icon on desktop ..." ),fr ); @@ -63,7 +63,7 @@ par->iconsPath ( "/16x16/new_file.png" ) ) ); editSession->setIcon ( QIcon ( par->iconsPath ( "/16x16/edit.png" ) ) ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !ONMainWindow::getPortable() ) createSessionIcon->setIcon ( QIcon ( par->iconsPath ( "/16x16/create_file.png" ) ) ); @@ -75,7 +75,7 @@ actLay->addWidget ( newSession ); actLay->addWidget ( editSession ); actLay->addWidget ( removeSession ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !ONMainWindow::getPortable() ) actLay->addWidget ( createSessionIcon ); #endif @@ -97,7 +97,7 @@ connect ( removeSession,SIGNAL ( clicked() ),this,SLOT ( slot_delete() ) ); connect ( editSession,SIGNAL ( clicked() ),this,SLOT ( slot_edit() ) ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !ONMainWindow::getPortable() ) connect ( createSessionIcon,SIGNAL ( clicked() ), this,SLOT ( slot_createSessionIcon() ) ); @@ -146,7 +146,7 @@ removeSession->setEnabled ( false ); editSession->setEnabled ( false ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !ONMainWindow::getPortable() ) createSessionIcon->setEnabled ( false ); #endif @@ -216,7 +216,7 @@ removeSession->setEnabled ( isSess ); editSession->setEnabled ( isSess ); -#if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) +#if (!defined Q_OS_DARWIN) if ( !ONMainWindow::getPortable() ) createSessionIcon->setEnabled ( isSess ); #endif diff -Nru x2goclient-4.1.2.3/src/sessionmanagedialog.h x2goclient-4.1.2.4/src/sessionmanagedialog.h --- x2goclient-4.1.2.3/src/sessionmanagedialog.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sessionmanagedialog.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/sessionwidget.cpp x2goclient-4.1.2.4/src/sessionwidget.cpp --- x2goclient-4.1.2.3/src/sessionwidget.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sessionwidget.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -43,9 +43,6 @@ : ConfigWidget ( id,mw,parent,f ) { QVBoxLayout* sessLay=new QVBoxLayout ( this ); -#ifdef Q_WS_HILDON - sessLay->setMargin ( 2 ); -#endif this->parent=mw; this->newSession=newSession; @@ -79,11 +76,7 @@ pathLay->addWidget(lPath,1); pathLay->addWidget(pathButton,0); -#ifndef Q_WS_HILDON QGroupBox *sgb=new QGroupBox ( tr ( "&Server" ),this ); -#else - QFrame* sgb=this; -#endif const QString ssh_port_tooltip_text = tr ("Values ranging from 0 to 65535 are allowed." "
A value of 0 will either use the port specified in the " "SSH configuration file belonging to a host or shortname, " @@ -104,18 +97,11 @@ #endif key=new QLineEdit ( sgb ); -#ifndef Q_WS_HILDON openKey=new QPushButton ( QIcon ( mainWindow->iconsPath ( "/32x32/file-open.png" ) ), QString::null,sgb ); QVBoxLayout *sgbLay = new QVBoxLayout ( sgb ); -#else - QPushButton* openKey=new QPushButton ( - QIcon ( mainWindow->iconsPath ( "/16x16/file-open.png" ) ), - QString::null,sgb ); - QVBoxLayout *sgbLay = new QVBoxLayout (); -#endif QHBoxLayout *suLay =new QHBoxLayout(); QVBoxLayout *slLay =new QVBoxLayout(); QVBoxLayout *elLay =new QVBoxLayout(); @@ -132,9 +118,6 @@ #endif suLay->addLayout ( slLay ); suLay->addLayout ( elLay ); -#ifdef Q_WS_HILDON - sshPort->setFixedHeight ( int ( sshPort->sizeHint().height() *1.5 ) ); -#endif QHBoxLayout *keyLay =new QHBoxLayout(); lKey=new QLabel ( tr ( "Use RSA/DSA key for ssh connection:" ),sgb ); @@ -199,14 +182,8 @@ proxyLaout->addWidget(cbProxyKrbLogin,5,3,1,3); -#ifndef Q_WS_HILDON QGroupBox *deskSess=new QGroupBox ( tr ( "&Session type" ),this ); QGridLayout* cmdLay=new QGridLayout ( deskSess ); -#else - QFrame* deskSess=this; - QHBoxLayout* cmdLay=new QHBoxLayout (); - cmdLay->addWidget ( new QLabel ( tr ( "Session type:" ),this ) ); -#endif cbKdrive=new QCheckBox(tr("Run in X2GoKDrive (experimental)")); sessBox=new QComboBox ( deskSess ); cmd=new QLineEdit ( deskSess ); @@ -246,7 +223,6 @@ cmdCombo->addItems ( mainWindow->transApplicationsNames() ); cmdCombo->lineEdit()->setText ( tr ( "Path to executable" ) ); cmdCombo->lineEdit()->selectAll(); -#ifndef Q_WS_HILDON sessLay->addLayout ( slay ); sessLay->addLayout ( ilay ); sessLay->addLayout ( pathLay ); @@ -261,24 +237,6 @@ connect(cbDirectRDP,SIGNAL(clicked()), this, SLOT(slot_rdpDirectClicked())); #endif -#else - QVBoxLayout* sHildILay = new QVBoxLayout(); - sHildILay->addLayout ( slay ); - sHildILay->addLayout ( ilay ); - sHildILay->addStretch(); - QHBoxLayout* sHildLay = new QHBoxLayout(); - sHildLay->addLayout ( sHildILay ); - - QFrame* vl=new QFrame; - vl->setLineWidth ( 0 ); - vl->setFrameStyle ( QFrame::VLine|QFrame::Plain ); - sHildLay->addWidget ( vl ); - sHildLay->setSpacing ( 6 ); - sHildLay->addLayout ( sgbLay ); - sessLay->addLayout ( sHildLay ); - sessLay->addStretch(); - sessLay->addLayout ( cmdLay ); -#endif sessLay->addStretch(); connect ( icon,SIGNAL ( clicked() ),this,SLOT ( slot_getIcon() ) ); diff -Nru x2goclient-4.1.2.3/src/settingswidget.cpp x2goclient-4.1.2.4/src/settingswidget.cpp --- x2goclient-4.1.2.3/src/settingswidget.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/settingswidget.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -39,17 +39,9 @@ : ConfigWidget ( id,mw,parent,f ) { multiDisp=(QApplication::desktop()->screenCount()>1); -#ifdef Q_WS_HILDON - QTabWidget* tabSettings=new QTabWidget ( this ); - QFrame* dgb=new QFrame(); - QFrame* kgb=new QFrame(); - tabSettings->addTab ( dgb, tr ( "&Display" ) ); - tabSettings->addTab ( kgb,tr ( "&Keyboard" ) ); -#else QGroupBox *dgb=new QGroupBox ( tr ( "&Display" ),this ); clipGr=new QGroupBox ( tr ( "&Clipboard mode" ),this ); kgb=new QGroupBox ( tr ( "&Keyboard" ),this ); -#endif QVBoxLayout *dbLay = new QVBoxLayout ( dgb ); QVBoxLayout *cbLay=new QVBoxLayout ( clipGr ); QHBoxLayout* sLay=new QHBoxLayout ( ); @@ -60,11 +52,7 @@ QVBoxLayout* setLay=new QVBoxLayout ( this ); QButtonGroup* radio = new QButtonGroup ( dgb ); fs=new QRadioButton ( tr ( "Fullscreen" ),dgb ); -#ifndef Q_WS_HILDON custom=new QRadioButton ( tr ( "Custom" ),dgb ); -#else - custom=new QRadioButton ( tr ( "Window" ),dgb ); -#endif display=new QRadioButton ( tr ( "Use whole display" ),dgb ); cbNoresize=new QCheckBox ( tr ( "Not resizable" ),dgb ); maxRes=new QRadioButton ( tr ( "Maximum available" ),dgb ); @@ -142,12 +130,6 @@ dbLay->addWidget ( dhl ); dbLay->addWidget ( cbXinerama ); -#ifdef Q_WS_HILDON - width->hide(); - height->hide(); - widthLabel->hide(); - heightLabel->hide(); -#endif #ifdef Q_OS_DARWIN kgb->hide(); @@ -197,7 +179,6 @@ kbLay->addWidget ( rbKbdSet); kbLay->addWidget( gbKbdString ); -#ifndef Q_WS_HILDON setLay->addWidget ( dgb ); setLay->addWidget ( clipGr ); setLay->addWidget ( kgb ); @@ -258,10 +239,6 @@ connect (xdmcpParams, SIGNAL(textChanged(QString)), this, SLOT(updateCmdLine())); #endif //CFGCLIENT #endif //Q_OS_LINUX -#else - setLay->addWidget ( tabSettings ); -// cbClientPrint->hide(); -#endif //Q_WS_HILDON setLay->addStretch(); connect ( custom,SIGNAL ( toggled ( bool ) ),width, diff -Nru x2goclient-4.1.2.3/src/settingswidget.h x2goclient-4.1.2.4/src/settingswidget.h --- x2goclient-4.1.2.3/src/settingswidget.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/settingswidget.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/sharewidget.cpp x2goclient-4.1.2.4/src/sharewidget.cpp --- x2goclient-4.1.2.3/src/sharewidget.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sharewidget.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -63,14 +63,6 @@ QPushButton* addDir=new QPushButton ( tr ( "Add" ),egb ); QPushButton* delDir=new QPushButton ( tr ( "Delete" ),egb ); -#ifdef Q_WS_HILDON - QSize sz=addDir->sizeHint(); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - addDir->setFixedSize ( sz ); - sz=delDir->sizeHint(); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - delDir->setFixedSize ( sz ); -#endif QLabel *dirPrompt=new QLabel ( tr ( "Path:" ),egb ); dirPrompt->setFixedSize ( dirPrompt->sizeHint() ); diff -Nru x2goclient-4.1.2.3/src/sharewidget.h x2goclient-4.1.2.4/src/sharewidget.h --- x2goclient-4.1.2.3/src/sharewidget.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sharewidget.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/sshmasterconnection.cpp x2goclient-4.1.2.4/src/sshmasterconnection.cpp --- x2goclient-4.1.2.3/src/sshmasterconnection.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sshmasterconnection.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/sshmasterconnection.h x2goclient-4.1.2.4/src/sshmasterconnection.h --- x2goclient-4.1.2.3/src/sshmasterconnection.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sshmasterconnection.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/sshprocess.cpp x2goclient-4.1.2.4/src/sshprocess.cpp --- x2goclient-4.1.2.3/src/sshprocess.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sshprocess.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/sshprocess.h x2goclient-4.1.2.4/src/sshprocess.h --- x2goclient-4.1.2.3/src/sshprocess.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/sshprocess.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/SVGFrame.cpp x2goclient-4.1.2.4/src/SVGFrame.cpp --- x2goclient-4.1.2.3/src/SVGFrame.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/SVGFrame.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/SVGFrame.h x2goclient-4.1.2.4/src/SVGFrame.h --- x2goclient-4.1.2.3/src/SVGFrame.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/SVGFrame.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/unixhelper.cpp x2goclient-4.1.2.4/src/unixhelper.cpp --- x2goclient-4.1.2.3/src/unixhelper.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/unixhelper.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2020 by Mihai Moldovan * + * Copyright (C) 2015-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/unixhelper.h x2goclient-4.1.2.4/src/unixhelper.h --- x2goclient-4.1.2.3/src/unixhelper.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/unixhelper.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2015-2020 by Mihai Moldovan * + * Copyright (C) 2015-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/unix_stdint.h x2goclient-4.1.2.4/src/unix_stdint.h --- x2goclient-4.1.2.3/src/unix_stdint.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/unix_stdint.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2016-2020 by Mihai Moldovan * + * Copyright (C) 2016-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/userbutton.cpp x2goclient-4.1.2.4/src/userbutton.cpp --- x2goclient-4.1.2.3/src/userbutton.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/userbutton.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/userbutton.h x2goclient-4.1.2.4/src/userbutton.h --- x2goclient-4.1.2.3/src/userbutton.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/userbutton.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/version.h x2goclient-4.1.2.4/src/version.h --- x2goclient-4.1.2.3/src/version.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/version.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,7 +1,7 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * -* Copyright (C) 2015-2020 by Mihai Moldovan * +* Copyright (C) 2015-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -19,6 +19,6 @@ #ifndef VERSION_H #define VERSION_H -#define VERSION "4.1.2.3" +#define VERSION "4.1.2.4" #endif /* !defined (VERSION_H) */ diff -Nru x2goclient-4.1.2.3/src/wapi.cpp x2goclient-4.1.2.4/src/wapi.cpp --- x2goclient-4.1.2.3/src/wapi.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/wapi.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/wapi.h x2goclient-4.1.2.4/src/wapi.h --- x2goclient-4.1.2.3/src/wapi.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/wapi.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/windows_stdint.h x2goclient-4.1.2.4/src/windows_stdint.h --- x2goclient-4.1.2.3/src/windows_stdint.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/windows_stdint.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2029 by Mihai Moldovan * + * Copyright (C) 2012-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/x2goclientconfig.h x2goclient-4.1.2.4/src/x2goclientconfig.h --- x2goclient-4.1.2.3/src/x2goclientconfig.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/x2goclientconfig.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -36,8 +36,4 @@ #undef USELDAP #endif -#if defined Q_WS_HILDON -#undef USELDAP -#endif - #endif diff -Nru x2goclient-4.1.2.3/src/x2goclient.cpp x2goclient-4.1.2.4/src/x2goclient.cpp --- x2goclient-4.1.2.3/src/x2goclient.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/x2goclient.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,7 +1,7 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * -* Copyright (C) 2015-2020 by Mihai Moldovan * +* Copyright (C) 2015-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/x2gologdebug.cpp x2goclient-4.1.2.4/src/x2gologdebug.cpp --- x2goclient-4.1.2.3/src/x2gologdebug.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/x2gologdebug.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/x2gosettings.cpp x2goclient-4.1.2.4/src/x2gosettings.cpp --- x2goclient-4.1.2.3/src/x2gosettings.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/x2gosettings.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/x2gosettings.h x2goclient-4.1.2.4/src/x2gosettings.h --- x2goclient-4.1.2.3/src/x2gosettings.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/x2gosettings.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/x2goutils.cpp x2goclient-4.1.2.4/src/x2goutils.cpp --- x2goclient-4.1.2.3/src/x2goutils.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/x2goutils.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,7 +1,7 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * -* Copyright (C) 2016-2020 by Mihai Moldovan * +* Copyright (C) 2016-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/x2goutils.h x2goclient-4.1.2.4/src/x2goutils.h --- x2goclient-4.1.2.3/src/x2goutils.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/x2goutils.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,7 +1,7 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * -* Copyright (C) 2016-2020 by Mihai Moldovan * +* Copyright (C) 2016-2023 by Mihai Moldovan * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff -Nru x2goclient-4.1.2.3/src/xsettingswidget.cpp x2goclient-4.1.2.4/src/xsettingswidget.cpp --- x2goclient-4.1.2.3/src/xsettingswidget.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/xsettingswidget.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/src/xsettingswidget.h x2goclient-4.1.2.4/src/xsettingswidget.h --- x2goclient-4.1.2.3/src/xsettingswidget.h 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/src/xsettingswidget.h 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * diff -Nru x2goclient-4.1.2.3/VERSION x2goclient-4.1.2.4/VERSION --- x2goclient-4.1.2.3/VERSION 2022-08-22 21:16:32.000000000 +0000 +++ x2goclient-4.1.2.4/VERSION 2023-07-12 16:20:52.000000000 +0000 @@ -1 +1 @@ -4.1.2.3 +4.1.2.4 diff -Nru x2goclient-4.1.2.3/x2goclient.pro x2goclient-4.1.2.4/x2goclient.pro --- x2goclient-4.1.2.3/x2goclient.pro 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/x2goclient.pro 2023-07-12 16:20:52.000000000 +0000 @@ -157,18 +157,26 @@ } } else:win32 { - # pkgconfig is... tricky on Windows. Additionally, libssh 0.7.x stopped - # distributing pkgconfig files on non-UNIX platforms, including Windows. - # We'll hardcode stuff here. Make sure that it's consistent with the - # libraries we use on Windows. - LIBS += -lssh + mxe { + QMAKE_CXXFLAGS += -DLIBSSH_STATIC=1 + LIBS += -lssh -lgcrypt -lgpg-error + } + else { + # pkgconfig is... tricky on Windows. Additionally, libssh 0.7.x stopped + # distributing pkgconfig files on non-UNIX platforms, including Windows. + # We'll hardcode stuff here. Make sure that it's consistent with the + # libraries we use on Windows. + LIBS += -lssh + } } else { # For backwards-compatibility. LIBS += -lssh -lssh_threads } -win32:LIBS += -lAdvAPI32 -lshell32 -lUser32 +win32:!mxe { + LIBS += -lAdvAPI32 -lshell32 -lUser32 +} RC_FILE = res/x2goclient.rc SOURCES += src/x2goclient.cpp @@ -264,18 +272,19 @@ PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist QMAKE_POST_LINK += $${PWD}/res/osxbundle/postbuild.sh \"$${TARGET}\" \"$${VERSION}\" \"$${QMAKE_INFO_PLIST_OUT}\" \"$${QMAKE_COPY}\" \"$${ICON}\" \"$${OUT_PWD}/$${TARGET}.app/Contents/Resources/\" } -win32-* { +win32|win32-* { message("building $$TARGET for windows without ldap and cups") LIBS += -lwinspool -lws2_32 CONFIG += static release } QT += svg network linux|linux-* { -greaterThan(QT_MAJOR_VERSION, 4): QT += x11extras + greaterThan(QT_MAJOR_VERSION, 4): QT += x11extras } -win32-* { -greaterThan(QT_MAJOR_VERSION, 4): QT += winextras +win32|win32-* { + greaterThan(QT_MAJOR_VERSION, 4): QT += winextras } +mxe:QMAKE_CXXFLAGS += -std=c++11 -Wno-deprecated-declarations QMAKE_CXXFLAGS_DEBUG -= -g QMAKE_CXXFLAGS_DEBUG += -O2 -g3 -ggdb3 -gdwarf-4 diff -Nru x2goclient-4.1.2.3/x2goclient.pro.maemo x2goclient-4.1.2.4/x2goclient.pro.maemo --- x2goclient-4.1.2.3/x2goclient.pro.maemo 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/x2goclient.pro.maemo 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -# This file was created by KDevelop. -# ------------------------------------------- -# -FORMS += src/ui/cupsprintsettingsdialog.ui \ - src/ui/cupsprintwidget.ui \ - src/ui/printwidget.ui \ - src/ui/printercmddialog.ui \ - src/ui/printdialog.ui - -TRANSLATIONS += res/i18n/x2goclient_de.ts \ - res/i18n/x2goclient_ru.ts - -HEADERS += src/configdialog.h \ - src/editconnectiondialog.h \ - src/exportdialog.h \ - src/imgframe.h \ - src/LDAPSession.h \ - src/onmainwindow.h \ - src/sessionbutton.h \ - src/sessionmanagedialog.h \ - src/sshprocess.h \ - src/SVGFrame.h \ - src/userbutton.h \ - src/x2goclientconfig.h \ - src/x2gologdebug.h \ - src/printprocess.h \ - src/printwidget.h \ - src/printercmddialog.h \ - src/printdialog.h \ - src/embedwidget.h \ - src/wapi.h \ - src/sessionwidget.h \ - src/configwidget.h \ - src/connectionwidget.h \ - src/settingswidget.h \ - src/sharewidget.h \ - src/clicklineedit.h \ - src/help.h \ - src/unixhelper.h \ - src/compat.h \ - src/pulsemanager.h - -SOURCES += src/sharewidget.cpp \ - src/settingswidget.cpp \ - src/configwidget.cpp \ - src/sessionwidget.cpp \ - src/connectionwidget.cpp \ - src/configdialog.cpp \ - src/editconnectiondialog.cpp \ - src/exportdialog.cpp \ - src/imgframe.cpp \ - src/LDAPSession.cpp \ - src/ongetpass.cpp \ - src/onmainwindow.cpp \ - src/sessionbutton.cpp \ - src/sessionmanagedialog.cpp \ - src/sshprocess.cpp \ - src/SVGFrame.cpp \ - src/userbutton.cpp \ - src/x2gologdebug.cpp \ - src/printprocess.cpp \ - src/printwidget.cpp \ - src/printercmddialog.cpp \ - src/printdialog.cpp \ - src/embedwidget.cpp \ - src/wapi.cpp \ - src/clicklineedit.cpp \ - src/help.cpp \ - src/unixhelper.cpp \ - src/compat.cpp \ - src/pulsemanager.cpp - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . -RESOURCES += res/resources.rcc -RC_FILE = res/x2goclient.rc - -QT += svg network -ICON = $${PWD}/res/img/icons/x2go-mac.icns -QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk -CONFIG += x86 ppc diff -Nru x2goclient-4.1.2.3/x2goclient.spec x2goclient-4.1.2.4/x2goclient.spec --- x2goclient-4.1.2.3/x2goclient.spec 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/x2goclient.spec 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ Name: x2goclient -Version: 4.1.2.3 +Version: 4.1.2.4 Release: 0.0x2go1%{?dist} # Default to Qt 4 for now. diff -Nru x2goclient-4.1.2.3/x2gohelper/Makefile.mxe x2goclient-4.1.2.4/x2gohelper/Makefile.mxe --- x2goclient-4.1.2.3/x2gohelper/Makefile.mxe 1970-01-01 00:00:00.000000000 +0000 +++ x2goclient-4.1.2.4/x2gohelper/Makefile.mxe 2023-07-12 16:20:52.000000000 +0000 @@ -0,0 +1,4 @@ +all: + "${MXE_BASE}/bin/${MXE_TARGET}-g++" -I "${MXE_BASE}/${MXE_TARGET}/include" -o "../${BUILD_DIR}/${BUILD_CONFIG}/x2gohelper.exe" 'x2gohelper.cpp' +clean: + rm -f "../${BUILD_DIR}/${BUILD_CONFIG}/x2gohelper.exe" diff -Nru x2goclient-4.1.2.3/x2gohelper/x2gohelper.cpp x2goclient-4.1.2.4/x2gohelper/x2gohelper.cpp --- x2goclient-4.1.2.3/x2gohelper/x2gohelper.cpp 2022-08-22 21:16:33.000000000 +0000 +++ x2goclient-4.1.2.4/x2gohelper/x2gohelper.cpp 2023-07-12 16:20:52.000000000 +0000 @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2020 by Oleksandr Shneyder * +* Copyright (C) 2005-2023 by Oleksandr Shneyder * * * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * along with this program. If not, see . * ***************************************************************************/ #include -#include +#include void killProcess(DWORD pid) { HANDLE handle=OpenProcess(PROCESS_TERMINATE,0,pid);