From 7021156732875f040f38ea3bf7dec5455363e4ad Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 3 Jul 2015 19:19:46 +0300 Subject: [PATCH] version 0.8.38 stable with media playback and force_reply in conversations with bots --- Telegram/PrepareWin.bat | 10 +++++----- Telegram/Resources/style.txt | 2 ++ Telegram/SourceFiles/application.cpp | 2 +- Telegram/SourceFiles/config.h | 6 +++--- Telegram/SourceFiles/gui/text.cpp | 9 ++++++--- Telegram/SourceFiles/historywidget.cpp | 10 +++++++--- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5540 -> 5540 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version.sh | 2 +- 10 files changed, 32 insertions(+), 23 deletions(-) diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index d564a9e30..7e4e156f6 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,11 +1,11 @@ @echo OFF set "AppVersionStrMajor=0.8" -set "AppVersion=8037" -set "AppVersionStrSmall=0.8.37" -set "AppVersionStr=0.8.37" -set "AppVersionStrFull=0.8.37.0" -set "DevChannel=1" +set "AppVersion=8038" +set "AppVersionStrSmall=0.8.38" +set "AppVersionStr=0.8.38" +set "AppVersionStrFull=0.8.38.0" +set "DevChannel=0" if %DevChannel% neq 0 goto preparedev diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt index 0134de570..ef0d68e5b 100644 --- a/Telegram/Resources/style.txt +++ b/Telegram/Resources/style.txt @@ -868,6 +868,8 @@ defaultTextStyle: textStyle { lineHeight: 0px; } serviceTextStyle: textStyle(defaultTextStyle) { + lnkFlags: msgServiceFont; + lnkOverFlags: font(fsize semibold underline); lnkColor: msgServiceColor; lnkDownColor: msgServiceColor; selectBg: msgServiceSelectBg; diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index dbc8dce11..41f744844 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -642,7 +642,7 @@ void Application::checkMapVersion() { QString versionFeatures; if (DevChannel && Local::oldMapVersion() < 8037) { versionFeatures = lang(lng_new_version_text);// QString::fromUtf8("\xe2\x80\x94 Forward photos, media and stickers with drag-n-drop\n\xe2\x80\x94 Drag-n-drop text messages by timestamp to forward them\n\xe2\x80\x94 Larger stickers panel");// .replace('@', qsl("@") + QChar(0x200D)); - } else if (!DevChannel && Local::oldMapVersion() < 8036) { + } else if (!DevChannel && Local::oldMapVersion() < 8038) { versionFeatures = lang(lng_new_version_text).trimmed(); } if (!versionFeatures.isEmpty()) { diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 67ba6a796..724f702b8 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,9 +17,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 8037; -static const wchar_t *AppVersionStr = L"0.8.37"; -static const bool DevChannel = true; +static const int32 AppVersion = 8038; +static const wchar_t *AppVersionStr = L"0.8.38"; +static const bool DevChannel = false; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; diff --git a/Telegram/SourceFiles/gui/text.cpp b/Telegram/SourceFiles/gui/text.cpp index a6bc95da8..5e7d50bdc 100644 --- a/Telegram/SourceFiles/gui/text.cpp +++ b/Telegram/SourceFiles/gui/text.cpp @@ -1625,16 +1625,19 @@ public: void eSetFont(ITextBlock *block) { style::font newFont = _t->_font; int flags = block->flags(); + if (flags) { + newFont = applyFlags(flags, _t->_font); + } if (block->lnkIndex()) { const TextLinkPtr &l(_t->_links.at(block->lnkIndex() - 1)); if (l == _overLnk) { if (l == _downLnk || !_downLnk) { - newFont = _textStyle->lnkOverFlags; + if (_t->_font != _textStyle->lnkOverFlags) newFont = _textStyle->lnkOverFlags; } else { - newFont = _textStyle->lnkFlags; + if (_t->_font != _textStyle->lnkFlags) newFont = _textStyle->lnkFlags; } } else { - newFont = _textStyle->lnkFlags; + if (_t->_font != _textStyle->lnkFlags) newFont = _textStyle->lnkFlags; } } if (newFont != _f) { diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 3b5da16f0..349054189 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -3954,7 +3954,7 @@ void HistoryWidget::onKbToggle(bool manual) { _field.setMaxHeight(st::maxFieldHeight); - _kbReplyTo = App::histItemById(_keyboard.forMsgId()); + _kbReplyTo = (hist->peer->chat || _keyboard.forceReply()) ? App::histItemById(_keyboard.forMsgId()) : 0; if (_kbReplyTo && !_replyToId) { updateReplyToName(); _replyToText.setText(st::msgFont, _kbReplyTo->inDialogsText(), _textDlgOptions); @@ -3970,7 +3970,7 @@ void HistoryWidget::onKbToggle(bool manual) { int32 maxh = qMin(_keyboard.height(), int(st::maxFieldHeight) - (int(st::maxFieldHeight) / 2)); _field.setMaxHeight(st::maxFieldHeight - maxh); - _kbReplyTo = hist->peer->chat ? App::histItemById(_keyboard.forMsgId()) : 0; + _kbReplyTo = (hist->peer->chat || _keyboard.forceReply()) ? App::histItemById(_keyboard.forMsgId()) : 0; if (_kbReplyTo && !_replyToId) { updateReplyToName(); _replyToText.setText(st::msgFont, _kbReplyTo->inDialogsText(), _textDlgOptions); @@ -4559,6 +4559,10 @@ void HistoryWidget::itemRemoved(HistoryItem *item) { if (item == _replyReturn) { calcNextReplyReturn(); } + if (_kbReplyTo && item == _kbReplyTo) { + onKbToggle(); + _kbReplyTo = 0; + } } void HistoryWidget::itemReplaced(HistoryItem *oldItem, HistoryItem *newItem) { @@ -4727,7 +4731,7 @@ void HistoryWidget::updateBotKeyboard() { int32 maxh = hasMarkup ? qMin(_keyboard.height(), int(st::maxFieldHeight) - (int(st::maxFieldHeight) / 2)) : 0; _field.setMaxHeight(st::maxFieldHeight - maxh); _kbShown = hasMarkup; - _kbReplyTo = hist->peer->chat ? App::histItemById(_keyboard.forMsgId()) : 0; + _kbReplyTo = (hist->peer->chat || _keyboard.forceReply()) ? App::histItemById(_keyboard.forMsgId()) : 0; if (_kbReplyTo && !_replyToId) { updateReplyToName(); _replyToText.setText(st::msgFont, _kbReplyTo->inDialogsText(), _textDlgOptions); diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 6f62cceb8..f3626d369 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.8.37 + 0.8.38 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) CFBundleSignature diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index b14c336783e32d9e20a24ef1a8677ceb1a8bd08f..2f08b76ab0028b72e2cb37615d1bb6888d133a06 100644 GIT binary patch delta 53 zcmZ3Yy+nIM5ig^~ delta 53 zcmZ3Yy+nIM5ig_p6O diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 648a68764..b5f012972 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1701,7 +1701,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.8.37; + CURRENT_PROJECT_VERSION = 0.8.38; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1719,7 +1719,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.8.37; + CURRENT_PROJECT_VERSION = 0.8.38; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1745,10 +1745,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.8.37; + CURRENT_PROJECT_VERSION = 0.8.38; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 0.8; - DYLIB_CURRENT_VERSION = 0.8.37; + DYLIB_CURRENT_VERSION = 0.8.38; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1888,10 +1888,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.8.37; + CURRENT_PROJECT_VERSION = 0.8.38; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.8; - DYLIB_CURRENT_VERSION = 0.8.37; + DYLIB_CURRENT_VERSION = 0.8.38; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; diff --git a/Telegram/Version.sh b/Telegram/Version.sh index e759b7ad0..6058fe1f6 100755 --- a/Telegram/Version.sh +++ b/Telegram/Version.sh @@ -1,2 +1,2 @@ -echo 0.8 8037 0.8.37 1 +echo 0.8 8038 0.8.38 0 # AppVersionStrMajor AppVersion AppVersionStr DevChannel