procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Alpha 1.0.38: Fix webpage layout. 

Webpage layout is broken if title contains a newline.
Remove all newline characters from webpage / game / invoice title.
This commit is contained in:
John Preston 2017-05-13 17:27:34 +03:00
parent 9da9775043
commit 0496a52cdd
8 changed files with 25 additions and 18 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.0.37.0" /> Version="1.0.38.0" />
<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,37,0 FILEVERSION 1,0,38,0
PRODUCTVERSION 1,0,37,0 PRODUCTVERSION 1,0,38,0
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.37.0" VALUE "FileVersion", "1.0.38.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "LegalCopyright", "Copyright (C) 2014-2017"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "1.0.37.0" VALUE "ProductVersion", "1.0.38.0"
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,37,0 FILEVERSION 1,0,38,0
PRODUCTVERSION 1,0,37,0 PRODUCTVERSION 1,0,38,0
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.37.0" VALUE "FileVersion", "1.0.38.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "LegalCopyright", "Copyright (C) 2014-2017"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "1.0.37.0" VALUE "ProductVersion", "1.0.38.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

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

@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#define BETA_VERSION_MACRO (0ULL) #define BETA_VERSION_MACRO (0ULL)
constexpr int AppVersion = 1000037; constexpr int AppVersion = 1000038;
constexpr str_const AppVersionStr = "1.0.37"; constexpr str_const AppVersionStr = "1.0.38";
constexpr bool AppAlphaVersion = true; constexpr bool AppAlphaVersion = true;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

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

@ -2973,7 +2973,7 @@ void HistoryWebPage::initDimensions() {
} }
// init layout // init layout
QString title(_data->title.isEmpty() ? _data->author : _data->title); auto title = textOneLine(_data->title.isEmpty() ? _data->author : _data->title);
if (!_data->description.isEmpty() && title.isEmpty() && _data->siteName.isEmpty() && !_data->url.isEmpty()) { if (!_data->description.isEmpty() && title.isEmpty() && _data->siteName.isEmpty() && !_data->url.isEmpty()) {
_data->siteName = siteNameFromUrl(_data->url); _data->siteName = siteNameFromUrl(_data->url);
} }
@ -3489,7 +3489,7 @@ void HistoryGame::initDimensions() {
_openl = MakeShared<ReplyMarkupClickHandler>(_parent, 0, 0); _openl = MakeShared<ReplyMarkupClickHandler>(_parent, 0, 0);
} }
auto title = _data->title; auto title = textOneLine(_data->title);
// init attach // init attach
if (!_attach) { if (!_attach) {
@ -3932,7 +3932,7 @@ void HistoryInvoice::fillFromData(const MTPDmessageMediaInvoice &data) {
if (!description.isEmpty()) { if (!description.isEmpty()) {
_description.setText(st::webPageDescriptionStyle, description, _webpageDescriptionOptions); _description.setText(st::webPageDescriptionStyle, description, _webpageDescriptionOptions);
} }
auto title = qs(data.vtitle); auto title = textOneLine(qs(data.vtitle));
if (!title.isEmpty()) { if (!title.isEmpty()) {
_title.setText(st::webPageTitleStyle, title, _webpageTitleOptions); _title.setText(st::webPageTitleStyle, title, _webpageTitleOptions);
} }

2
Telegram/ThirdParty/libtgvoip vendored

@ -1 +1 @@
Subproject commit d09c2ebe3576dcf4df490e27c5330bf4c8a9a296 Subproject commit 6dcf281d2477c8f2a22378e0d8c1c93f2428390b

6
Telegram/build/version
View File

@ -1,6 +1,6 @@
AppVersion 1000037 AppVersion 1000038
AppVersionStrMajor 1.0 AppVersionStrMajor 1.0
AppVersionStrSmall 1.0.37 AppVersionStrSmall 1.0.38
AppVersionStr 1.0.37 AppVersionStr 1.0.38
AlphaChannel 1 AlphaChannel 1
BetaVersion 0 BetaVersion 0

7
changelog.txt
View File

@ -1,3 +1,10 @@
1.0.38 alpha (13.05.17)
- Fix crashes in Windows XP.
- Fix calls in Linux without SSE4.1 support.
- PulseAudio support in calls.
- Bug fixes and other minor improvements.
1.0.37 alpha (10.05.17) 1.0.37 alpha (10.05.17)
- Multiple crash fixes. - Multiple crash fixes.