From 3d9edcad57800b8f519cc6882925d478bc10c9ba Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Mon, 10 Jan 2022 20:16:26 +0800 Subject: [PATCH] - enhancement: support ligatures in fonts like fira code ( disabled by default, can be turned on in options dialog's editor font page) --- NEWS.md | 1 + RedPandaIDE/RedPandaIDE_zh_CN.qm | Bin 110573 -> 110421 bytes RedPandaIDE/RedPandaIDE_zh_CN.ts | 385 +++++++++--------- RedPandaIDE/editor.cpp | 3 + RedPandaIDE/qsynedit/SynEdit.h | 2 +- RedPandaIDE/qsynedit/TextPainter.cpp | 34 +- RedPandaIDE/settings.cpp | 12 + RedPandaIDE/settings.h | 4 + .../settingsdialog/editorfontwidget.cpp | 2 + .../settingsdialog/editorfontwidget.ui | 31 +- 10 files changed, 264 insertions(+), 210 deletions(-) diff --git a/NEWS.md b/NEWS.md index f211df67..cd731b6a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,7 @@ Red Panda C++ Version 0.13.2 - fix: crash when closing the options dialog under Ubuntu 20.04 LTS ( no memory leak now) - enhancement: can add non-code file in templates - enhancement: if there's no selection when copy/cut, select currect line by default + - enhancement: support ligatures in fonts like fira code ( disabled by default, can be turned on in options dialog's editor font page) Red Panda C++ Version 0.13.1 - enhancement: suppoort localization info in project templates diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index ce12b65bfc3c21c99d2a77711d78f3f7780a8f0a..2c654303f435610e2deeb984f8c83d622bf0f98e 100644 GIT binary patch delta 10809 zcmXY%d0b5EAIHDX%sFS~%$%9AC9-9grG-QakwVB;s1)ss7M1K8Waow`%5v>llAUV{ z$$D)mt~Fa_iR^p$eVX(8qu2YKnK|b?&-eK*pYL;e^GLW=A}nicj3DAx5dF6tTnQcq z)4}^-2GJb?SAi|T)u0EM3C4l@iS@|_KM?CTn24`M%mdf)PDCjR6PdP`%#eNHU}6J8 zKtCeKWD}V&X#|m-o~V^p=7|5FC!UheH~lh^2?0cXw-7bmD6_?7nZXB5WQm?c{arBd z`XCeBJI)ameI)KWXC%7anz$P<@0}N5A7VZ^#1${YOf87J?L{p3 z1NawFv+8rOrH9P+_hdS4mFa;SSAXy6Cv#XYnLbTq26T}blr1yF5;Wq1aEz?_!YKBC zE|eLQA~Q}aGybB?LnMK5y7irX?q{#ax+f1eqNM$h4CO&L+H)&yAtPy|yJPxkB8J0AiM%iC3S&(oP`W z){RJ)A=A)RW=$J1n!eb#S^i-E02A35`3G!FgnXXZ7TiFTGlh72ELFo8;=BANde)41 zmlec9<`LhoGf{{B#1H&L^c>fR!H0b7%6wi)eB9qeyPb(&yocxmNBoMV@Ts0g;#Z%8 zV>Oof-QGktIE?sggyqH!#OK0k%&roDI+R#5+_;+49ui-$hnNxrzkUI{OscMCaK`JT z8iAQ^noqj&Tf`h)$uPDBG0B%&b`2&<&!+Z$%3uixnFga;KB)0a=DsAE`x}|a5`I(r zcF-2=&BM_Q3 zcgS?yM}0F8cH&f-My&kJ5-m zTZt+v!DC3lb~IvVbslji-x`aEx);hE+nRjC(}@j*e@-yk5v!-dK}XP;d>5*THEKk@ zC)1GA+mN5OC9#RW$SS0OTr&HvSYsBmZ zP?V-RQ@*C?2S~%3P88FnHPN{|id~&V6zoLtMzaIN!s02u-f*I~ODJIp!f0s^n(S}@ zYnM*b%w37nI?#;B@5BbVQu3eIMDN;A%6x>;_`{Tv`G)9~p60#64a-7k{%ZJ$yBRI) zgZnnIq12>nL?^G(G6&qJ&Oln(1(tF9Pv)(GWL(o1#pnECS`!N&cp66Q6Xp{YThPuH z2&({l+7;6c3FRXl?RJ+aOHC&mBoosgr@WNfMDt%zek3a5gA;VNNhVC1LFaz%Cc^q( zyZWA(QyyJ=j%fK4L)X9O!NPB-xO*b%$6C7cH)_R&=|;MHcLg!m!*owNhr}>~9=ILF zjfPT598A~s9+k!+tOmWH@=>`&TYpmd2YX^cW2xehH_^`(RC#SK(E%6w&=LbInNA

hhT=z?jZdRw1Z>?O06(*3?eJ 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/><body><p>主页: <a href="Homepage: https://sourceforge.net/projects/dev-cpp-2020/"><span style=" text-decoration: underline; color:#0000ff;">https://sourceforge.net/projects/dev-cpp-2020/</span></a></p></body></html> - Red Panda Dev-C++ (<=6.7.5): Red Panda Dev-C++: - 小熊猫Dev-C++ (<=6.7.5): + 小熊猫Dev-C++ (<=6.7.5): - - Copyright (c) 2004 Bloodshed Software -Copyright (c) 2011-2015 orwell devcpp -Copyright (c) 2020-2021 royqh1979@gmail.com - - - - + GNU General Public License GNU通用公共许可 - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -124,12 +116,12 @@ Copyright (c) 2020-2021 royqh1979@gmail.com 本程序附带一份GNU通用公共许可协议的副本。您也可以从GNU网站<http://www.gnu.org/licenses/>获取。 - + Version: 版本： - + Non-GCC Compiler 非GCC编译器 @@ -580,7 +572,7 @@ Copyright (c) 2020-2021 royqh1979@gmail.com [说明] - + The compiler process for '%1' failed to start. 无法启动编译器进程'%1'。 @@ -589,27 +581,27 @@ Copyright (c) 2020-2021 royqh1979@gmail.com 无法启动编译进程。 - + The compiler process crashed after starting successfully. 编译进程启动后崩溃。 - + The last waitFor...() function timed out. waitFor()函数等待超时。 - + An error occurred when attempting to write to the compiler process. 在向编译进程输入内容时出错。 - + An error occurred when attempting to read from the compiler process. 在从编译进程读取内容时出错。 - + An unknown error occurred. 发生了未知错误。 @@ -1288,7 +1280,7 @@ Are you really want to continue? 输入当前断点的生效条件: - + Readonly 只读 @@ -1667,70 +1659,75 @@ Are you really want to continue? 表单 - - + + Size: 大小: - - + + Font: 字体: - - + + Show only monospaced fonts 只显示等宽字体 - + + Enable Ligatures Support + 启用合字显示支持（需要Fira Code等字体） + + + Gutter 装订线 - + Gutter is visible 显示装订线区域 - + Left Offset 左侧留白 - + Right Offset 右侧留白 - + Show Line Numbers 显示行号 - + Add leading zeros to line numbers 在行号前补齐前导0 - + Line numbers starts at zero 第一行从0开始编号 - + Auto calculate the digit count of line number 自动计算行号位数 - + Digit count 行号位数 - + Use Custom Font 使用自定义字体 @@ -5015,32 +5012,32 @@ Are you really want to continue? 新建项目 - + Make default language 设为缺省语言 - + C Project C语言项目 - + C++ Project C++语言项目 - + Name: 项目名称： - + Create in 创建在 - + Use as the default project location 设为缺省项目位置 @@ -5049,7 +5046,7 @@ Are you really want to continue? 文件夹： - + ... ... @@ -5149,68 +5146,68 @@ Are you really want to continue? 无法保存文件'%1'. - + Error Load File 载入文件错误 - + File Exists 文件已存在 - + File '%1' is already in the project 文件'%1'已在项目中 - + Project Updated 项目已升级 - + Your project was succesfully updated to a newer file format! 已成功将项目升级到新的格式 - + If something has gone wrong, we kept a backup-file: '%1'... 旧项目文件备份在'%1'。 - + Settings need update 设置需要更新 - + The compiler settings format of Red Panda C++ has changed. The compiler settings format of Dev-C++ has changed. 小熊猫C++的编译器设置格式已发生改变。 - + Please update your settings at Project >> Project Options >> Compiler and save your project. 请在项目 >> 项目属性 >> 编译器设置中修改您的设置并保存您的项目 - + Compiler not found 未找到编译器 - + The compiler set you have selected for this project, no longer exists. 您为该项目设置的编译器不存在。 - + It will be substituted by the global compiler set. 它将会被全局编译器设置代替。 - + Developed using the Red Panda C++ IDE Developed using the Red Panda Dev-C++ IDE 使用小熊猫C++编辑器开发 @@ -5617,24 +5614,24 @@ Are you really want to continue? ProjectModel - + File exists 文件已存在 - + File '%1' already exists. Delete it now? 文件'%1'已存在。是否删除？ - - + + Remove failed 删除失败 - - + + Failed to remove file '%1' 无法删除文件'%1' @@ -5732,32 +5729,32 @@ Are you really want to continue? ProjectTemplate - + Read failed. 读取失败. - + Can't read template file '%1'. 无法读取模板文件'%1'. - + Template not exist 模板不存在 - + Template file '%1' doesn't exist. 模板文件'%1'不存在. - + Old version template 旧版本模板 - + Template file '%1' has version '%2', which is unsupported. 已不再支持模板文件'%1'的版本(%2)。 @@ -5933,180 +5930,180 @@ Are you really want to continue? 无法载入自动链接设置 - - + + The following %1 directories don't exist: 下列%1文件夹不存在： - - + + binary 二进制 - + No %1 directories have been specified. 未指定%1文件夹 - + C include C包含 - + C++ include C++包含 - - - - + + + + Cannot find the %1 "%2" 无法找到%1程序"%2" - + C options C语言选项 - + Support all ANSI standard C programs (-ansi) 支持所有ANSI标准C程序(-ansi) - + Do not recognize asm,inline or typeof as a keyword (-fno-asm) 不支持将asm、inline和typeof作为关键字(-fno-asm) - + Imitate traditional C preprocessors (-traditional-cpp) 模仿传统C预处理器行为(-traditional-cpp) - + Code Generation 代码生成 - + Optimize for the following machine (-march) 生成特定机器的专用指令(-march) - + Optimize less, while maintaining full compatibility (-tune) 完整兼容特定机器，较少优化(-tune) - + Enable use of specific instructions (-mx) 启用特定指令集(-mx) - + Optimization level (-Ox) 优化级别(-Ox) - + Compile with the following pointer size (-mx) 使用下列指针大小编译(-mx) - + Language standard (-std) 语言标准(-std) - + Profile 性能分析 - + Generate debugging information (-g3) 生成调试信息(-g3) - + Would you like Red Panda C++ to search for compilers in PATH? 您同意小熊猫C++在PATH路径中寻找gcc编译器吗？ - + Generate profiling info for analysis (-pg) 生成性能分析信息(-pg) - + Warnings 代码警告 - + Inhibit all warning messages (-w) 忽略所有警告信息(-w) - + Show most warnings (-Wall) 启用常见问题警告(-Wall) - + Show some more warnings (-Wextra) 启用更多问题警告(-Wextra) - + Check ISO C/C++/C++0x conformance (-pedantic) 检查ISO C/C++/C++0x语法一致性(-pedantic) - + Only check the code for syntax errors (-fsyntax-only) 只进行语法检查（不编译）(-fsyntax-only) - + Make all warnings into errors (-Werror) 将警告作为错误处理(-Werror) - + Abort compilation on first error (-Wfatal-errors) 遇到第一个错误后立即中止编译(-Wfatal-errors) - + Linker 链接器 - + Link an Objective C program (-lobjc) 链接Objective-C程序 (-lobjc) - + Do not use standard system libraries (-nostdlib) 不使用标准库和系统启动文件(-nostdlib) - + Do not create a console window (-mwindows) 不产生控制台窗口(-mwindows) - + Strip executable (-s) 剥除附加信息(-s) @@ -6115,54 +6112,54 @@ Are you really want to continue? 链接Ojbective C程序(-lobjc) - + Output 输出 - + Put comments in generated assembly code (-fverbose-asm) 在生成的汇编代码中加入注释(-fverbose-asm) - + Use pipes instead of temporary files during compilation (-pipe) 编译时使用管道而不是临时文件(-pipe) - + Do not assemble, compile and generate the assemble code (-S) 只生成汇编代码(-S) - - + + Confirm 确认 - + The following problems were found during validation of compiler set "%1": 在验证编译器设置"%1"时遇到了下列问题： - + Would you like Red Panda C++ to remove them for you and add the default paths to the valid paths? 是否让小熊猫C++删除这些配置，并尝试重新建立配置？ - + Leaving those directories will lead to problems during compilation.<br /><br />Unless you know exactly what you're doing, it is recommended that you click Yes. 如果仍然保留这些设置，可能会导致编译错误。<br /><br />请选择“是”，除非您清楚的知道选择“否”的后果， - - + + Compiler set not configuared. 未配置编译器设置。 - + Would you like Red Panda C++ to search for compilers in the following locations: <BR />'%1'<BR />'%2'? 您需要小熊猫C++在下列位置搜索编译器吗：<br />%1<br />%2 @@ -6882,7 +6879,7 @@ Are you really want to continue? SettingsDialog - + Options 选项 @@ -6908,243 +6905,239 @@ Are you really want to continue? 取消 - + Appearence 外观 - - - + + + + - - + Environment 环境 - + File Association 文件关联 - + Shortcuts 快捷键 - + Folders 文件夹 - + Terminal 终端程序 - + Performance 性能 - - + + Compiler Set 编译器配置集 - - + + Compiler 编译器 - + Auto Link 自动链接 - - - - - - + + + + + + General 通用 - - + + + + + - - + + + - - - - - - - + Editor 编辑器 - + Font 字体 - + Copy & Export 复制/导出 - - + Color 配色 - + Code Completion 代码补全 - + Symbol Completion 符号补全 - - + Snippet 代码模板 - + Auto Syntax Checking 自动语法检查 - + Tooltips 信息提示 - + Auto save 自动保存 - + Misc 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 - + Debugger 调试器 - - + + Code Formatter 代码排版 - + Program 程序 - + Tools 工具 - + Project Options 项目选项 - - - - - - - - - - + + + + + + + + + + Project 项目 - + Files 文件 - + Custom Compile options 自定义编译选项 - + Directories 文件夹 - + Precompiled Header 预编译头文件 - + Makefile Makefile - + Output 输出 - + DLL host DLL宿主 - + Version info 版本信息 - + Save Changes 保存修改 - + There are changes in the settings, do you want to save them before swtich to other page? 本页中有尚未保存的设置修改，是否保存后再切换到其他页？ @@ -7296,8 +7289,8 @@ Are you really want to continue? SynEdit - - + + The highlighter seems to be in an infinite loop 高亮处理进入了死循环 diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 212df608..38a9163b 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -4055,6 +4055,8 @@ void Editor::applySettings() options.setFlag(eoAutoIndent,pSettings->editor().autoIndent()); options.setFlag(eoTabsToSpaces,pSettings->editor().tabToSpaces()); + options.setFlag(eoLigatureSupport, pSettings->editor().enableLigaturesSupport()); + options.setFlag(eoKeepCaretX,pSettings->editor().keepCaretX()); options.setFlag(eoEnhanceHomeKey,pSettings->editor().enhanceHomeKey()); options.setFlag(eoEnhanceEndKey,pSettings->editor().enhanceEndKey()); @@ -4116,6 +4118,7 @@ void Editor::applySettings() } setMouseWheelScrollSpeed(pSettings->editor().mouseWheelScrollSpeed()); + invalidate(); } static PSynHighlighterAttribute createRainbowAttribute(const QString& attrName, const QString& schemeName, const QString& schemeItemName) { diff --git a/RedPandaIDE/qsynedit/SynEdit.h b/RedPandaIDE/qsynedit/SynEdit.h index ea5cee8c..188fc206 100644 --- a/RedPandaIDE/qsynedit/SynEdit.h +++ b/RedPandaIDE/qsynedit/SynEdit.h @@ -83,7 +83,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(SynStateFlags) enum SynEditorOption { eoAltSetsColumnMode = 0x00000001, //Holding down the Alt Key will put the selection mode into columnar format eoAutoIndent = 0x00000002, //Will auto calculate the indent when input -// eoAddIndent = 0x00000004, //Will add one tab width of indent when typing { and :, and remove the same amount when typing } + eoLigatureSupport = 0x00000004, //Support ligaures in fonts like fira code eoDragDropEditing = 0x00000008, //Allows you to select a block of text and drag it within the document to another location eoDropFiles = 0x00000010, //Allows the editor accept OLE file drops eoEnhanceHomeKey = 0x00000020, //enhances home key positioning, similar to visual studio diff --git a/RedPandaIDE/qsynedit/TextPainter.cpp b/RedPandaIDE/qsynedit/TextPainter.cpp index 3e0b80cb..77976bce 100644 --- a/RedPandaIDE/qsynedit/TextPainter.cpp +++ b/RedPandaIDE/qsynedit/TextPainter.cpp @@ -415,7 +415,39 @@ void SynEditTextPainter::PaintToken(const QString &Token, int TokenCols, int Col break; //painter->drawText(nX,rcToken.bottom()-painter->fontMetrics().descent()*edit->dpiFactor() , Token[i]); if (startPaint) { - painter->drawText(nX,rcToken.bottom()-painter->fontMetrics().descent() , Token[i]); + bool drawed = false; + if (edit->mOptions.testFlag(eoLigatureSupport) && i+1') + || (Token[i]=='=' && Token[i+1]=='>') + || (Token[i]==':' && Token[i+1]==':') + || (Token[i]=='_' && Token[i+1]=='_') + || (Token[i]=='=' && Token[i+1]=='=') + || (Token[i]=='!' && Token[i+1]=='=') + || (Token[i]=='<' && Token[i+1]=='=') + || (Token[i]=='>' && Token[i+1]=='=') + || (Token[i]=='>' && Token[i+1]=='>') + || (Token[i]=='<' && Token[i+1]=='<') + || (Token[i]=='-' && Token[i+1]=='>') + || (Token[i]=='<' && Token[i+1]=='-') + || (Token[i]=='/' && Token[i+1]=='*') + || (Token[i]=='*' && Token[i+1]=='/') + || (Token[i]=='/' && Token[i+1]=='/') + ){ + painter->drawText(nX,rcToken.bottom()-painter->fontMetrics().descent() , Token.mid(i,2)); + charCols += edit->charColumns(Token[i+1]); + i+=1; + drawed = true; + } + } + if (!drawed) { + painter->drawText(nX,rcToken.bottom()-painter->fontMetrics().descent() , Token[i]); + drawed = true; + } nX += charCols * edit->mCharWidth; } diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index f071be83..733d80f8 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -578,6 +578,16 @@ void Settings::Editor::setHighlightMathingBraces(bool newHighlightMathingBraces) mHighlightMathingBraces = newHighlightMathingBraces; } +bool Settings::Editor::enableLigaturesSupport() const +{ + return mEnableLigaturesSupport; +} + +void Settings::Editor::setEnableLigaturesSupport(bool newEnableLigaturesSupport) +{ + mEnableLigaturesSupport = newEnableLigaturesSupport; +} + bool Settings::Editor::highlightCurrentWord() const { return mHighlightCurrentWord; @@ -1090,6 +1100,7 @@ void Settings::Editor::doSave() saveValue("font_name",mFontName); saveValue("font_size", mFontSize); saveValue("font_only_monospaced",mFontOnlyMonospaced); + saveValue("enable_ligatures_support", mEnableLigaturesSupport); //gutter saveValue("gutter_visible", mGutterVisible); @@ -1209,6 +1220,7 @@ void Settings::Editor::doLoad() #endif mFontSize = intValue("font_size",14); mFontOnlyMonospaced = boolValue("font_only_monospaced",true); + mEnableLigaturesSupport = boolValue("enable_ligatures_support", false); //gutter mGutterVisible = boolValue("gutter_visible",true); diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index 50d025f4..9ec48f48 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -363,6 +363,9 @@ public: bool highlightMathingBraces() const; void setHighlightMathingBraces(bool newHighlightMathingBraces); + bool enableLigaturesSupport() const; + void setEnableLigaturesSupport(bool newEnableLigaturesSupport); + private: //General // indents @@ -397,6 +400,7 @@ public: bool mShowRightEdgeLine; int mRightEdgeWidth; QColor mRightEdgeLineColor; + bool mEnableLigaturesSupport; //Font //font diff --git a/RedPandaIDE/settingsdialog/editorfontwidget.cpp b/RedPandaIDE/settingsdialog/editorfontwidget.cpp index 31842865..2090b4b2 100644 --- a/RedPandaIDE/settingsdialog/editorfontwidget.cpp +++ b/RedPandaIDE/settingsdialog/editorfontwidget.cpp @@ -57,6 +57,7 @@ void EditorFontWidget::doLoad() ui->chkOnlyMonospacedFonts->setChecked(pSettings->editor().fontOnlyMonospaced()); ui->cbFont->setCurrentFont(QFont(pSettings->editor().fontName())); ui->spinFontSize->setValue(pSettings->editor().fontSize()); + ui->chkLigature->setChecked(pSettings->editor().enableLigaturesSupport()); //gutter ui->chkGutterVisible->setChecked(pSettings->editor().gutterVisible()); @@ -79,6 +80,7 @@ void EditorFontWidget::doSave() pSettings->editor().setFontOnlyMonospaced(ui->chkOnlyMonospacedFonts->isChecked()); pSettings->editor().setFontName(ui->cbFont->currentFont().family()); pSettings->editor().setFontSize(ui->spinFontSize->value()); + pSettings->editor().setEnableLigaturesSupport(ui->chkLigature->isChecked()); //gutter pSettings->editor().setGutterVisible(ui->chkGutterVisible->isChecked()); diff --git a/RedPandaIDE/settingsdialog/editorfontwidget.ui b/RedPandaIDE/settingsdialog/editorfontwidget.ui index 66f5f973..92b06329 100644 --- a/RedPandaIDE/settingsdialog/editorfontwidget.ui +++ b/RedPandaIDE/settingsdialog/editorfontwidget.ui @@ -23,14 +23,14 @@ 11 - - + + - Size: + Font: - + @@ -68,14 +68,7 @@ - - - - Font: - - - - + @@ -126,6 +119,20 @@ + + + + Enable Ligatures Support + + + + + + + Size: + + +