From d86e93dc356bb9ed34a284f54361b4c144760223 Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Tue, 22 Nov 2022 15:14:05 +0800 Subject: [PATCH] - enhancement: Options -> editor -> custom C/C++ type keywords page --- NEWS.md | 3 +- RedPandaIDE/RedPandaIDE.pro | 5 +- RedPandaIDE/editor.cpp | 40 +- RedPandaIDE/settings.cpp | 43 + RedPandaIDE/settings.h | 11 + .../editorcustomctypekeywords.cpp | 79 ++ .../editorcustomctypekeywords.h | 39 + .../editorcustomctypekeywords.ui | 102 ++ RedPandaIDE/settingsdialog/settingsdialog.cpp | 4 + RedPandaIDE/translations/RedPandaIDE_pt_BR.ts | 31 + RedPandaIDE/translations/RedPandaIDE_zh_CN.ts | 885 +++++++++--------- RedPandaIDE/translations/RedPandaIDE_zh_TW.ts | 31 + RedPandaIDE/widgets/codecompletionpopup.cpp | 2 - libs/qsynedit/qsynedit.pro | 2 + libs/qsynedit/qsynedit/highlighter/cpp.cpp | 16 +- libs/qsynedit/qsynedit/highlighter/cpp.h | 4 + .../highlighter/customhighlighterv1.cpp | 8 + .../highlighter/customhighlighterv1.h | 22 + 18 files changed, 893 insertions(+), 434 deletions(-) create mode 100644 RedPandaIDE/settingsdialog/editorcustomctypekeywords.cpp create mode 100644 RedPandaIDE/settingsdialog/editorcustomctypekeywords.h create mode 100644 RedPandaIDE/settingsdialog/editorcustomctypekeywords.ui create mode 100644 libs/qsynedit/qsynedit/highlighter/customhighlighterv1.cpp create mode 100644 libs/qsynedit/qsynedit/highlighter/customhighlighterv1.h diff --git a/NEWS.md b/NEWS.md index 3e54797f..8832b40b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,8 @@ Red Panda C++ Version 2.5 - enhancemnet: add "Reserve word for Types" item in color scheme - enhancement: auto save / load problem set - enhancement: project's custom compile include/lib/bin directory is under folder of the app, save them using the path relative to the app - - enhancement: slightly reduce memory usage + - enhancement: slightly reduce memory usage + - enhancement: Options -> editor -> custom C/C++ type keywords page Red Panda C++ Version 2.4 diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro index 07a74bf9..664171a6 100644 --- a/RedPandaIDE/RedPandaIDE.pro +++ b/RedPandaIDE/RedPandaIDE.pro @@ -107,6 +107,7 @@ SOURCES += \ settingsdialog/debuggeneralwidget.cpp \ settingsdialog/editorautosavewidget.cpp \ settingsdialog/editorcodecompletionwidget.cpp \ + settingsdialog/editorcustomctypekeywords.cpp \ settingsdialog/editormiscwidget.cpp \ settingsdialog/editorsnippetwidget.cpp \ settingsdialog/editortooltipswidget.cpp \ @@ -241,6 +242,7 @@ HEADERS += \ settingsdialog/debuggeneralwidget.h \ settingsdialog/editorautosavewidget.h \ settingsdialog/editorcodecompletionwidget.h \ + settingsdialog/editorcustomctypekeywords.h \ settingsdialog/editormiscwidget.h \ settingsdialog/editorsnippetwidget.h \ settingsdialog/editortooltipswidget.h \ @@ -346,6 +348,7 @@ FORMS += \ settingsdialog/debuggeneralwidget.ui \ settingsdialog/editorautosavewidget.ui \ settingsdialog/editorcodecompletionwidget.ui \ + settingsdialog/editorcustomctypekeywords.ui \ settingsdialog/editormiscwidget.ui \ settingsdialog/editorsnippetwidget.ui \ settingsdialog/editortooltipswidget.ui \ @@ -464,7 +467,7 @@ RESOURCES += \ RC_ICONS = images/devcpp.ico images/associations/c.ico images/associations/cpp.ico images/associations/dev.ico images/associations/c.ico images/associations/cpp.ico images/associations/h.ico images/associations/hpp.ico -# fixed lrelease.prf +## fixed lrelease.prf qtPrepareTool(QMAKE_LRELEASE, lrelease) isEmpty(LRELEASE_DIR): LRELEASE_DIR = .qm diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 1a31fd32..1386597e 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -1024,7 +1024,15 @@ void Editor::onPreparePaintHighlightToken(int line, int aChar, const QString &to //selection if (highlighter() && attr) { if (attr == highlighter()->keywordAttribute()) { - if (CppTypeKeywords.contains(token)) { + if (CppTypeKeywords.contains(token) + || + ( + highlighter()->language()==QSynedit::HighlighterLanguage::Cpp + && + ((QSynedit::CppHighlighter*)highlighter().get())->customTypeKeywords().contains(token) + ) + ) + { PColorSchemeItem item = mStatementColors->value(StatementKind::skKeywordType,PColorSchemeItem()); if (item) { @@ -3108,12 +3116,19 @@ void Editor::showCompletion(const QString& preWord,bool autoComplete, CodeComple if (highlighter()) { if (highlighter()->language() != QSynedit::HighlighterLanguage::Cpp ) { keywords = highlighter()->keywords(); - } else if (mUseCppSyntax) { - foreach (const QString& keyword, CppKeywords.keys()) { - keywords.insert(keyword); - } } else { - keywords = CKeywords; + if (mUseCppSyntax) { + foreach (const QString& keyword, CppKeywords.keys()) { + keywords.insert(keyword); + } + } else { + keywords = CKeywords; + } + if (pSettings->editor().enableCustomCTypeKeywords()) { + foreach (const QString& keyword, pSettings->editor().customCTypeKeywords()) { + keywords.insert(keyword); + } + } } } @@ -4761,6 +4776,19 @@ void Editor::applySettings() setRightEdge(0); } + if (pSettings->editor().enableCustomCTypeKeywords()) { + if (highlighter() && highlighter()->language() == QSynedit::HighlighterLanguage::Cpp) { + QSet set; + foreach(const QString& s, pSettings->editor().customCTypeKeywords()) + set.insert(s); + ((QSynedit::CppHighlighter*)(highlighter().get()))->setCustomTypeKeywords(set); + } + } else { + if (highlighter() && highlighter()->language() == QSynedit::HighlighterLanguage::Cpp) { + ((QSynedit::CppHighlighter*)(highlighter().get()))->setCustomTypeKeywords(QSet()); + } + } + this->setUndoLimit(pSettings->editor().undoLimit()); this->setUndoMemoryUsage(pSettings->editor().undoMemoryUsage()); diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index 7239ed48..cf783590 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -301,6 +301,15 @@ void Settings::_Base::saveValue(const QString &key, const QVariant &value) mSettings->saveValue(key,value); } +void Settings::_Base::saveValue(const QString &key, const QSet &set) +{ + QStringList val; + foreach(const QString& s,set) { + val.append(s); + } + mSettings->saveValue(key,val); +} + QVariant Settings::_Base::value(const QString &key, const QVariant &defaultValue) { return mSettings->value(key,defaultValue); @@ -326,6 +335,15 @@ QStringList Settings::_Base::stringListValue(const QString &key, const QStringLi return value(key,defaultValue).toStringList(); } +QSet Settings::_Base::stringSetValue(const QString &key) +{ + QStringList lst=value(key,QStringList()).toStringList(); + QSet result; + foreach(const QString& s, lst) + result.insert(s); + return result; +} + QColor Settings::_Base::colorValue(const QString &key, const QColor& defaultValue) { return value(key,defaultValue).value(); @@ -675,6 +693,26 @@ void Settings::Editor::setParseTodos(bool newParseTodos) mParseTodos = newParseTodos; } +const QStringList &Settings::Editor::customCTypeKeywords() const +{ + return mCustomCTypeKeywords; +} + +void Settings::Editor::setCustomCTypeKeywords(const QStringList &newCustomTypeKeywords) +{ + mCustomCTypeKeywords = newCustomTypeKeywords; +} + +bool Settings::Editor::enableCustomCTypeKeywords() const +{ + return mEnableCustomCTypeKeywords; +} + +void Settings::Editor::setEnableCustomCTypeKeywords(bool newEnableCustomCTypeKeywords) +{ + mEnableCustomCTypeKeywords = newEnableCustomCTypeKeywords; +} + bool Settings::Editor::highlightCurrentWord() const { return mHighlightCurrentWord; @@ -1258,6 +1296,9 @@ void Settings::Editor::doSave() saveValue("auto_format_when_saved", mAutoFormatWhenSaved); saveValue("parse_todos",mParseTodos); + saveValue("custom_c_type_keywords", mCustomCTypeKeywords); + saveValue("enable_custom_c_type_keywords",mEnableCustomCTypeKeywords); + //tooltips saveValue("enable_tooltips",mEnableTooltips); saveValue("enable_debug_tooltips",mEnableDebugTooltips); @@ -1402,6 +1443,8 @@ void Settings::Editor::doLoad() mAutoFormatWhenSaved = boolValue("auto_format_when_saved", false); mParseTodos = boolValue("parse_todos",true); + mCustomCTypeKeywords = stringListValue("custom_c_type_keywords"); + mEnableCustomCTypeKeywords = boolValue("enable_custom_c_type_keywords",false); //tooltips mEnableTooltips = boolValue("enable_tooltips",true); diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index 92dd3d99..f6dec263 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -64,11 +64,13 @@ private: void endGroup(); void remove(const QString &key); void saveValue(const QString &key, const QVariant &value); + void saveValue(const QString &key, const QSet& set); QVariant value(const QString &key, const QVariant& defaultValue); bool boolValue(const QString &key, bool defaultValue); QSize sizeValue(const QString &key); int intValue(const QString &key, int defaultValue); QStringList stringListValue(const QString &key, const QStringList& defaultValue=QStringList()); + QSet stringSetValue(const QString &key); QColor colorValue(const QString &key, const QColor& defaultValue); QString stringValue(const QString &key, const QString& defaultValue); void save(); @@ -370,6 +372,12 @@ public: bool parseTodos() const; void setParseTodos(bool newParseTodos); + const QStringList &customCTypeKeywords() const; + void setCustomCTypeKeywords(const QStringList &newCustomTypeKeywords); + + bool enableCustomCTypeKeywords() const; + void setEnableCustomCTypeKeywords(bool newEnableCustomCTypeKeywords); + private: //General // indents @@ -481,6 +489,9 @@ public: bool mAutoFormatWhenSaved; bool mParseTodos; + QStringList mCustomCTypeKeywords; + bool mEnableCustomCTypeKeywords; + //hints tooltip bool mEnableTooltips; diff --git a/RedPandaIDE/settingsdialog/editorcustomctypekeywords.cpp b/RedPandaIDE/settingsdialog/editorcustomctypekeywords.cpp new file mode 100644 index 00000000..993a6c56 --- /dev/null +++ b/RedPandaIDE/settingsdialog/editorcustomctypekeywords.cpp @@ -0,0 +1,79 @@ +#include "editorcustomctypekeywords.h" +#include "ui_editorcustomctypekeywords.h" +#include "../settings.h" +#include "../iconsmanager.h" + +EditorCustomCTypeKeywordsWidget::EditorCustomCTypeKeywordsWidget(const QString& name, const QString& group, QWidget *parent) : + SettingsWidget(name,group,parent), + ui(new Ui::editorcustomctypekeywords) +{ + ui->setupUi(this); +} + +EditorCustomCTypeKeywordsWidget::~EditorCustomCTypeKeywordsWidget() +{ + delete ui; +} + +void EditorCustomCTypeKeywordsWidget::doLoad() +{ + ui->grpEnableCustomKeywords->setChecked(pSettings->editor().enableCustomCTypeKeywords()); + ui->lstKeywords->clear(); + foreach(const QString& s, pSettings->editor().customCTypeKeywords()) + addKeyword(s); +} + +void EditorCustomCTypeKeywordsWidget::doSave() +{ + pSettings->editor().setEnableCustomCTypeKeywords(ui->grpEnableCustomKeywords->isChecked()); + QStringList lst; + QSet added; + for(int i=0;ilstKeywords->count();i++) { + QString t=ui->lstKeywords->item(i)->text().trimmed(); + if (!t.isEmpty() && !added.contains(t)) { + lst.append(t); + added.insert(t); + } + } + pSettings->editor().setCustomCTypeKeywords(lst); + pSettings->editor().save(); + doLoad(); +} + +void EditorCustomCTypeKeywordsWidget::updateIcons(const QSize &/*size*/) +{ + pIconsManager->setIcon(ui->btnAdd, IconsManager::ACTION_MISC_ADD); + pIconsManager->setIcon(ui->btnRemove, IconsManager::ACTION_MISC_REMOVE); + pIconsManager->setIcon(ui->btnRemoveAll, IconsManager::ACTION_MISC_CLEAN); +} + +QListWidgetItem * EditorCustomCTypeKeywordsWidget::addKeyword(const QString &keyword) +{ + QListWidgetItem * item = new QListWidgetItem(keyword,ui->lstKeywords); + item->setFlags(Qt::ItemFlag::ItemIsEditable | Qt::ItemFlag::ItemIsEnabled); + ui->lstKeywords->addItem(item); + return item; +} + +void EditorCustomCTypeKeywordsWidget::on_btnAdd_clicked() +{ + QListWidgetItem *item=addKeyword(""); + ui->lstKeywords->editItem(item); +} + + +void EditorCustomCTypeKeywordsWidget::on_btnRemove_clicked() +{ + int row = ui->lstKeywords->currentRow(); + if (row>=0 && rowlstKeywords->count()) { + QListWidgetItem * item = ui->lstKeywords->takeItem(row); + delete item; + } +} + + +void EditorCustomCTypeKeywordsWidget::on_btnRemoveAll_clicked() +{ + ui->lstKeywords->clear(); +} + diff --git a/RedPandaIDE/settingsdialog/editorcustomctypekeywords.h b/RedPandaIDE/settingsdialog/editorcustomctypekeywords.h new file mode 100644 index 00000000..78c278a9 --- /dev/null +++ b/RedPandaIDE/settingsdialog/editorcustomctypekeywords.h @@ -0,0 +1,39 @@ +#ifndef EDITORCUSTOMCTYPEKEYWORDS_H +#define EDITORCUSTOMCTYPEKEYWORDS_H + +#include +#include "settingswidget.h" + +namespace Ui { +class editorcustomctypekeywords; +} + +class QListWidgetItem; +class EditorCustomCTypeKeywordsWidget : public SettingsWidget +{ + Q_OBJECT + +public: + explicit EditorCustomCTypeKeywordsWidget(const QString& name, const QString& group, QWidget *parent = nullptr); + ~EditorCustomCTypeKeywordsWidget(); + +private: + Ui::editorcustomctypekeywords *ui; + + // SettingsWidget interface +protected: + void doLoad() override; + void doSave() override; + + // SettingsWidget interface +protected: + void updateIcons(const QSize &size) override; + QListWidgetItem * addKeyword(const QString& keyword) ; + +private slots: + void on_btnAdd_clicked(); + void on_btnRemove_clicked(); + void on_btnRemoveAll_clicked(); +}; + +#endif // EDITORCUSTOMCTYPEKEYWORDS_H diff --git a/RedPandaIDE/settingsdialog/editorcustomctypekeywords.ui b/RedPandaIDE/settingsdialog/editorcustomctypekeywords.ui new file mode 100644 index 00000000..a81ab8de --- /dev/null +++ b/RedPandaIDE/settingsdialog/editorcustomctypekeywords.ui @@ -0,0 +1,102 @@ + + + editorcustomctypekeywords + + + + 0 + 0 + 400 + 370 + + + + Custom C/C++ Type Keywords + + + + + + Enable Custom C/C++ Type Keywords + + + true + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Add + + + + + + + Remove + + + + + + + Remove All + + + + + + + Qt::Horizontal + + + + 102 + 20 + + + + + + + + + + + false + + + + + + + Note: Custom keywords is not recognized by syntax checker. + + + true + + + + + + + + + + + diff --git a/RedPandaIDE/settingsdialog/settingsdialog.cpp b/RedPandaIDE/settingsdialog/settingsdialog.cpp index c88204f5..c2b4e763 100644 --- a/RedPandaIDE/settingsdialog/settingsdialog.cpp +++ b/RedPandaIDE/settingsdialog/settingsdialog.cpp @@ -29,6 +29,7 @@ #include "editortooltipswidget.h" #include "editorautosavewidget.h" #include "editorsnippetwidget.h" +#include "editorcustomctypekeywords.h" #include "editormiscwidget.h" #include "environmentappearencewidget.h" #include "environmentshortcutwidget.h" @@ -199,6 +200,9 @@ PSettingsDialog SettingsDialog::optionDialog() widget = new EditorAutoSaveWidget(tr("Auto save"),tr("Editor")); dialog->addWidget(widget); + widget = new EditorCustomCTypeKeywordsWidget(tr("Custom C/C++ Keywords"),tr("Editor")); + dialog->addWidget(widget); + widget = new EditorMiscWidget(tr("Misc"),tr("Editor")); dialog->addWidget(widget); diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index 88fb37f5..0c55dcde 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -6743,6 +6743,10 @@ There are changes in the settings, do you want to save them before swtich to other page? + + Custom C/C++ Keywords + + SettingsWidget @@ -7072,6 +7076,33 @@ Valor + + editorcustomctypekeywords + + Custom C/C++ Type Keywords + + + + Add + + + + Remove + + + + Remove All + + + + Enable Custom C/C++ Type Keywords + + + + Note: Custom keywords is not recognized by syntax checker. + + + editorgeneralwidget diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index 9ec51fea..1f749e1f 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -1325,10 +1325,10 @@ Are you really want to continue? - - - - + + + + Error 错误 @@ -1347,34 +1347,34 @@ Are you really want to continue? 文件%1已经被打开！ - + The text to be copied exceeds count limit! 要复制的内容超过了行数限制！ - + The text to be copied exceeds character limit! 要复制的内容超过了字符数限制！ - + The text to be cut exceeds count limit! 要剪切的内容超过了行数限制！ - + The text to be cut exceeds character limit! 要剪切的内容超过了字符数限制！ - + Print Document 打印文档 - - - + + + Ctrl+click for more info Ctrl+单击以获取更多信息 @@ -1383,27 +1383,27 @@ Are you really want to continue? 未找到符号'%1'! - + astyle not found 找不到astyle程序 - + Can't find astyle in "%1". 找不到astyle程序"%1". - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -3918,18 +3918,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - + + + + + Issues 编译器 @@ -4003,7 +4003,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -4137,8 +4137,8 @@ Are you really want to continue? - - + + Compile 编译 @@ -4216,9 +4216,9 @@ Are you really want to continue? - - - + + + Copy 复制 @@ -4229,7 +4229,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -4240,8 +4240,8 @@ Are you really want to continue? - - + + Select All 选择全部 @@ -4367,7 +4367,7 @@ Are you really want to continue? - + New Problem Set 新建试题集 @@ -4386,14 +4386,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -4454,7 +4454,7 @@ Are you really want to continue? - + Run All Cases Run Current Case 运行所有案例 @@ -4746,7 +4746,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -4942,7 +4942,7 @@ Are you really want to continue? - + New File 新建文件 @@ -4983,7 +4983,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -5004,13 +5004,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -5279,7 +5279,7 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 @@ -5289,32 +5289,32 @@ Are you really want to continue? 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5323,23 +5323,23 @@ Are you really want to continue? 行:%1 列:%2 已选择:%3 总行数:%4 总长度:%5 - + Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 Line: %1 Col: %2 Selected: %3 Lines: %4 Length: %5 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 @@ -5352,133 +5352,133 @@ Are you really want to continue? 你确定要关闭'%1'吗？ - + Confirm 确认 - - - + + + Source file is not compiled. 源文件尚未编译。 - - + + Compile now? 现在编译？ - - + + Source file is more recent than executable. 源文件比可执行程序新。 - + Recompile now? 重新编译？ - - - - + + + + Wrong Compiler Settings 错误的编译器设置 - - - - + + + + Compiler is set not to generate executable. 编译器被设置为不生成可执行文件。 - - + + We need the executabe to run problem case. 我们需要可执行文件来运行试题案例。 - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 - - + + Enable debugging 启用调试参数 - - + + You have not enabled debugging info (-g3) and/or stripped it from the executable (-s) in Compiler Options.<BR /><BR />Do you want to correct this now? 当前编译设置中未启用调试选项(-g3)，或启用了信息剥除选项(-s)<br /><br/>是否纠正这一问题？ - + Project not built 项目尚未构建 - + Project hasn't been built. Build it now? 项目尚未构建。是否构建？ - + Host applcation missing 宿主程序不存在 - + DLL project needs a host application to run. 动态链接库（DLL）需要一个宿主程序来运行。 - + But it's missing. 但它不存在。 - + Host application not exists 宿主程序不存在 - + Host application file '%1' doesn't exist. 宿主程序'%1'不存在。 - - + + Please correct this before start debugging 请在调试前改正设置。 - + Recompile? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 @@ -5487,60 +5487,60 @@ Are you really want to continue? 无法删除旧上次打开信息文件'%1' - + Can't save last open info file '%1' 无法保存上次打开信息文件'%1' - - + + Load last open info error 载入上次打开信息失败 - - + + Can't load last open info file '%1' 无法载入上次打开信息文件'%1' - + Open Source File 打开源代码文件 - - + + Batch Set Cases 批量设置案例 - + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 - + Go to Line 跳转到行 - + Line 行 - + Template Exists 模板已存在 - + Template %1 already exists. Do you want to overwrite? 模板%1已存在。是否覆盖？ @@ -5548,9 +5548,9 @@ Are you really want to continue? - - - + + + Clear 清除 @@ -5566,7 +5566,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -5587,68 +5587,68 @@ Are you really want to continue? 或者选择使用其他的网络端口。 - - + + Rebuild Project 重新构建项目 - - + + Project has been modified, do you want to rebuild it? 项目已经被修改过，是否需要重新构建？ - + Auto Save Error 自动保存出错 - + Auto save "%1" to "%2" failed:%3 自动保存"%1"到"%2"失败：%3 - + Properties... 试题属性... - + Set Problem Set Name 设置试题集名称 - + Problem Set Name: 试题集名称： - + Remove 删除 - + Remove All Bookmarks 删除全部书签 - + Modify Description 修改描述 - - - + + + Bookmark Description 书签描述 - - - + + + Description: 描述： @@ -5657,194 +5657,194 @@ Are you really want to continue? 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove All Breakpoints Remove all breakpoints 删除所有断点 - + Remove Breakpoint 删除当前断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - - + + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 - + Can't open last open information file '%1' for write! 无法写入配置文件'%1'。 - + Run Current Case 运行当前案例 - + Remove Folder 删除文件夹 - + Switch to normal view 切换为普通视图 - + Switch to custom view 切换为自定义视图 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - + In current file 仅当前文件 - + In current project 整个项目 - - + + New Folder 新建文件夹 - + Rename 重命名 - - - - + + + + Delete 删除 - + Open in Editor 在编辑器中打开 - + Open in External Program 使用外部程序打开 - + Open in Terminal 在终端中打开 - + Open in Windows Explorer 在Windows浏览器中打开 - + Character sets 字符集 - + Convert to %1 转换为%1编码 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 @@ -5854,7 +5854,7 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -5867,67 +5867,68 @@ Are you really want to continue? 无标题%1 - + Do you really want to delete %1? 你真的要删除%1吗？ - + Do you really want to delete %1 files? 你真的要删除%1个文件吗？ - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - - + + Do you want to save it? 需要保存吗？ - - + + File Changed 文件已发生变化 - + New Project File? 新建项目文件? - + Do you want to add the new file to the project? 您是否要将新建的文件加入项目? - - - + + + + Save Error 保存失败 - + Change Project Compiler Set 改变项目编译器配置集 - + Change the project's compiler set will lose all custom compiler set options. 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 - - + + Do you really want to do that? 你真的想要那么做吗？ @@ -5936,12 +5937,12 @@ Are you really want to continue? 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) @@ -5950,104 +5951,104 @@ Are you really want to continue? 无标题%1 - + Modify Watch 修改监视表达式 - + Watch Expression 监视表达式 - + Do you really want to clear all breakpoints in this file? 您真的要清除该文件的所有断点吗？ - + New project 新建项目 - + Close %1 and start new project? 关闭'%1'以打开新项目? - + Folder not exist 文件夹不存在 - + Folder '%1' doesn't exist. Create it now? 文件夹'%1'不存在。是否创建？ - + Can't create folder 无法创建文件夹 - + Failed to create folder '%1'. 创建文件夹'%1'失败。 - + Save new project as - + Folder %1 is not empty. 文件夹%1不是空的。 - + Do you really want to delete it? 你真的要删除它吗？ - + Change working folder 改变工作文件夹 - + File '%1' is not in the current working folder. File '%1' is not in the current working folder 文件'%1'不在当前工作文件夹中。 - + Do you want to change working folder to '%1'? 是否将工作文件夹改设为'%1'? - + Can't Commit 无法提交 - + Git needs user info to commit. Git需要用信息进行提交。 - + Choose Input Data File 选择输入数据文件 - - + + All files (*.*) 所有文件 (*.*) - + Choose Expected Output Data File Choose Expected Input Data File 选择期望输出文件 @@ -6059,59 +6060,59 @@ Are you really want to continue? - + Choose Working Folder 选择工作文件夹 - - + + Header Exists 头文件已存在 - - + + Header file "%1" already exists! 头文件"%1"已存在！ - + Source Exists 源文件已存在！ - + Source file "%1" already exists! 源文件"%1"已存在！ - + Can't commit! 无法提交！ - + The following files are in conflicting: 下列文件处于冲突状态，请解决后重新添加和提交： - + Commit Message 提交信息 - + Commit Message: 提交信息： - + Commit Failed 提交失败 - + Commit message shouldn't be empty! 提交信息不能为空！ @@ -6120,22 +6121,22 @@ Are you really want to continue? 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Remove file 删除文件 - + Remove the file from disk? 同时从硬盘上删除文件？ @@ -6144,110 +6145,110 @@ Are you really want to continue? 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 - + C/C++ Source Files (*.c *.cpp *.cc *.cxx) C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + This operation will remove all cases for the current problem. 本操作会删除此试题的所有案例。 - + Red Panda C++ project file (*.dev) 小熊猫C++项目文件(*.dev) - + Rename Error 重命名出错 - + Symbol '%1' is defined in system header. 符号'%1'在系统头文件中定义，无法修改。 - + New Name 新名称 - - + + Replace Error 替换出错 - + Can't open file '%1' for replace! 无法打开文件'%1'进行替换！ - + Contents has changed since last search! 内容和上次查找时不一致。 - + Rich Text Format Files (*.rtf) RTF格式文件 (*.rtf) - + HTML Files (*.html) HTML文件 (*.html) - + The current problem set is not empty. 当前的试题集不是空的。 - + Problem %1 试题%1 - - + + Problem Set Files (*.pbs) 试题集文件 (*.pbs) - + Load Error 载入失败 - - + + Problem Case %1 试题案例%1 @@ -6257,16 +6258,17 @@ Are you really want to continue? - - - - - - - - - - + + + + + + + + + + + Error 错误 @@ -6276,96 +6278,96 @@ Are you really want to continue? 项目历史 - + Load Theme Error 载入主题失败 - - + + Clear History 清除历史 - - + + Version Control 版本控制 - + File '%1' was changed. 磁盘文件'%1'已被修改。 - + Reload its content from disk? 是否重新读取它的内容？ - + File '%1' was removed. 磁盘文件'%1'已被删除。 - + Keep it open? 是否保持它在小熊猫C++中打开的编辑窗口？ - + Open 打开 - + Compile Failed 编译失败 - + Run Failed 运行失败 - - - - + + + + Confirm Convertion 确认转换 - - - - + + + + The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue? 当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗？ - + New Watch Expression 新监视表达式 - + Enter Watch Expression (it is recommended to use 'this->' for class members): 输入监视表达式 - + Parsing file %1 of %2: "%3" （%1/%2）正在解析文件"%3" - - + + Done parsing %1 files in %2 seconds 完成%1个文件的解析,用时%2秒 - + (%1 files per second) (每秒%1个文件） @@ -6647,12 +6649,12 @@ Are you really want to continue? OJProblemModel - + Name 名称 - + Time(ms) Time(sec) 时间(毫秒) @@ -7290,32 +7292,32 @@ 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' - + Rename failed 改名失败 - + Failed to rename file '%1' to '%2' 无法将文件'%1'改名为'%2' @@ -7626,60 +7628,60 @@ 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 Compiler C编译器 - + C++ Compiler C++编译器 - + Maker 构建程序(Make) - + Debugger 调试器 @@ -7745,7 +7747,7 @@ Are you really want to continue? 生成调试信息(-g3) - + Would you like Red Panda C++ to search for compilers in PATH? 您同意小熊猫C++在PATH路径中寻找gcc编译器吗？ @@ -7858,23 +7860,23 @@ Are you really want to continue? 只生成汇编代码(-S) - - + + Confirm 确认 - + The following problems were found during validation of compiler set "%1": 在验证编译器设置"%1"时遇到了下列问题： - + Leaving those directories will lead to problems during compilation. 在配置中保留这些文件夹可能会导致编译出错。 - + Would you like Red Panda C++ to remove them for you and add the default paths to the valid paths? 是否让小熊猫C++删除这些配置，并尝试重新建立配置？ @@ -7883,13 +7885,13 @@ Are you really want to continue? 如果仍然保留这些设置，可能会导致编译错误。<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 @@ -7930,22 +7932,22 @@ Are you really want to continue? 下标"%1"越界 - + bytes 字节 - + KB KB - + MB MB - + GB GB @@ -8237,12 +8239,12 @@ Are you really want to continue? 无标题 - + constructor 构造函数 - + destructor 析构函数 @@ -8250,8 +8252,8 @@ Are you really want to continue? - - + + Can't open file '%1' for read. 无法读取文件'%1'. @@ -8264,7 +8266,7 @@ Are you really want to continue? 无法写入文件'%1'. - + Can't parse problem set file '%1':%2 无法解析试题集文件"%1":%2 @@ -8881,7 +8883,7 @@ Are you really want to continue? SettingsDialog - + Options 选项 @@ -8907,247 +8909,253 @@ 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 试题集 - + + Custom C/C++ Keywords + 自定义C/C++关键字 + + + Debugger 调试器 - + Code Formatter 代码排版 - + Program 程序 - - + + Tools 工具 - + Git Git - + 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? 本页中有尚未保存的设置修改，是否保存后再切换到其他页？ @@ -9570,6 +9578,39 @@ Are you really want to continue? 值 + + editorcustomctypekeywords + + + Custom C/C++ Type Keywords + 自定义C/C++类型关键字 + + + + Enable Custom C/C++ Type Keywords + 启用自定义C/C++类型关键字 + + + + Add + 添加 + + + + Remove + 删除 + + + + Remove All + 全部删除 + + + + Note: Custom keywords is not recognized by syntax checker. + 注意：自定义关键字对语法检查器无效。 + + editorgeneralwidget diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index ca4a2a47..6351d3d5 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -6384,6 +6384,10 @@ There are changes in the settings, do you want to save them before swtich to other page? + + Custom C/C++ Keywords + + SettingsWidget @@ -6675,6 +6679,33 @@ + + editorcustomctypekeywords + + Custom C/C++ Type Keywords + + + + Add + + + + Remove + + + + Remove All + + + + Enable Custom C/C++ Type Keywords + + + + Note: Custom keywords is not recognized by syntax checker. + + + editorgeneralwidget diff --git a/RedPandaIDE/widgets/codecompletionpopup.cpp b/RedPandaIDE/widgets/codecompletionpopup.cpp index 51045f2b..fefd4284 100644 --- a/RedPandaIDE/widgets/codecompletionpopup.cpp +++ b/RedPandaIDE/widgets/codecompletionpopup.cpp @@ -544,11 +544,9 @@ void CodeCompletionPopup::getCompletionFor( if(!mParser) { if (mShowKeywords) { //add keywords - if (!customKeywords.isEmpty()) { foreach (const QString& keyword,customKeywords) { addKeyword(keyword); } - } } return; } diff --git a/libs/qsynedit/qsynedit.pro b/libs/qsynedit/qsynedit.pro index 906cb29b..47c04403 100644 --- a/libs/qsynedit/qsynedit.pro +++ b/libs/qsynedit/qsynedit.pro @@ -34,6 +34,7 @@ SOURCES += qsynedit/CodeFolding.cpp \ qsynedit/highlighter/base.cpp \ qsynedit/highlighter/composition.cpp \ qsynedit/highlighter/cpp.cpp \ + qsynedit/highlighter/customhighlighterv1.cpp \ qsynedit/highlighter/glsl.cpp \ qsynedit/Search.cpp \ qsynedit/SearchBase.cpp \ @@ -59,6 +60,7 @@ HEADERS += qsynedit/Search.h \ qsynedit/highlighter/base.h \ qsynedit/highlighter/composition.h \ qsynedit/highlighter/cpp.h \ + qsynedit/highlighter/customhighlighterv1.h \ qsynedit/highlighter/glsl.h \ INCLUDEPATH += ../redpanda_qt_utils diff --git a/libs/qsynedit/qsynedit/highlighter/cpp.cpp b/libs/qsynedit/qsynedit/highlighter/cpp.cpp index 8605bd02..a343d9b2 100644 --- a/libs/qsynedit/qsynedit/highlighter/cpp.cpp +++ b/libs/qsynedit/qsynedit/highlighter/cpp.cpp @@ -1441,6 +1441,16 @@ void CppHighlighter::pushIndents(int indentType) mRange.indents.push_back(indentType); } +const QSet &CppHighlighter::customTypeKeywords() const +{ + return mCustomTypeKeywords; +} + +void CppHighlighter::setCustomTypeKeywords(const QSet &newCustomTypeKeywords) +{ + mCustomTypeKeywords = newCustomTypeKeywords; +} + bool CppHighlighter::getTokenFinished() const { if (mTokenId == TokenId::Comment @@ -1627,7 +1637,7 @@ void CppHighlighter::setLine(const QString &newLine, int lineNumber) bool CppHighlighter::isKeyword(const QString &word) { - return Keywords.contains(word); + return Keywords.contains(word) || mCustomTypeKeywords.contains(word); } TokenType CppHighlighter::getTokenType() @@ -1738,7 +1748,9 @@ bool CppHighlighter::isIdentChar(const QChar &ch) const QSet CppHighlighter::keywords() const { - return Keywords; + QSet set=Keywords; + set.unite(mCustomTypeKeywords); + return set; } QString CppHighlighter::foldString() diff --git a/libs/qsynedit/qsynedit/highlighter/cpp.h b/libs/qsynedit/qsynedit/highlighter/cpp.h index 20a273ed..9a8d65f8 100644 --- a/libs/qsynedit/qsynedit/highlighter/cpp.h +++ b/libs/qsynedit/qsynedit/highlighter/cpp.h @@ -166,6 +166,8 @@ private: int mLeftBraces; int mRightBraces; + QSet mCustomTypeKeywords; + PHighlighterAttribute mAsmAttribute; PHighlighterAttribute mPreprocessorAttribute; PHighlighterAttribute mInvalidAttribute; @@ -218,6 +220,8 @@ public: // SynHighlighter interface public: QString foldString() override; + const QSet &customTypeKeywords() const; + void setCustomTypeKeywords(const QSet &newCustomTypeKeywords); }; } diff --git a/libs/qsynedit/qsynedit/highlighter/customhighlighterv1.cpp b/libs/qsynedit/qsynedit/highlighter/customhighlighterv1.cpp new file mode 100644 index 00000000..9000e78e --- /dev/null +++ b/libs/qsynedit/qsynedit/highlighter/customhighlighterv1.cpp @@ -0,0 +1,8 @@ +#include "customhighlighterv1.h" + +namespace QSynedit { +CustomHighlighterV1::CustomHighlighterV1() +{ + +} +} diff --git a/libs/qsynedit/qsynedit/highlighter/customhighlighterv1.h b/libs/qsynedit/qsynedit/highlighter/customhighlighterv1.h new file mode 100644 index 00000000..c2928082 --- /dev/null +++ b/libs/qsynedit/qsynedit/highlighter/customhighlighterv1.h @@ -0,0 +1,22 @@ +#ifndef CUSTOMHIGHLIGHTERV1_H +#define CUSTOMHIGHLIGHTERV1_H +#include "base.h" +namespace QSynedit { + +class CustomHighlighterV1:public Highlighter +{ +public: + CustomHighlighterV1(); +protected: + bool mIgnoreCase; + QSet mKeywords; + QSet mTypeKeywords; + QSet mCallableKeywords; + QString mLanguageName; + QSet mSuffixes; +}; + +} + + +#endif // CUSTOMHIGHLIGHTERV1_H