RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-02-20 23:27:23 +00:00
Code Issues Projects Releases Wiki Activity

Closed beta 1000018001: calls and payments dummies.

Browse Source
This commit is contained in:
John Preston 2017-03-05 23:14:10 +03:00
parent 31e3c6a2c6
commit 12ca6f3819
7 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/uwp/AppX/AppxManifest.xml
View File

@ -9,7 +9,7 @@
<Identity Name="TelegramDesktop" <Identity Name="TelegramDesktop"
ProcessorArchitecture="x64" ProcessorArchitecture="x64"
Publisher="CN=Telegram Messenger LLP, O=Telegram Messenger LLP, L=London, C=GB" Publisher="CN=Telegram Messenger LLP, O=Telegram Messenger LLP, L=London, C=GB"
Version="1.0.25.0" /> Version="1.0.18.1" />
<Properties> <Properties>
<DisplayName>Telegram Desktop</DisplayName> <DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName> <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

8
Telegram/Resources/winrc/Telegram.rc
View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,25,0 FILEVERSION 1,0,18,1
PRODUCTVERSION 1,0,25,0 PRODUCTVERSION 1,0,18,1
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -52,10 +52,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Desktop" VALUE "FileDescription", "Telegram Desktop"
VALUE "FileVersion", "1.0.25.0" VALUE "FileVersion", "1.0.18.1"
VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "LegalCopyright", "Copyright (C) 2014-2017"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "1.0.25.0" VALUE "ProductVersion", "1.0.18.1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

8
Telegram/Resources/winrc/Updater.rc
View File

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,25,0 FILEVERSION 1,0,18,1
PRODUCTVERSION 1,0,25,0 PRODUCTVERSION 1,0,18,1
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -43,10 +43,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Desktop Updater" VALUE "FileDescription", "Telegram Desktop Updater"
VALUE "FileVersion", "1.0.25.0" VALUE "FileVersion", "1.0.18.1"
VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "LegalCopyright", "Copyright (C) 2014-2017"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "1.0.25.0" VALUE "ProductVersion", "1.0.18.1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

14
Telegram/SourceFiles/core/utils.h
View File

@ -26,6 +26,20 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include <set> #include <set>
#include <gsl/gsl> #include <gsl/gsl>
#ifdef OS_MAC_OLD
namespace gsl {
inline span<char> make_span(QByteArray &container) {
return span<char>(container.begin(), container.end());
}
inline span<const char> make_span(const QByteArray &container) {
return span<const char>(container.begin(), container.end());
}
} // namespace gsl
#endif // OS_MAC_OLD
// Release build assertions. // Release build assertions.
inline void t_noop() { inline void t_noop() {
} }

8
Telegram/SourceFiles/core/version.h
View File

@ -22,9 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "core/utils.h" #include "core/utils.h"
#define BETA_VERSION_MACRO (0ULL) #define BETA_VERSION_MACRO (1000018001ULL)
constexpr int AppVersion = 1000025; constexpr int AppVersion = 1000018;
constexpr str_const AppVersionStr = "1.0.25"; constexpr str_const AppVersionStr = "1.0.18";
constexpr bool AppAlphaVersion = true; constexpr bool AppAlphaVersion = false;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

8
Telegram/SourceFiles/history/history_media_types.cpp
View File

@ -3443,10 +3443,10 @@ HistoryInvoice::HistoryInvoice(HistoryItem *parent, const HistoryInvoice &other)
QString HistoryInvoice::fillAmountAndCurrency(int amount, const QString &currency) { QString HistoryInvoice::fillAmountAndCurrency(int amount, const QString &currency) {
static auto shortCurrencyNames = QMap<QString, QString> { static auto shortCurrencyNames = QMap<QString, QString> {
{ qsl("USD"), qsl("$") }, { qsl("USD"), QString::fromUtf8("\x24") },
{ qsl("GBP"), qsl("£") }, { qsl("GBP"), QString::fromUtf8("\xC2\xA3") },
{ qsl("EUR"), qsl("€") }, { qsl("EUR"), QString::fromUtf8("\xE2\x82\xAC") },
{ qsl("JPY"), qsl("¥") }, { qsl("JPY"), QString::fromUtf8("\xC2\xA5") },
}; };
auto amountBucks = amount / 100; auto amountBucks = amount / 100;
auto amountCents = amount % 100; auto amountCents = amount % 100;

10
Telegram/build/version
View File

@ -1,6 +1,6 @@
AppVersion 1000025 AppVersion 1000018
AppVersionStrMajor 1.0 AppVersionStrMajor 1.0
AppVersionStrSmall 1.0.25 AppVersionStrSmall 1.0.18
AppVersionStr 1.0.25 AppVersionStr 1.0.18
AlphaChannel 1 AlphaChannel 0
BetaVersion 0 BetaVersion 1000018001