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

version 0.8.38 stable with media playback and force_reply in conversations with bots

This commit is contained in:
John Preston 2015-07-03 19:19:46 +03:00
parent 4f2ff9e343
commit 7021156732
10 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/PrepareWin.bat
View File

@ -1,11 +1,11 @@
@echo OFF @echo OFF
set "AppVersionStrMajor=0.8" set "AppVersionStrMajor=0.8"
set "AppVersion=8037" set "AppVersion=8038"
set "AppVersionStrSmall=0.8.37" set "AppVersionStrSmall=0.8.38"
set "AppVersionStr=0.8.37" set "AppVersionStr=0.8.38"
set "AppVersionStrFull=0.8.37.0" set "AppVersionStrFull=0.8.38.0"
set "DevChannel=1" set "DevChannel=0"
if %DevChannel% neq 0 goto preparedev if %DevChannel% neq 0 goto preparedev

2
Telegram/Resources/style.txt
View File

@ -868,6 +868,8 @@ defaultTextStyle: textStyle {
lineHeight: 0px; lineHeight: 0px;
} }
serviceTextStyle: textStyle(defaultTextStyle) { serviceTextStyle: textStyle(defaultTextStyle) {
lnkFlags: msgServiceFont;
lnkOverFlags: font(fsize semibold underline);
lnkColor: msgServiceColor; lnkColor: msgServiceColor;
lnkDownColor: msgServiceColor; lnkDownColor: msgServiceColor;
selectBg: msgServiceSelectBg; selectBg: msgServiceSelectBg;

2
Telegram/SourceFiles/application.cpp
View File

@ -642,7 +642,7 @@ void Application::checkMapVersion() {
QString versionFeatures; QString versionFeatures;
if (DevChannel && Local::oldMapVersion() < 8037) { 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)); 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(); versionFeatures = lang(lng_new_version_text).trimmed();
} }
if (!versionFeatures.isEmpty()) { if (!versionFeatures.isEmpty()) {

6
Telegram/SourceFiles/config.h
View File

@ -17,9 +17,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
*/ */
#pragma once #pragma once
static const int32 AppVersion = 8037; static const int32 AppVersion = 8038;
static const wchar_t *AppVersionStr = L"0.8.37"; static const wchar_t *AppVersionStr = L"0.8.38";
static const bool DevChannel = true; static const bool DevChannel = false;
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
static const wchar_t *AppName = L"Telegram Desktop"; static const wchar_t *AppName = L"Telegram Desktop";

9
Telegram/SourceFiles/gui/text.cpp
View File

@ -1625,16 +1625,19 @@ public:
void eSetFont(ITextBlock *block) { void eSetFont(ITextBlock *block) {
style::font newFont = _t->_font; style::font newFont = _t->_font;
int flags = block->flags(); int flags = block->flags();
if (flags) {
newFont = applyFlags(flags, _t->_font);
}
if (block->lnkIndex()) { if (block->lnkIndex()) {
const TextLinkPtr &l(_t->_links.at(block->lnkIndex() - 1)); const TextLinkPtr &l(_t->_links.at(block->lnkIndex() - 1));
if (l == _overLnk) { if (l == _overLnk) {
if (l == _downLnk || !_downLnk) { if (l == _downLnk || !_downLnk) {
newFont = _textStyle->lnkOverFlags; if (_t->_font != _textStyle->lnkOverFlags) newFont = _textStyle->lnkOverFlags;
} else { } else {
newFont = _textStyle->lnkFlags; if (_t->_font != _textStyle->lnkFlags) newFont = _textStyle->lnkFlags;
} }
} else { } else {
newFont = _textStyle->lnkFlags; if (_t->_font != _textStyle->lnkFlags) newFont = _textStyle->lnkFlags;
} }
} }
if (newFont != _f) { if (newFont != _f) {

10
Telegram/SourceFiles/historywidget.cpp
View File

@ -3954,7 +3954,7 @@ void HistoryWidget::onKbToggle(bool manual) {
_field.setMaxHeight(st::maxFieldHeight); _field.setMaxHeight(st::maxFieldHeight);
_kbReplyTo = App::histItemById(_keyboard.forMsgId()); _kbReplyTo = (hist->peer->chat || _keyboard.forceReply()) ? App::histItemById(_keyboard.forMsgId()) : 0;
if (_kbReplyTo && !_replyToId) { if (_kbReplyTo && !_replyToId) {
updateReplyToName(); updateReplyToName();
_replyToText.setText(st::msgFont, _kbReplyTo->inDialogsText(), _textDlgOptions); _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)); int32 maxh = qMin(_keyboard.height(), int(st::maxFieldHeight) - (int(st::maxFieldHeight) / 2));
_field.setMaxHeight(st::maxFieldHeight - maxh); _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) { if (_kbReplyTo && !_replyToId) {
updateReplyToName(); updateReplyToName();
_replyToText.setText(st::msgFont, _kbReplyTo->inDialogsText(), _textDlgOptions); _replyToText.setText(st::msgFont, _kbReplyTo->inDialogsText(), _textDlgOptions);
@ -4559,6 +4559,10 @@ void HistoryWidget::itemRemoved(HistoryItem *item) {
if (item == _replyReturn) { if (item == _replyReturn) {
calcNextReplyReturn(); calcNextReplyReturn();
} }
if (_kbReplyTo && item == _kbReplyTo) {
onKbToggle();
_kbReplyTo = 0;
}
} }
void HistoryWidget::itemReplaced(HistoryItem *oldItem, HistoryItem *newItem) { 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; int32 maxh = hasMarkup ? qMin(_keyboard.height(), int(st::maxFieldHeight) - (int(st::maxFieldHeight) / 2)) : 0;
_field.setMaxHeight(st::maxFieldHeight - maxh); _field.setMaxHeight(st::maxFieldHeight - maxh);
_kbShown = hasMarkup; _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) { if (_kbReplyTo && !_replyToId) {
updateReplyToName(); updateReplyToName();
_replyToText.setText(st::msgFont, _kbReplyTo->inDialogsText(), _textDlgOptions); _replyToText.setText(st::msgFont, _kbReplyTo->inDialogsText(), _textDlgOptions);

2
Telegram/Telegram.plist
View File

@ -11,7 +11,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.8.37</string> <string>0.8.38</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string> <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>

BIN
Telegram/Telegram.rc
View File

Binary file not shown.

12
Telegram/Telegram.xcodeproj/project.pbxproj
View File

@ -1701,7 +1701,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.8.37; CURRENT_PROJECT_VERSION = 0.8.38;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
@ -1719,7 +1719,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.8.37; CURRENT_PROJECT_VERSION = 0.8.38;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast; GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@ -1745,10 +1745,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.8.37; CURRENT_PROJECT_VERSION = 0.8.38;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.8; DYLIB_COMPATIBILITY_VERSION = 0.8;
DYLIB_CURRENT_VERSION = 0.8.37; DYLIB_CURRENT_VERSION = 0.8.38;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@ -1888,10 +1888,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.8.37; CURRENT_PROJECT_VERSION = 0.8.38;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.8; DYLIB_COMPATIBILITY_VERSION = 0.8;
DYLIB_CURRENT_VERSION = 0.8.37; DYLIB_CURRENT_VERSION = 0.8.38;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

2
Telegram/Version.sh
View File

@ -1,2 +1,2 @@
echo 0.8 8037 0.8.37 1 echo 0.8 8038 0.8.38 0
# AppVersionStrMajor AppVersion AppVersionStr DevChannel # AppVersionStrMajor AppVersion AppVersionStr DevChannel