FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-07-31 17:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v4.11.1' into dev

Browse Source 
# Conflicts:
#	Telegram/Resources/winrc/Telegram.rc
#	Telegram/Resources/winrc/Updater.rc
#	Telegram/SourceFiles/core/version.h
#	Telegram/SourceFiles/history/history_inner_widget.cpp
#	Telegram/SourceFiles/platform/win/tray_win.cpp
#	Telegram/lib_ui
This commit is contained in:
ZavaruKitsu
2023-10-29 14:35:43 +03:00
parent 2ca24aa290 745ad45d47
commit 53e4b685b4
251 changed files with 10939 additions and 3220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+10
View File
@@ -373,6 +373,15 @@ void MainWindow::createGlobalMenu() {
},
Ui::kStrikeOutSequence);
psBlockquote = edit->addAction(
tr::lng_menu_formatting_blockquote(tr::now),
[] {
SendKeySequence(
Qt::Key_Period,
Qt::ControlModifier | Qt::ShiftModifier);
},
Ui::kBlockquoteSequence);
psMonospace = edit->addAction(
tr::lng_menu_formatting_monospace(tr::now),
[] {
@@ -534,6 +543,7 @@ void MainWindow::updateGlobalMenuHook() {
ForceDisabled(psItalic, !markdownEnabled);
ForceDisabled(psUnderline, !markdownEnabled);
ForceDisabled(psStrikeOut, !markdownEnabled);
ForceDisabled(psBlockquote, !markdownEnabled);
ForceDisabled(psMonospace, !markdownEnabled);
ForceDisabled(psClearFormat, !markdownEnabled);
}