From fb2a26fb35d63dfa36473b1793e2f3198b5800b9 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 27 Feb 2017 13:44:14 +0300 Subject: [PATCH] Alpha 1.0.15: various improvements. Wrong supergroup members display fix, RTL text layout fix. Linux GTK file chooser image preview added. Fix #3053 #2968 --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 8 ++++---- Telegram/SourceFiles/messenger.cpp | 4 ++-- Telegram/build/version | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 01aaa336f..c4150dfc9 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.0.15.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 64bc47dff..0c645f186 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,14,1 - PRODUCTVERSION 1,0,14,1 + FILEVERSION 1,0,15,0 + PRODUCTVERSION 1,0,15,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.14.1" + VALUE "FileVersion", "1.0.15.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.14.1" + VALUE "ProductVersion", "1.0.15.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index f7a4e0909..2d14505ca 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,14,1 - PRODUCTVERSION 1,0,14,1 + FILEVERSION 1,0,15,0 + PRODUCTVERSION 1,0,15,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.14.1" + VALUE "FileVersion", "1.0.15.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.14.1" + VALUE "ProductVersion", "1.0.15.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index f510b6c28..11711a4f0 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,9 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/utils.h" -#define BETA_VERSION_MACRO (1000014001ULL) +#define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 1000014; -constexpr str_const AppVersionStr = "1.0.14"; -constexpr bool AppAlphaVersion = false; +constexpr int AppVersion = 1000015; +constexpr str_const AppVersionStr = "1.0.15"; +constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp index 6cfa5f454..59a1faf09 100644 --- a/Telegram/SourceFiles/messenger.cpp +++ b/Telegram/SourceFiles/messenger.cpp @@ -646,8 +646,8 @@ void Messenger::checkMapVersion() { if (Local::oldMapVersion() < AppVersion) { if (Local::oldMapVersion()) { QString versionFeatures; - if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 1000010) { - versionFeatures = QString::fromUtf8("\xe2\x80\x94 Support for more emoji.\n\xe2\x80\x94 Bug fixes and other minor improvements."); + if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 1000015) { + versionFeatures = QString::fromUtf8("\xe2\x80\x94 Wrong supergroup members display fix.\n\xe2\x80\x94 RTL text layout fix.\n\xe2\x80\x94 Linux GTK file choose dialog should show image previews.\n\xe2\x80\x94 Bug fixes and other minor improvements."); } else if (!(cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 1000012) { versionFeatures = langNewVersionText(); } else { diff --git a/Telegram/build/version b/Telegram/build/version index 780f8d6bc..f9d8ea2b3 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1000014 +AppVersion 1000015 AppVersionStrMajor 1.0 -AppVersionStrSmall 1.0.14 -AppVersionStr 1.0.14 -AlphaChannel 0 -BetaVersion 1000014001 +AppVersionStrSmall 1.0.15 +AppVersionStr 1.0.15 +AlphaChannel 1 +BetaVersion 0