Merge 7adf966 into ed0e5b9

procxx · Apr 18, 2018 · 7674997 · 7674997
2 parents ed0e5b9 + 7adf966
commit 7674997
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 3 deletions.
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
@@ -313,6 +313,8 @@ 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" = "Replace double chars (<<, >>, --)";
+"lng_settings_suggest_by_emoji" = "Suggest popular stickers by emoji";
 "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
@@ -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
@@ -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
@@ -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, marginSmall, 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
@@ -107,7 +107,9 @@ private slots:
 	void createControls();
 
 	object_ptr<Ui::Checkbox> _replaceEmoji = { nullptr };
+	object_ptr<Ui::Checkbox> _messageFormat = { nullptr };
 	object_ptr<Ui::Checkbox> _dontAskDownloadPath = { nullptr };
+	void toggleMessageFormat();
 
 #ifndef OS_WIN_STORE
 	object_ptr<Ui::WidgetSlideWrap<DownloadPathState>> _downloadPath = { nullptr };

diff --git 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
@@ -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);