From b736d45bc484e456d10ca114581182f503dec1b6 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 11 Apr 2017 18:02:46 +0300 Subject: [PATCH] Alpha 1.0.30: New tabbed panel as a third column. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 6 +++--- Telegram/SourceFiles/messenger.cpp | 4 ++-- Telegram/build/version | 8 ++++---- changelog.txt | 5 +++++ 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index f9e42811d..268de6f02 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.0.30.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index e071add75..0b00112eb 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,29,0 - PRODUCTVERSION 1,0,29,0 + FILEVERSION 1,0,30,0 + PRODUCTVERSION 1,0,30,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -52,10 +52,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.0.29.0" + VALUE "FileVersion", "1.0.30.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.29.0" + VALUE "ProductVersion", "1.0.30.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index de065c345..e8d92a4c9 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,29,0 - PRODUCTVERSION 1,0,29,0 + FILEVERSION 1,0,30,0 + PRODUCTVERSION 1,0,30,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.0.29.0" + VALUE "FileVersion", "1.0.30.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.29.0" + VALUE "ProductVersion", "1.0.30.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 78e5b977c..96d753543 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 1000029; -constexpr str_const AppVersionStr = "1.0.29"; -constexpr bool AppAlphaVersion = false; +constexpr int AppVersion = 1000030; +constexpr str_const AppVersionStr = "1.0.30"; +constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp index 5a9cb9f9c..4db76ed15 100644 --- a/Telegram/SourceFiles/messenger.cpp +++ b/Telegram/SourceFiles/messenger.cpp @@ -712,8 +712,8 @@ void Messenger::checkMapVersion() { if (Local::oldMapVersion() < AppVersion) { if (Local::oldMapVersion()) { QString versionFeatures; - if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 1000028) { - versionFeatures = QString::fromUtf8("\xE2\x80\x94 Better Emoji & Stickers & Saved GIFs panel.\n\xE2\x80\x94 Bug fixes and other minor improvements."); + if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 1000030) { + versionFeatures = QString::fromUtf8("\xE2\x80\x94 The new Emoji, Stickers, and Saved GIFs panel becomes a separate space on the right when Telegram is running in a wide enough window.\n\xE2\x80\x94 Manage blocked users list in your supergroups."); } else if (!(cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 1000029) { versionFeatures = langNewVersionText(); } else { diff --git a/Telegram/build/version b/Telegram/build/version index c8c1a4f5a..3d2f9c3e0 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1000029 +AppVersion 1000030 AppVersionStrMajor 1.0 -AppVersionStrSmall 1.0.29 -AppVersionStr 1.0.29 -AlphaChannel 0 +AppVersionStrSmall 1.0.30 +AppVersionStr 1.0.30 +AlphaChannel 1 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index 9a02503f2..61ce567e1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +1.0.30 alpha (11.04.17) + +- The new Emoji, Stickers, and Saved GIFs panel becomes a separate space on the right when Telegram is running in a wide enough window. +- Manage blocked users list in your supergroups. + 1.0.29 (05.04.17) - Improved Emoji, Stickers, and Saved GIFs panel.