Closed beta 1000035002: Sounds in separate qrc.

This commit is contained in:
John Preston 2017-05-05 13:29:02 +03:00
parent ded6933867
commit 771bba4e01
7 changed files with 22 additions and 11 deletions

View file

@ -0,0 +1,10 @@
<RCC>
<qresource prefix="/sounds">
<file alias="msg_incoming.mp3">../sounds/msg_incoming.mp3</file>
<file alias="call_busy.mp3">../sounds/call_busy.mp3</file>
<file alias="call_connect.mp3">../sounds/call_connect.mp3</file>
<file alias="call_end.mp3">../sounds/call_end.mp3</file>
<file alias="call_incoming.mp3">../sounds/call_incoming.mp3</file>
<file alias="call_outgoing.mp3">../sounds/call_outgoing.mp3</file>
</qresource>
</RCC>

View file

@ -9,7 +9,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
Version="1.0.35.1" />
Version="1.0.35.2" />
<Properties>
<DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

View file

@ -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"

View file

@ -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"

View file

@ -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";

View file

@ -3,4 +3,4 @@ AppVersionStrMajor 1.0
AppVersionStrSmall 1.0.35
AppVersionStr 1.0.35
AlphaChannel 0
BetaVersion 1000035001
BetaVersion 1000035002

View file

@ -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': [