From b1d52e088eaaccc2e9d4b2f18fe3548751253f6d Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 10 Sep 2021 13:14:43 +0300 Subject: [PATCH] Beta version 3.0.2. - Check who've seen your message in small groups from the context menu. - Enable recording with video in live streams and video chats. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 +-- Telegram/Resources/winrc/Updater.rc | 8 +-- Telegram/SourceFiles/core/changelogs.cpp | 74 ++------------------ Telegram/SourceFiles/core/version.h | 8 +-- Telegram/ThirdParty/tgcalls | 2 +- Telegram/build/set_version.py | 4 +- Telegram/build/version | 12 ++-- changelog.txt | 5 ++ 9 files changed, 34 insertions(+), 89 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index b997a6bbb9..014d0f14d3 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="3.0.2.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 9b47b0a241..04086e4df2 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 3,0,1,1 - PRODUCTVERSION 3,0,1,1 + FILEVERSION 3,0,2,0 + PRODUCTVERSION 3,0,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "3.0.1.1" + VALUE "FileVersion", "3.0.2.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "3.0.1.1" + VALUE "ProductVersion", "3.0.2.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 356528e828..60b9d8e839 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 3,0,1,1 - PRODUCTVERSION 3,0,1,1 + FILEVERSION 3,0,2,0 + PRODUCTVERSION 3,0,2,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", "3.0.1.1" + VALUE "FileVersion", "3.0.2.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "3.0.1.1" + VALUE "ProductVersion", "3.0.2.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index 1dbe2f3d4c..8f293aa326 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -21,73 +21,6 @@ namespace { std::map BetaLogs() { return { - { - 2007005, - "- Add \"Voice chats\" filter in \"Recent actions\" for channels.\n" - - "- Write local drafts to disk on a background thread.\n" - - "- Support autoupdate for Telegram in write-protected folders on Linux.\n" - - "- Fix crash in native notifications on Linux.\n" - - "- Fix crash in file dialog on Linux.\n" - }, - { - 2007007, - "- Optimized video playback in media viewer and Picture-in-Picture mode.\n" - - "- Added integration with System Media Transport Controls on Windows 10.\n" - - "- Added \"Now Playing\" integration for music playback on macOS.\n" - - "- Added \"Archive Sticker\" into the \"...\" menu of the Sticker Set Box.\n" - - "- Fixed memory not being freed on Linux.\n" - - "- Several crash fixes.\n" - }, - { - 2007009, - "- Added \"Enable noise suppression\" option to group calls Settings.\n" - - "- Fix media viewer with Retina + Non-Retina dual monitor setup on macOS.\n" - - "- Several bug and crash fixes.\n" - }, - { - 2007010, - "- Added ability to mix together bold, italic and other formatting.\n" - - "- Fix voice chats and video calls OpenGL with some drivers on Windows.\n" - - "- Several bug fixes.\n" - }, - { - 2008006, - "- Added a simple image editor. " - "Crop photos or highlight parts of screenshots before sending.\n" - - "- Use Direct3D 9 backend in ANGLE by default (Windows).\n" - - "- Fix \"Show in Finder\" not focusing the Finder window (macOS).\n" - - "- Use GTK from a child process (Linux).\n" - }, - { - 2008012, - "- Change the default chat background.\n" - - "- Add GIFs overview section in chats.\n" - - "- Add a simple new messages animation.\n" - - "- Use modern Telegram application icon.\n" - - "- Use Direct3D 11 by default on Windows.\n" - - "- Fix Direct3D acceleration on basic Windows 7 setup.\n" - }, { 2009004, "- Choose one from dozens of new gorgeous animated backgrounds" @@ -108,6 +41,13 @@ std::map BetaLogs() { 2009013, "- See unread comments count when scrolling discussions in channels." }, + { + 3000002, + "- Check who've seen your message in small groups " + "from the context menu.\n" + + "- Enable recording with video in live streams and video chats." + } }; }; diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 7a38603e8b..aeceb6dcf5 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/const_string.h" -#define TDESKTOP_REQUESTED_ALPHA_VERSION (3000001001ULL) +#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL) #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION @@ -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 = 3000001; -constexpr auto AppVersionStr = "3.0.1"; -constexpr auto AppBetaVersion = false; +constexpr auto AppVersion = 3000002; +constexpr auto AppVersionStr = "3.0.2"; +constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls index c64036b69e..f76a9290fa 160000 --- a/Telegram/ThirdParty/tgcalls +++ b/Telegram/ThirdParty/tgcalls @@ -1 +1 @@ -Subproject commit c64036b69e2f7d3bb909175d872e01d9462f7f8d +Subproject commit f76a9290fa502a8df473dd872aedf9a553b089cc diff --git a/Telegram/build/set_version.py b/Telegram/build/set_version.py index ec503b8bca..9fb7e7f342 100644 --- a/Telegram/build/set_version.py +++ b/Telegram/build/set_version.py @@ -34,7 +34,7 @@ for arg in sys.argv: versionMajor = match.group(1) versionMinor = match.group(2) versionPatch = match.group(4) if match.group(4) else '0' - if match.group(5) > 0: + if len(match.group(5)) > 0: if match.group(6) == 'beta': versionBeta = True else: @@ -76,7 +76,7 @@ def checkChangelog(): global scriptPath, versionStr, versionStrSmall count = 0 - with open(scriptPath + '/../../changelog.txt', 'r') as f: + with open(scriptPath + '/../../changelog.txt', encoding='utf-8') as f: for line in f: if line.startswith(versionStr + ' ') or line.startswith(versionStrSmall + ' '): count = count + 1 diff --git a/Telegram/build/version b/Telegram/build/version index 9482589b74..58fa7e2a23 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 3000001 +AppVersion 3000002 AppVersionStrMajor 3.0 -AppVersionStrSmall 3.0.1 -AppVersionStr 3.0.1 -BetaChannel 0 -AlphaVersion 3000001001 -AppVersionOriginal 3.0.1.1 +AppVersionStrSmall 3.0.2 +AppVersionStr 3.0.2 +BetaChannel 1 +AlphaVersion 0 +AppVersionOriginal 3.0.2.beta diff --git a/changelog.txt b/changelog.txt index e55ae5002b..32d21208bd 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +3.0.2 beta (10.09.21) + +- Check who've seen your message in small groups from the context menu. +- Enable recording with video in live streams and video chats. + 3.0.1 (01.09.21) - Crash fixes.