From 771bba4e01f64822231773a185ed327fc688dd0d Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 5 May 2017 13:29:02 +0300 Subject: [PATCH] Closed beta 1000035002: Sounds in separate qrc. --- Telegram/Resources/qrc/telegram_sounds.qrc | 10 ++++++++++ Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 2 +- Telegram/build/version | 2 +- Telegram/gyp/telegram_qrc.gypi | 1 + 7 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 Telegram/Resources/qrc/telegram_sounds.qrc diff --git a/Telegram/Resources/qrc/telegram_sounds.qrc b/Telegram/Resources/qrc/telegram_sounds.qrc new file mode 100644 index 000000000..594f558fc --- /dev/null +++ b/Telegram/Resources/qrc/telegram_sounds.qrc @@ -0,0 +1,10 @@ + + + ../sounds/msg_incoming.mp3 + ../sounds/call_busy.mp3 + ../sounds/call_connect.mp3 + ../sounds/call_end.mp3 + ../sounds/call_incoming.mp3 + ../sounds/call_outgoing.mp3 + + diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index f00fed419..4b52c9042 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.0.35.2" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 7aed434c2..180958745 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,35,1 - PRODUCTVERSION 1,0,35,1 + FILEVERSION 1,0,35,2 + PRODUCTVERSION 1,0,35,2 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.35.1" + VALUE "FileVersion", "1.0.35.2" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.35.1" + VALUE "ProductVersion", "1.0.35.2" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 25290f69d..b2d299387 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,35,1 - PRODUCTVERSION 1,0,35,1 + FILEVERSION 1,0,35,2 + PRODUCTVERSION 1,0,35,2 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.35.1" + VALUE "FileVersion", "1.0.35.2" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.0.35.1" + VALUE "ProductVersion", "1.0.35.2" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 280c1d743..5a76a4528 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/utils.h" -#define BETA_VERSION_MACRO (1000035001ULL) +#define BETA_VERSION_MACRO (1000035002ULL) constexpr int AppVersion = 1000035; constexpr str_const AppVersionStr = "1.0.35"; diff --git a/Telegram/build/version b/Telegram/build/version index 54ff4bfc8..009878ffe 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,4 +3,4 @@ AppVersionStrMajor 1.0 AppVersionStrSmall 1.0.35 AppVersionStr 1.0.35 AlphaChannel 0 -BetaVersion 1000035001 +BetaVersion 1000035002 diff --git a/Telegram/gyp/telegram_qrc.gypi b/Telegram/gyp/telegram_qrc.gypi index 7ad44018b..4bf403308 100644 --- a/Telegram/gyp/telegram_qrc.gypi +++ b/Telegram/gyp/telegram_qrc.gypi @@ -23,6 +23,7 @@ '<(res_loc)/qrc/telegram.qrc', '<(res_loc)/qrc/telegram_emoji.qrc', '<(res_loc)/qrc/telegram_emoji_large.qrc', + '<(res_loc)/qrc/telegram_sounds.qrc', ], }, 'conditions': [