RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Closed alpha version 1.4.7.5.

This commit is contained in:
John Preston 2018-11-29 16:33:40 +04:00
parent 393244d44b
commit c2a2f8dabd
6 changed files with 23 additions and 11 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="TelegramMessengerLLP.TelegramDesktop" <Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE" ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A" Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
Version="1.4.7.4" /> Version="1.4.7.5" />
<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,4,7,4 FILEVERSION 1,4,7,5
PRODUCTVERSION 1,4,7,4 PRODUCTVERSION 1,4,7,5
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.4.7.4" VALUE "FileVersion", "1.4.7.5"
VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "1.4.7.4" VALUE "ProductVersion", "1.4.7.5"
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,4,7,4 FILEVERSION 1,4,7,5
PRODUCTVERSION 1,4,7,4 PRODUCTVERSION 1,4,7,5
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.4.7.4" VALUE "FileVersion", "1.4.7.5"
VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "1.4.7.4" VALUE "ProductVersion", "1.4.7.5"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

12
Telegram/SourceFiles/codegen/emoji/generator.cpp
View File

@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QImage> #include <QtGui/QImage>
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtCore/QStandardPaths>
#include <QtCore/QDir> #include <QtCore/QDir>
#ifdef SUPPORT_IMAGE_GENERATION #ifdef SUPPORT_IMAGE_GENERATION
@ -219,6 +220,17 @@ QImage Generator::generateImage(int imageIndex) {
auto sourceSize = kScaleFromLarge ? kLargeEmojiSize : kEmojiSize; auto sourceSize = kScaleFromLarge ? kLargeEmojiSize : kEmojiSize;
const auto fontPath = QStandardPaths::writableLocation(
QStandardPaths::DownloadLocation)
+ "/NotoColorEmoji.ttf";
const auto regularId = QFontDatabase::addApplicationFont(fontPath);
if (regularId < 0) {
return QImage();
}
for (const auto &family : QFontDatabase::applicationFontFamilies(regularId)) {
std::cout << family.toStdString() << std::endl;
};
auto font = QGuiApplication::font(); auto font = QGuiApplication::font();
font.setFamily(QStringLiteral("Apple Color Emoji")); font.setFamily(QStringLiteral("Apple Color Emoji"));
font.setPixelSize(kScaleFromLarge ? kLargeEmojiFontSize : kEmojiFontSize); font.setPixelSize(kScaleFromLarge ? kLargeEmojiFontSize : kEmojiFontSize);

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

@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#define TDESKTOP_REQUESTED_ALPHA_VERSION (1004007004ULL) #define TDESKTOP_REQUESTED_ALPHA_VERSION (1004007005ULL)
#ifdef TDESKTOP_OFFICIAL_TARGET #ifdef TDESKTOP_OFFICIAL_TARGET
#define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION

2
Telegram/build/version
View File

@ -3,4 +3,4 @@ AppVersionStrMajor 1.4
AppVersionStrSmall 1.4.7 AppVersionStrSmall 1.4.7
AppVersionStr 1.4.7 AppVersionStr 1.4.7
BetaChannel 0 BetaChannel 0
AlphaVersion 1004007004 AlphaVersion 1004007005