diff --git a/NEWS.md b/NEWS.md index f7add16a..b925f354 100644 --- a/NEWS.md +++ b/NEWS.md @@ -20,8 +20,9 @@ Red Panda C++ Version 2.23 - change: remove "Assembly" color scheme item (it's not used anymore). - fix: crash when parsing files containing inline assembly code. - fix: crash when source files contains macro definitions like "#define cfun (cfun + 0)" - - improve: Correctly expands multi-line macros when parsing; - - improve: Correctly eppands macros when real param string contains '(' or ')'. + - improvement: Correctly expands multi-line macros when parsing; + - improvement: Correctly eppands macros when real param string contains '(' or ')'. + - enhancement: add "OI Wiki" and "turtle graphics tutorial" in help menu for zh_CN locale. Red Panda C++ Version 2.22 diff --git a/RedPandaIDE/debugger.cpp b/RedPandaIDE/debugger.cpp index 512dc918..6a42e914 100644 --- a/RedPandaIDE/debugger.cpp +++ b/RedPandaIDE/debugger.cpp @@ -21,7 +21,7 @@ #include "settings.h" #include "widgets/cpudialog.h" #include "systemconsts.h" - +#include "editorlist.h" #include #include #include @@ -1126,6 +1126,20 @@ void DebugReader::processConsoleOutput(const QByteArray& line) } } +void DebugReader::processLogOutput(const QByteArray &line) +{ + if (mDebugger->debugInfosUsingUTF8() && line.endsWith(": No such file or directory.\n\"")) { + QByteArray newLine = line; + newLine[0]='~'; + int p=newLine.lastIndexOf(':'); + if (p>0) { + newLine=newLine.left(p); + qDebug()<debugInfosUsingUTF8()) { + QStringList newOutput; + foreach(const QString& s, disOutput) { + QString line = s; + if (!s.isEmpty() && s.front().isDigit()) { + QRegularExpressionMatch match = reGdbSourceLine.match(s); +// qDebug()<editorList()->getContentFromOpenedEditor(filename,contents)) + contents = readFileToLines(filename); + mFileCache[filename]=contents; + } + if (lineno>=0 && lineno &changes); void processConsoleOutput(const QByteArray& line); + void processLogOutput(const QByteArray& line); void processResult(const QByteArray& result); void processExecAsyncRecord(const QByteArray& line); void processError(const QByteArray& errorLine); @@ -597,6 +598,7 @@ private: PDebugCommand mCurrentCmd; std::shared_ptr mProcess; QStringList mBinDirs; + QMap mFileCache; //fWatchView: TTreeView; diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 7f5e5700..6eca9f1e 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -432,6 +432,8 @@ MainWindow::MainWindow(QWidget *parent) ui->actionx86_Assembly_Language_Reference_Manual->setVisible(false); #endif ui->actionEGE_Manual->setVisible(pSettings->environment().language()=="zh_CN"); + ui->actionOI_Wiki->setVisible(pSettings->environment().language()=="zh_CN"); + ui->actionTurtle_Graphics_Manual->setVisible(pSettings->environment().language()=="zh_CN"); ui->actionDocument->setVisible(pSettings->environment().language()=="zh_CN"); connect(ui->EditorTabsLeft, &EditorsTabWidget::middleButtonClicked, @@ -9959,3 +9961,15 @@ void MainWindow::on_actionClose_Others_triggered() } mClosing = false; } + +void MainWindow::on_actionOI_Wiki_triggered() +{ + QDesktopServices::openUrl(QUrl("https://oi-wiki.org/")); +} + + +void MainWindow::on_actionTurtle_Graphics_Manual_triggered() +{ + QDesktopServices::openUrl(QUrl("https://zhuanlan.zhihu.com/p/538666844")); +} + diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index 3421401a..bfd4aa88 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -843,6 +843,10 @@ private slots: void on_actionClose_Others_triggered(); + void on_actionOI_Wiki_triggered(); + + void on_actionTurtle_Graphics_Manual_triggered(); + private: Ui::MainWindow *ui; bool mFullInitialized; diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index 9e124cfc..47eb5d01 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -286,11 +286,15 @@ + + + + + + - - @@ -3518,6 +3522,22 @@ QAction::NoRole + + + OI Wiki + + + QAction::NoRole + + + + + Turtle Graphics Tutorial + + + QAction::NoRole + + diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index 9015e310..3574a52d 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -5275,6 +5275,14 @@ Close Others + + OI Wiki + + + + Turtle Graphics Tutorial + + MemoryModel @@ -6323,7 +6331,7 @@ Assembler - Assembler + Assembler Syntax diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index 024f42cb..330946d9 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -193,17 +193,17 @@ p, li { white-space: pre-wrap; } BacktraceModel - + Function 函数 - + Filename 文件名 - + Line 行 @@ -249,17 +249,17 @@ p, li { white-space: pre-wrap; } BreakpointModel - + Filename 文件名 - + Line 行 - + Condition 条件 @@ -1345,12 +1345,12 @@ Are you really want to continue? 调试器路径"%1"中包含非ASCII字符（如，中文字符） - + This prevents it from executing. 这会导致调试器无法启动。 - + Debugger not exists 找不到调试器 @@ -1359,57 +1359,57 @@ Are you really want to continue? 找不到调试器程序"%1" - + Can''t find debugger (gdb) in : "%1" 找不到gdb程序“%1” - + Please check the "program" page of compiler settings. 请检查编译器设置中的“程序”页。 - + GDB Server path error gdb server路径错误 - + GDB Server's path "%1" contains non-ascii characters. gdb server的路径"%1"包含中文或者全角字符 - + GDB Server not exists 找不到gdb server - + Can''t find gdb server in : "%1" 无法在"%1"找到gdb server - + Execute to evaluate 执行以求值 - + Save file '%1' failed. 保存文件'%1'失败。 - + Can't open file '%1' for write. 无法写入文件'%1'. - + Error in json file '%1':%2 : %3 JSON文件'%1':%2中存在错误：%3 - + Can't open file '%1' for read. 无法读取文件'%1'. @@ -1418,22 +1418,22 @@ Are you really want to continue? 不在当前语境中 - + Compile 编译 - + Source file is more recent than executable. 源文件比程序文件新。 - + Recompile? 重新编译？ - + Signal "%1" Received: 收到信号"%1": @@ -4323,18 +4323,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - - - + + + + + + + Issues 编译器 @@ -4353,8 +4353,8 @@ Are you really want to continue? 工具 - - + + Run 运行 @@ -4365,26 +4365,26 @@ Are you really want to continue? - - + + Project 项目 - - + + Watch 监视 - - + + Structure 结构 - - + + Files 文件 @@ -4393,69 +4393,69 @@ Are you really want to continue? 资源 - - - - - + + + + + Debug 调试 - + Evaluate: 求值 - - + + Debug Console 调试主控台 - + Call Stack 调用栈 - + Breakpoints 断点 - + Locals 局部变量 - - + + Search 查找 - + History: 历史： - + Search Again 重新查找 - + Replace with: 替换为： - + Replace 替换 - + Close 关闭 @@ -4466,7 +4466,7 @@ Are you really want to continue? - + Code 代码 @@ -4489,71 +4489,71 @@ Are you really want to continue? 新建 - + Ctrl+N Ctrl+N - + Open... 打开... - + Ctrl+O Ctrl+O - + Save 保存 - + Ctrl+S Ctrl+S - + Save As... 另存为... - + Save As 另存为 - + Save All 全部保存 - + Ctrl+Shift+S Ctrl+Shift+S - + Options 选项 - - - + + + Compile 编译 - - + + Tools Output 工具输出 - - + + Choose Input File 选择输入文件 @@ -4562,22 +4562,22 @@ Are you really want to continue? ... - + Tool Panels 工具面板 - + Git Git - + Selection 选择 - + F9 F9 @@ -4586,123 +4586,123 @@ Are you really want to continue? F10 - + Undo 撤销 - + Ctrl+Z Ctrl+Z - + Redo 重做 - + Ctrl+Y Ctrl+Y - + Cut 剪切 - + Ctrl+X Ctrl+X - - - - + + + + Copy 复制 - + Ctrl+C Ctrl+C - - + + Paste 粘贴 - + Ctrl+V Ctrl+V - - - + + + Select All 选择全部 - + Ctrl+A Ctrl+A - + Indent 缩进 - + UnIndent 取消缩进 - + Toggle Comment 切换注释 - + Ctrl+/ Ctrl+/ - + Collapse All 全部收起 - + Uncollapse All 全部展开 - + Encode in ANSI 使用ANSI编码 - + Encode in UTF-8 使用UTF-8编码 - + Auto Detect 自动检测 - + Convert to ANSI 转换为ANSI编码 - + Convert to UTF-8 转换为UTF-8编码 @@ -4711,183 +4711,183 @@ Are you really want to continue? 编译运行 - + F11 F11 - - + + Rebuild All 全部重编译 - + F12 F12 - + Stop Execution 停止执行 - + F6 F6 - + F5 F5 - + Step Over 单步跨过 - + F7 F7 - + Step Into 单步进入 - - - + + + Problem Set 试题集 - - - - + + + + New Problem Set 新建试题集 - - - + + + Add Problem 添加试题 - - - + + + Remove Problem 删除试题 - - - - + + + + Save Problem Set 保存试题集 - - - - + + + + Load Problem Set 载入试题集 - + Memory 内存 - + Address Expression: Address: 地址表达式： - + Cancel 取消 - - + + TODO TODO - - + + Bookmark 书签 - - - + + + Problem 试题 - - + + Add Probem Case 添加试题案例 - - - + + + Remove Problem Case Remove Problem Set 删除试题集 - - - + + + Open Anwser Source File 打开答案源代码文件 - - - + + + Run All Cases Run Current Case 运行所有案例 - - + + Problem Cases Validation Options 测试案例验证选项 - + %v/%m %v/%m - + Output 输出 - + Input 输入 - + Expected 期望输出 @@ -4897,12 +4897,12 @@ Are you really want to continue? 帮助 - + Refactor 重构 - + View 视图 @@ -4911,493 +4911,503 @@ Are you really want to continue? 工具窗口 - + Main 主工具栏 - + Compiler Set 编译器配置集 - + Explorer 管理器 - - - + + + Import FPS Problem Set 导入FPS试题集 - - - + + + Export FPS Problem Set 导出FPS试题集 - + Messages 消息 - + Open file in editors 在编辑器中打开文件 - + Choose Expected Output File 选择期望输出文件 - + Ignore Spaces 忽略空格 - + New C/C++ File 新建C/C++文件 - + New Source File 新建源代码文件 - + Ctrl+K, Ctrl+S - + Tab Tab - + Shift+Tab Shift+Tab - + F8 F8 - + Step Out 单步跳出 - + Ctrl+F8 Ctrl+F8 - + Run To Cursor 执行到光标处 - + Ctrl+F5 Ctrl+F5 - + Continue 继续执行 - + F4 F4 - + Add Watch... 添加监视 - + View CPU Window... 打开CPU信息窗口... - + Exit 退出 - + Find... 查找... - + Ctrl+F Ctrl+F - + Find in Files... 在文件中查找... - + Ctrl+Shift+F Ctrl+Shift+F - + Replace... 替换 - + Ctrl+R Ctrl+R - + Find Next 查找下一个 - + F3 F3 - + Find Previous 查找前一个 - + Shift+F3 Shift+F3 - + Remove Watch 删除监视值 - + Remove All Watches Remove All 删除全部监视值 - + Modify Watch... 修改监视值 - + Reformat Code 对代码重新排版 - + Ctrl+Shift+A Ctrl+Shift+A - + Go back 前一次编辑位置 - + Ctrl+Alt+Left Ctrl+Alt+Left - + Forward 后一次编辑位置 - + Ctrl+Alt+Right Ctrl+Alt+Right - + Ctrl+W Ctrl+W - + Close All 全部关闭 - + Ctrl+Shift+W Ctrl+Shift+W - + Maximize Editor 最大化编辑器 - + Ctrl+F11 Ctrl+F11 - + Next 下一窗口 - + Ctrl+Tab Ctrl+Tab - + Previous 前一窗口 - + Ctrl+Shift+Tab Ctrl+Shift+Tab - + Toggle breakpoint 切换断点 - + Ctrl+F4 Ctrl+F4 - - + + Clear all breakpoints 删除所有断点 - + Breakpoint property... 设置断点条件... - + Goto Declaration 跳转到声明处 - + Ctrl+Shift+G Ctrl+Shift+G - + Goto Definition 跳转到定义处 - + Ctrl+G Ctrl+G - + Find references 查找符号的引用 - + Open containing folder 打开所在的文件夹 - + Ctrl+B Ctrl+B - + Open a terminal here 打开命令行窗口 - + File Properties... 文件属性... - + Close Project 关闭项目 - + Project options 项目属性 - + New Project... 新建项目... - - + + New Project File 新建项目文件 - + Ctrl+F12 Ctrl+F12 - + F1 F1 - + New GAS File 新建GNU汇编文件 - + GNU Assembler Manual GNU汇编器手册 - + x86 Assembly Language Reference Manual X86汇编语言参考手册 - + IA-32 Assembly Language Reference Manual IA32汇编语言参考手册 - + Add Watchpoint... 添加变量断点... - + Add a watchpoint that's triggered when it's modified. 添加一个变量断点。当该变量的值被改动时程序暂停。 - + New Text File 新建文本文件 - + Page Up 向上翻页 - + Page Down 向下翻页 - + Goto Line Start 跳转到行首 - + Goto Line End 跳转到行尾 - + Goto File Start 跳转倒文件开头 - + Goto File End 跳转到文件结尾 - + Page Up and Select 向上翻页并选中 - + Page Down and Select 向下翻页并选中 - + Goto Page Start 跳转到页首 - + Goto Page End 跳转到页尾 - + Goto Page Start and Select 跳转到行首并选中 - + Goto Page End and Select 跳转到页尾并选中 - + Goto Line Start and Select 跳转到行首并选中 - + Goto Line End and Select 跳转到行尾并选中 - + Goto File Start and Select 跳转到文件开头并选中 - + Goto File End and Select 跳转到文件结尾并选中 - + Close Others 关闭其他窗口 + + + OI Wiki + OI Wiki + + + + Turtle Graphics Tutorial + 海龟作图教程 + Close others 关闭其他窗口 - + Move Selection Up 向上移动选中的行 @@ -5407,132 +5417,132 @@ Are you really want to continue? 移动光标 - + Ctrl+Shift+Up Ctrl+Shift+Up - + Move Selection Down 向下移动选中的行 - + Ctrl+Shift+Down Ctrl+Shift+Down - + Convert to UTF-8 BOM 转换为UTF-8 BOM编码 - + Encode in UTF-8 BOM 使用UTF-8 BOM编码 - + Compiler Options... 编译器选项... - + Toggle Explorer Panel 切换管理器面板 - + Ctrl+F9 Ctrl+F9 - + Toggle Messages Panel 切换消息面板 - + Ctrl+F10 Ctrl+F10 - + Raylib Manual Raylib教程 - + Select Word 选中当前单词 - + Go to Line... 跳转到行... - + New Template... 新建模板... - + New Template from Project 从项目创建模板 - + Goto block start 跳转到代码段开始 - + Ctrl+Alt+Up Ctrl+Alt+Up - + Goto block end 跳转到代码段结束 - + Ctrl+Alt+Down Ctrl+Alt+Down - + Switch header/source 切换头文件/源文件 - + Switch Header/Source 切换头文件/源文件 - + Generate Assembly 生成汇编 - + Trim trailing spaces 删除行尾空格 - + Toggle Readonly 切换只读模式 - + Submit Issues 反馈与建议 - + Document 使用说明 @@ -5541,199 +5551,199 @@ Are you really want to continue? 保存为模板... - + New File 新建文件 - + Add to project... 添加到项目... - + Remove from project 从项目删除 - + View Makefile 查看Makefile - + Clean 清理构建文件 - + Open Folder in Explorer 在浏览器中打开 - + Open In Terminal 在终端中打开 - + About 关于 - - + + Rename Symbol 重命名符号 - + Shift+F6 Shift+F6 - + Print... 打印... - + Ctrl+P Ctrl+P - - + + Export As RTF 导出为RTF - - + + Export As HTML 导出为HTML - + Move To Other View 移动到其他视图 - + Ctrl+M Ctrl+M - - + + C++ Reference C++参考手册 - + C Reference C参考手册 - + Show Tool Panels 显示全部工具面板 - + Create Git Repository Create Repository 创建Git仓库 - + Commit 提交(Commit) - + Revert 撤销(Revert) - + Reset 回滚(Reset) - + Add Files 添加文件 - + Restore 还原(Restore) - + Website 官方网站 - + Branch/Switch 分支切换（Switch） - + Merge 合并（Merge） - - + + Show Log Log 显示日志(Log) - + Remotes... 远程仓库... - + Fetch 取回(Fetch) - + Pull 拉取(Pull) - + Push 推送(Push) - + Hide Non Support Files 隐藏不支持的文件 - + Toggle Block Comment 切换块注释 - + Alt+Shift+A Alt+Shift+A - + Match Bracket 匹配当前括号 - + Ctrl+] Ctrl+] @@ -5742,50 +5752,50 @@ Are you really want to continue? 工具窗口栏 - + Status Bar 状态栏 - + Ctrl+Backspace Ctrl+Backspace - + Interrupt 中断 - - + + Delete To Word Begin 删除到单词开头 - + Ctrl+Shift+B Ctrl+Shift+B - + Delete to Word End 删除到单词结尾 - + Ctrl+Shift+E Ctrl+Shift+E - + New Class... Add Class... 新建类... - - + + New Header... New Header 新建头文件... @@ -5795,47 +5805,47 @@ Are you really want to continue? 插入行 - + Delete Line 删除当前行 - + Ctrl+D Ctrl+D - + Duplicate Line 复制当前行 - + Ctrl+E Ctrl+E - + Delete Word 删除当前单词 - + Ctrl+Shift+D Ctrl+Shift+D - + Delete to EOL 删除到行尾 - + Ctrl+Del Ctrl+Del - + Delete to BOL 删除到行首 @@ -5844,27 +5854,27 @@ Are you really want to continue? C/C++参考 - + EGE Manual EGE图形库手册 - + Add Bookmark 添加书签 - + Remove Bookmark 删除书签 - + Modify Bookmark Description 修改书签说明 - + Locate in Files View 在文件视图中定位 @@ -5873,12 +5883,12 @@ Are you really want to continue? 打开文件夹 - + Running Parameters... 运行参数... - + File Encoding 文件编码 @@ -5888,32 +5898,32 @@ Are you really want to continue? 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5927,17 +5937,17 @@ Are you really want to continue? 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 @@ -5954,7 +5964,7 @@ Are you really want to continue? 确认 - + Source file is not compiled. 源文件尚未编译。 @@ -5971,39 +5981,39 @@ Are you really want to continue? 重新编译？ - - - - + + + + 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. 无法启动调试器 @@ -6024,33 +6034,33 @@ Are you really want to continue? 项目尚未构建。是否构建？ - + 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 请在调试前改正设置。 @@ -6059,8 +6069,8 @@ Are you really want to continue? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 @@ -6069,37 +6079,37 @@ 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 打开源代码文件 - - - + + + Correct compile settings for debug 纠正调试用编译设置 - - + + The generated executable won't have debug symbol infos, and can't be debugged. 生成的可执行文件中会缺少调试符号信息，因此无法编译。 @@ -6108,91 +6118,91 @@ Are you really want to continue? 如果你正在使用Release版的编译器设置集，请在工具栏中将其改为Debug版本。 - - - + + + Or you can manually change the following settings in the options dialog's compiler set page: 您也可以手动在选项对话框的编译器设置页中修正下列选项： - - - + + + - Turned on the "Generate debug info (-g3)" option. - 打开“生成调试信息(-g3)"选项. - - - + + + - Turned off the "Strip executable (-s)" option. - 关闭"剥除附加信息(-s)"选项. - - - + + + - Turned off the "Optimization level (-O)" option or set it to "Debug (-Og)". - 关闭"优化级别(-O)选项，或将其设置为"调试(-Og)"级别. - - - - + + + + You should recompile after change the compiler set or it's settings. 在更换编译器设置集或修改其设置后，需要重新编译. - - - + + + Do you want to mannually change the compiler set settings now? 您现在就要手动修改编译器设置集的设置吗？ - - + + 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已存在。是否覆盖？ - - - - - - + + + + + + Clear 清除 @@ -6208,7 +6218,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -6237,56 +6247,56 @@ Are you really want to continue? 项目已经被修改过，是否需要重新构建？ - + 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: 描述： @@ -6295,65 +6305,65 @@ 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 重命名 @@ -6366,22 +6376,22 @@ Are you really want to continue? 要现在去修改设置吗？ - + Rename Problem Set 修改试题集名称 - + Can't open last open information file '%1' for write! 无法写入配置文件'%1'。 - + Rename Problem 修改试题名称 - + Line: %1 Col: %2 Lines: %3 行: %1 列: %2 总行数: %3 @@ -6406,12 +6416,12 @@ Are you really want to continue? 是否现在去改正? - + Missing Project Files 项目文件缺失 - + The following files is missing, can't build the project: 下列项目文件缺失，无法构建项目: @@ -6428,186 +6438,187 @@ Are you really want to continue? 请取消该设置，重新编译然后重新启动调试。 - + Goto Url 跳转到试题网址 - + Add Problem Case 添加试题案例 - + 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 在文件资源管理器中打开 - + Character sets 字符集 - + Convert to %1 转换为%1编码 - + Newline 换行符 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 - + Watchpoint hitted 变量断点被触发 - + Value of "%1" has changed: "%1"的值发生了变化: - + New value: %1 新值: %1 - + Project folder removed. 项目文件夹被删除 - + Folder for project '%1' was removed. 项目"%1"的文件夹已被外部程序删除. - + It will be closed. 项目将被关闭. - + Save settings failed! 保存设置失败 - + Watchpoint variable name 被监控的变量 - + Stop execution when the following variable is modified (it must be visible from the currect scope): 当下面的变量被修改时暂停执行（该变量必须可以从当前程序处访问）： @@ -6616,17 +6627,17 @@ Are you really want to continue? 中止 - + FPS Problem Set Files (*.fps;*.xml) FPS试题集文件(*.fps;*.xml) - + FPS Problem Set Files (*.fps) FPS试题集文件(*.fps) - + Export Error 导出时出错 @@ -6636,7 +6647,7 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -6649,12 +6660,13 @@ Are you really want to continue? 无标题%1 - + + Do you really want to delete %1? 你真的要删除%1吗？ - + Do you really want to delete %1 files? 你真的要删除%1个文件吗？ @@ -6667,7 +6679,7 @@ Are you really want to continue? 变量"%1"有改动： - + Old value: %1 旧值: %1 @@ -6676,65 +6688,65 @@ Are you really want to continue? 新值: %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? 你真的想要那么做吗？ @@ -6744,12 +6756,12 @@ Are you really want to continue? 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) @@ -6758,78 +6770,78 @@ 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'? @@ -6838,28 +6850,28 @@ Are you really want to continue? 正在删除试题... - + 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 选择期望输出文件 @@ -6869,61 +6881,61 @@ Are you really want to continue? 第%1行 - - - + + + 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! 提交信息不能为空！ @@ -6932,22 +6944,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? 同时从硬盘上删除文件？ @@ -6956,27 +6968,27 @@ Are you really want to continue? 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 @@ -6993,12 +7005,12 @@ Are you really want to continue? 请在工具栏中选择Debug编译器配置集，或者在“编译器配置集”设置的“编译/链接选项”页中<b>启用</b>“生成调试信息(-g3)”、<b>禁用</b>“剥除附件信息(-3)”。 - + C/C++ Source Files (*.c *.cpp *.cc *.cxx) C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + This operation will remove all cases for the current problem. 本操作会删除此试题的所有案例。 @@ -7007,7 +7019,7 @@ Are you really want to continue? 调试失败 - + The executable doesn't have symbol table, and can't be debugged. 可执行文件中没有符号表信息，无法调试。 @@ -7032,88 +7044,88 @@ Are you really want to continue? 您也可以删除所有断点，打开“CPU信息窗口”，然后调试汇编代码。 - + Failed to generate the executable. 未能生成可执行文件。 - + Please check detail info in "Tools Output" panel. 请查看“工具输出”面板中的详细信息。 - + 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 @@ -7124,14 +7136,14 @@ Are you really want to continue? - - - - - - - - + + + + + + + + Error 错误 @@ -7141,13 +7153,13 @@ Are you really want to continue? 项目历史 - + Load Theme Error 载入主题失败 - - + + Clear History 清除历史 @@ -7156,8 +7168,8 @@ Are you really want to continue? 编译生成的可执行文件中没有符号表，无法被调试。 - - + + Version Control 版本控制 @@ -7166,87 +7178,87 @@ Are you really want to continue? 请在工具栏中选用Debug编译器配置集，或者在选项对话框的编辑器配置集页中勾选“生成调试信息(-g3)"选项。 - + 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 确认转换 - - - + + + If you are using the Release compiler set, please use choose the Debug version from toolbar. 如果你正在使用Release版的编译器设置集，请在工具栏中将其改为Debug版本。 - - - - + + + + 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个文件） @@ -7254,17 +7266,17 @@ Are you really want to continue? MemoryModel - + addr: %1 地址: %1 - + dec: %1 十进制: %1 - + oct: %1 八进制: %1 @@ -7273,12 +7285,12 @@ Are you really want to continue? 16进制: %1 - + bin: %1 二进制: %1 - + ascii: '%1' ASCII字符: '%1' @@ -7684,105 +7696,105 @@ Are you really want to continue? 无法保存文件'%1'. - + Error Load File 载入文件错误 - - + + Error 错误 - + Can't create folder %1 无法创建文件夹%1 - + Warning 警告 - - + + Can't save file %1 无法保存文件%1 - + 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'。 - + Headers 头文件 - + Sources 源文件 - + Others 其他文件 - + 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++编辑器开发 @@ -8304,32 +8316,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' @@ -8587,13 +8599,13 @@ Are you really want to continue? QObject - + Save 保存 - + Save changes to %1? 将修改保存到"%1"？ @@ -9032,12 +9044,10 @@ Are you really want to continue? 删不掉颜色配置文件%1! - Assembler - 汇编 + 汇编 - @@ -9343,31 +9353,31 @@ Are you really want to continue? RegisterModel - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + 64-bit 64位 @@ -9376,22 +9386,22 @@ Are you really want to continue? 累加器 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + General purpose 通用 @@ -9400,94 +9410,33 @@ Are you really want to continue? 指令 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + 32-bit 32位 - - - - - - - - - - - - - - - - - - lower 16 bits of %1 - %1的低16位 - - - - - - - - - - - - - - - - - - - lower 8 bits of %1 - %1的低8位 - - - - - - - 8 high bits of lower 16 bits of %1 - %1的低16位数据中的高8位 - - - - - - - - - 16-bit - 16位 - - - 8 high bits of lower 16 bits - 低16位的高8位 - - - Media - 媒体 - - + + + + + + @@ -9499,148 +9448,14 @@ Are you really want to continue? - + lower 16 bits of %1 + %1的低16位 + + - 128-bit - 128位 - - - - Floating-point control - 浮点运算控制 - - - - - Accumulator for operands and results data - 操作数和结果的累加器 - - - - - Pointer to data in the DS segment - 指向DS段中数据的指针 - - - - - Counter for string and loop operations - 字符串和循环操作计数器 - - - - - I/O pointer - I/O指针 - - - - - Source index for string operations; Pointer to data in the segment pointed to by the DS register - 字符串操作来源下标；指向DS段中数据的指针 - - - - - Destination index for string operations; Pointer to data (or destination) in the segment pointed to by the ES register - 字符串操作目的下标；指向ES段中数据（或目标）的指针 - - - - - Stack pointer (in the SS segment) - 栈指针(在SS段中) - - - - - Pointer to data on the stack (in the SS segment) - 指向（SS段中）栈内数据的指针 - - - - - Instruction pointer - 指令指针 - - - - - Flags - 标志 - - - - Code segment selector - 代码段选择器 - - - - Data segment selector - 数据段选择器 - - - - - - Extra data segment selector - 额外的数据段选择器 - - - - Stack segment selector - 栈段选择器 - - - - - - - - - - - Floating-point data - 浮点运算数据 - - - - Floating-point status - 浮点运算状态 - - - - Floating-point tag word - 浮点运算标签word - - - - Floating-point operation - 浮点运算操作 - - - - Floating-point last instruction segment - 浮点运算上次指令段 - - - - Floating-point last instruction offset - 浮点运算上次指令位移 - - - - Floating-point last operand segment - 浮点运算上次操作数段 - - - - Floating-point last operand offset - 浮点运算上次操作数位移 - - + @@ -9653,24 +9468,219 @@ Are you really want to continue? - + lower 8 bits of %1 + %1的低8位 + + + + + 8 high bits of lower 16 bits of %1 + %1的低16位数据中的高8位 + + + + + + + + + 16-bit + 16位 + + + 8 high bits of lower 16 bits + 低16位的高8位 + + + Media + 媒体 + + + + + + + + + + + + + + + + + + 128-bit + 128位 + + + + Floating-point control + 浮点运算控制 + + + + + Accumulator for operands and results data + 操作数和结果的累加器 + + + + + Pointer to data in the DS segment + 指向DS段中数据的指针 + + + + + Counter for string and loop operations + 字符串和循环操作计数器 + + + + + I/O pointer + I/O指针 + + + + + Source index for string operations; Pointer to data in the segment pointed to by the DS register + 字符串操作来源下标；指向DS段中数据的指针 + + + + + Destination index for string operations; Pointer to data (or destination) in the segment pointed to by the ES register + 字符串操作目的下标；指向ES段中数据（或目标）的指针 + + + + + Stack pointer (in the SS segment) + 栈指针(在SS段中) + + + + + Pointer to data on the stack (in the SS segment) + 指向（SS段中）栈内数据的指针 + + + + + Instruction pointer + 指令指针 + + + + + Flags + 标志 + + + + Code segment selector + 代码段选择器 + + + + Data segment selector + 数据段选择器 + + + + + + Extra data segment selector + 额外的数据段选择器 + + + + Stack segment selector + 栈段选择器 + + + + + + + + + + + Floating-point data + 浮点运算数据 + + + + Floating-point status + 浮点运算状态 + + + + Floating-point tag word + 浮点运算标签word + + + + Floating-point operation + 浮点运算操作 + + + + Floating-point last instruction segment + 浮点运算上次指令段 + + + + Floating-point last instruction offset + 浮点运算上次指令位移 + + + + Floating-point last operand segment + 浮点运算上次操作数段 + + + + Floating-point last operand offset + 浮点运算上次操作数位移 + + + + + + + + + + + + + + + + + 256-bit 256位 - + SSE status and control SSE状态和控制 - + Register 寄存器 - + Value 值 @@ -10331,18 +10341,18 @@ Are you really want to continue? 性能 - - - - + + + + Compiler Set 编译器配置集 - - + + Compiler @@ -10354,7 +10364,7 @@ Are you really want to continue? 自动链接 - + @@ -10430,15 +10440,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 @@ -10497,8 +10507,8 @@ Are you really want to continue? 项目选项 - - + + @@ -10978,14 +10988,14 @@ Are you really want to continue? JSON文件'%1':%2中存在错误：%3 - - + + Execute to evaluate 执行以求值 - - + + Not Valid 在当前作用域中无效 @@ -10994,17 +11004,17 @@ Are you really want to continue? 无法读取文件'%1'. - + Expression 表达式 - + Type 类型 - + Value 值 diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index 8a691785..6e300caf 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -4996,6 +4996,14 @@ Close Others + + OI Wiki + + + + Turtle Graphics Tutorial + + MemoryModel @@ -5986,10 +5994,6 @@ Can't remove the color scheme file %1! - - Assembler - - Syntax diff --git a/platform/windows/templates/Graphics/CL_Graphics.ico b/platform/windows/templates/Graphics/CL_Graphics.ico deleted file mode 100644 index 3749cee3..00000000 Binary files a/platform/windows/templates/Graphics/CL_Graphics.ico and /dev/null differ diff --git a/platform/windows/templates/Graphics/info.template b/platform/windows/templates/Graphics/info.template index c3fe249f..95071725 100644 --- a/platform/windows/templates/Graphics/info.template +++ b/platform/windows/templates/Graphics/info.template @@ -1,7 +1,8 @@ [Template] ver=2 Name=Graphics.h -Icon=CL_Graphics.ico +Name[zh_CN]=xege +Icon=xege.ico Description=A simple program use Easy Graphics Engine Description[zh_CN]=使用EGE库的简单绘图程序 Category=Multimedia diff --git a/platform/windows/templates/Graphics/xege.ico b/platform/windows/templates/Graphics/xege.ico new file mode 100644 index 00000000..7753baee Binary files /dev/null and b/platform/windows/templates/Graphics/xege.ico differ