From 49b3469963e385bd56f7b409f24f8b29df62c1be Mon Sep 17 00:00:00 2001 From: leha-bot Date: Sat, 21 Apr 2018 14:17:52 +0300 Subject: [PATCH] Add option for typographic message formatting This option allows to turn off the old behaviour with replacing char sequences like <<, >>, -- to chars represented by HTML escape characters "«", "»", "—". Based on upstream pull https://github.com/telegramdesktop/tdesktop/pull/4553 and commit https://github.com/PeterMX/tdesktop/commit/fe118833ae699c4b28054432710fde2a859219ba from @PeterMX Closes #132 --- Telegram/Resources/langs/lang.strings | 1 + Telegram/SourceFiles/settings.cpp | 1 + Telegram/SourceFiles/settings.h | 1 + .../settings/settings_chat_settings_widget.cpp | 6 ++++++ .../settings/settings_chat_settings_widget.h | 2 ++ Telegram/SourceFiles/storage/localstorage.cpp | 10 ++++++++++ Telegram/SourceFiles/ui/text/text_entity.cpp | 8 +++++--- 7 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index dd9d1c854..3df7c29c8 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -313,6 +313,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org "lng_settings_section_chat_settings" = "Chat Settings"; "lng_settings_replace_emojis" = "Replace emoji"; +"lng_settings_message_formatting" = "Enable typographic replacements (<< into «, -- into –, etc.)"; "lng_settings_view_emojis" = "View list"; "lng_settings_send_enter" = "Send by Enter"; "lng_settings_send_ctrlenter" = "Send by Ctrl+Enter"; diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp index 8cd407d1b..1515f128e 100644 --- a/Telegram/SourceFiles/settings.cpp +++ b/Telegram/SourceFiles/settings.cpp @@ -58,6 +58,7 @@ qint32 gLastUpdateCheck = 0; bool gNoStartUpdate = false; bool gStartToSettings = false; bool gReplaceEmojis = true; +bool gMessageFormatting = true; bool gCtrlEnter = false; diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h index 6702d67be..056ec1d70 100644 --- a/Telegram/SourceFiles/settings.h +++ b/Telegram/SourceFiles/settings.h @@ -121,6 +121,7 @@ DeclareSetting(qint32, LastUpdateCheck); DeclareSetting(bool, NoStartUpdate); DeclareSetting(bool, StartToSettings); DeclareSetting(bool, ReplaceEmojis); +DeclareSetting(bool, MessageFormatting); DeclareReadSetting(bool, ManyInstance); DeclareSetting(QByteArray, LocalSalt); diff --git a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp index ce0979b46..41027cd02 100644 --- a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp @@ -154,6 +154,7 @@ void ChatSettingsWidget::createControls() { style::margins slidedPadding(0, marginSub.bottom() / 2, 0, marginSub.bottom() - (marginSub.bottom() / 2)); addChildRow(_replaceEmoji, marginSkip, lang(lng_settings_replace_emojis), [this](bool) { onReplaceEmoji(); }, cReplaceEmojis()); + addChildRow(_messageFormat, marginSkip, lang(lng_settings_message_formatting), [this](bool) { toggleMessageFormat(); }, cMessageFormatting()); #ifndef OS_WIN_STORE auto pathMargin = marginSub; @@ -186,6 +187,11 @@ void ChatSettingsWidget::onReplaceEmoji() { Local::writeUserSettings(); } +void ChatSettingsWidget::toggleMessageFormat() { + cSetMessageFormatting(_messageFormat->checked()); + Local::writeUserSettings(); +} + void ChatSettingsWidget::onDontAskDownloadPath() { Global::SetAskDownloadPath(!_dontAskDownloadPath->checked()); Local::writeUserSettings(); diff --git a/Telegram/SourceFiles/settings/settings_chat_settings_widget.h b/Telegram/SourceFiles/settings/settings_chat_settings_widget.h index 6357e0b27..2e812cbcb 100644 --- a/Telegram/SourceFiles/settings/settings_chat_settings_widget.h +++ b/Telegram/SourceFiles/settings/settings_chat_settings_widget.h @@ -107,7 +107,9 @@ private: void createControls(); object_ptr _replaceEmoji = { nullptr }; + object_ptr _messageFormat = { nullptr }; object_ptr _dontAskDownloadPath = { nullptr }; + void toggleMessageFormat(); #ifndef OS_WIN_STORE object_ptr> _downloadPath = { nullptr }; diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp index 8c02848c2..c605122ba 100644 --- a/Telegram/SourceFiles/storage/localstorage.cpp +++ b/Telegram/SourceFiles/storage/localstorage.cpp @@ -551,6 +551,7 @@ enum { dbiDcOptionOld = 0x27, dbiTryIPv6 = 0x28, dbiSongVolume = 0x29, + dbiMessageFormatting = 0x2a, dbiWindowsNotificationsOld = 0x30, dbiIncludeMuted = 0x31, dbiMegagroupSizeMax = 0x32, @@ -1360,6 +1361,14 @@ bool _readSetting(quint32 blockId, QDataStream &stream, int version, ReadSetting cSetReplaceEmojis(v == 1); } break; + case dbiMessageFormatting: { + qint32 v; + stream >> v; + if (!_checkStreamStatus(stream)) return false; + + cSetMessageFormatting(v == 1); + } break; + case dbiDefaultAttach: { qint32 v; stream >> v; @@ -1800,6 +1809,7 @@ void _writeUserSettings() { data.stream << quint32(dbiAdaptiveForWide) << qint32(Global::AdaptiveForWide() ? 1 : 0); data.stream << quint32(dbiAutoLock) << qint32(Global::AutoLock()); data.stream << quint32(dbiReplaceEmojis) << qint32(cReplaceEmojis() ? 1 : 0); + data.stream << quint32(dbiMessageFormatting) << qint32(cMessageFormatting() ? 1 : 0); data.stream << quint32(dbiSoundNotify) << qint32(Global::SoundNotify()); data.stream << quint32(dbiIncludeMuted) << qint32(Global::IncludeMuted()); data.stream << quint32(dbiDesktopNotify) << qint32(Global::DesktopNotify()); diff --git a/Telegram/SourceFiles/ui/text/text_entity.cpp b/Telegram/SourceFiles/ui/text/text_entity.cpp index c8169ca2c..5c68a9538 100644 --- a/Telegram/SourceFiles/ui/text/text_entity.cpp +++ b/Telegram/SourceFiles/ui/text/text_entity.cpp @@ -2120,9 +2120,11 @@ void PrepareForSending(TextWithEntities &result, qint32 flags) { ParseEntities(result, flags); } - ReplaceStringWithChar(qstr("--"), QChar(8212), result, true); - ReplaceStringWithChar(qstr("<<"), QChar(171), result); - ReplaceStringWithChar(qstr(">>"), QChar(187), result); + if (cMessageFormatting()) { + ReplaceStringWithChar(qstr("--"), QChar(8212), result, true); + ReplaceStringWithChar(qstr("<<"), QChar(171), result); + ReplaceStringWithChar(qstr(">>"), QChar(187), result); + } if (cReplaceEmojis()) { Ui::Emoji::ReplaceInText(result);