From 2931e754c3e226e070d27b262432fc31b28732c4 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 22 Sep 2022 20:15:26 +0400 Subject: [PATCH] Beta version 4.2.1. - Improve scaling / cropping for photos / video files. - Improve touch support in channel comments. - Nice animation for spoilers. --- .github/workflows/win.yml | 2 +- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/changelogs.cpp | 8 ++++++++ Telegram/SourceFiles/core/version.h | 6 +++--- Telegram/build/version | 10 +++++----- changelog.txt | 6 ++++++ 8 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 9f0c50ec09..6b52cad4f4 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -80,7 +80,7 @@ jobs: path: ${{ env.TBUILD }}\${{ env.REPO_NAME }} - name: Python installs. - run: py -m pip install pywin32 + run: py -m pip install pywin32 six - name: Set up environment paths. shell: bash diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 94507b1b3d..207e3decc5 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -10,7 +10,7 @@ + Version="4.2.1.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 9ecbd9fe5d..43908fb196 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,2,0,0 - PRODUCTVERSION 4,2,0,0 + FILEVERSION 4,2,1,0 + PRODUCTVERSION 4,2,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "4.2.0.0" + VALUE "FileVersion", "4.2.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2022" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.2.0.0" + VALUE "ProductVersion", "4.2.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 4882a511ea..907c46c15f 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,2,0,0 - PRODUCTVERSION 4,2,0,0 + FILEVERSION 4,2,1,0 + PRODUCTVERSION 4,2,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "4.2.0.0" + VALUE "FileVersion", "4.2.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2022" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.2.0.0" + VALUE "ProductVersion", "4.2.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index f0fc106957..0001dad84e 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -60,6 +60,14 @@ std::map BetaLogs() { "- Premium: Set any custom emoji as your profile status.\n" "- Insert or copy custom emoji from pack preview.\n" + }, + { + 4002001, + "- Improve scaling / cropping for photos / video files.\n" + + "- Improve touch support in channel comments.\n" + + "- Nice animation for spoilers.\n" } }; }; diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index c59413b061..2426ecc984 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppName = "Telegram Desktop"_cs; constexpr auto AppFile = "Telegram"_cs; -constexpr auto AppVersion = 4002000; -constexpr auto AppVersionStr = "4.2"; -constexpr auto AppBetaVersion = false; +constexpr auto AppVersion = 4002001; +constexpr auto AppVersionStr = "4.2.1"; +constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 2047bb7e93..f6e27e3891 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 4002000 +AppVersion 4002001 AppVersionStrMajor 4.2 -AppVersionStrSmall 4.2 -AppVersionStr 4.2.0 -BetaChannel 0 +AppVersionStrSmall 4.2.1 +AppVersionStr 4.2.1 +BetaChannel 1 AlphaVersion 0 -AppVersionOriginal 4.2 +AppVersionOriginal 4.2.1.beta diff --git a/changelog.txt b/changelog.txt index 1eee913fb5..c6afbcb8f1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +4.2.1 beta (22.09.22) + +- Improve scaling / cropping for photos / video files. +- Improve touch support in channel comments. +- Nice animation for spoilers. + 4.2 (17.09.22) - A new expandable reaction menu was added in private chats and groups.