From b18b4315464c2bf683dca69bcea2a8467ff16de1 Mon Sep 17 00:00:00 2001 From: XY0797 <98995022+XY0797@users.noreply.github.com> Date: Thu, 22 Feb 2024 10:29:01 +0800 Subject: [PATCH 1/5] enhancement: Limit font size to no less than 5 (#208) Co-authored-by: xy --- RedPandaIDE/settingsdialog/environmentappearancewidget.ui | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RedPandaIDE/settingsdialog/environmentappearancewidget.ui b/RedPandaIDE/settingsdialog/environmentappearancewidget.ui index d0788d2c..ad32a36b 100644 --- a/RedPandaIDE/settingsdialog/environmentappearancewidget.ui +++ b/RedPandaIDE/settingsdialog/environmentappearancewidget.ui @@ -95,7 +95,11 @@ 0 - + + + 5 + + From 77bca7fd78a64528f0cb90f5bc700be49adcc7e6 Mon Sep 17 00:00:00 2001 From: XY0797 <98995022+XY0797@users.noreply.github.com> Date: Thu, 22 Feb 2024 10:30:41 +0800 Subject: [PATCH 2/5] fix: Fixed the issue of missing Chinese translation in the 'invalid file name' window after renaming files (#207) Co-authored-by: xy --- RedPandaIDE/mainwindow.cpp | 4 + RedPandaIDE/translations/RedPandaIDE_pt_BR.ts | 7 + RedPandaIDE/translations/RedPandaIDE_zh_CN.ts | 744 +++++++++--------- RedPandaIDE/translations/RedPandaIDE_zh_TW.ts | 7 + 4 files changed, 394 insertions(+), 368 deletions(-) diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 25a225cb..7e13ac37 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -103,6 +103,10 @@ #include #endif +static const char *Translation[] = +{ + QT_TRANSLATE_NOOP("QFileSystemModel", "The name \"%1\" cannot be used.

Try using another name, with fewer characters or no punctuation marks.") +}; static int findTabIndex(QTabWidget* tabWidget , QWidget* w) { for (int i=0;icount();i++) { diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index c4f29434..c1f9e754 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -6476,6 +6476,13 @@ Configurações + + QFileSystemModel + + <b>The name "%1" cannot be used.</b><p>Try using another name, with fewer characters or no punctuation marks. + + + QObject diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index a4b058df..28d86d1d 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -4472,18 +4472,18 @@ p, li { white-space: pre-wrap; } MainWindow - + Red Panda C++ 小熊猫C++ - - + - - + + + Issues 编译器 @@ -4557,7 +4557,7 @@ p, li { white-space: pre-wrap; } - + Debug Console 调试主控台 @@ -4633,7 +4633,7 @@ p, li { white-space: pre-wrap; } 工具栏2 - + New 新建 @@ -4766,9 +4766,9 @@ p, li { white-space: pre-wrap; } - - - + + + Copy 复制 @@ -4779,7 +4779,7 @@ p, li { white-space: pre-wrap; } - + Paste 粘贴 @@ -4790,8 +4790,8 @@ p, li { white-space: pre-wrap; } - - + + Select All 选择全部 @@ -4915,38 +4915,38 @@ p, li { white-space: pre-wrap; } - - + + New Problem Set 新建试题集 - + Add Problem 添加试题 - + Remove Problem 删除试题 - - + + Save Problem Set 保存试题集 - - + + Load Problem Set 载入试题集 @@ -4994,7 +4994,7 @@ p, li { white-space: pre-wrap; } - + Remove Problem Case Remove Problem Set 删除试题案例 @@ -5002,21 +5002,21 @@ p, li { white-space: pre-wrap; } - + Open Anwser Source File 打开答案源代码文件 - + Run All Cases Run Current Case 运行所有案例 - + Problem Cases Validation Options 测试案例验证选项 @@ -5076,15 +5076,15 @@ p, li { white-space: pre-wrap; } - - + + Import FPS Problem Set 导入FPS试题集 - - + + Export FPS Problem Set 导出FPS试题集 @@ -5335,7 +5335,7 @@ p, li { white-space: pre-wrap; } - + Clear all breakpoints 删除所有断点 @@ -5699,7 +5699,7 @@ p, li { white-space: pre-wrap; } 保存为模板... - + New File 新建文件 @@ -5740,7 +5740,7 @@ p, li { white-space: pre-wrap; } - + Rename Symbol 重命名符号 @@ -5761,13 +5761,13 @@ p, li { white-space: pre-wrap; } - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -6036,42 +6036,42 @@ p, li { white-space: pre-wrap; } 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -6085,17 +6085,17 @@ p, li { white-space: pre-wrap; } 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 @@ -6112,7 +6112,7 @@ p, li { white-space: pre-wrap; } 确认 - + Source file is not compiled. 源文件尚未编译。 @@ -6129,39 +6129,39 @@ p, li { white-space: pre-wrap; } 重新编译？ - - - - + + + + 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. 无法启动调试器 @@ -6182,33 +6182,33 @@ p, li { white-space: pre-wrap; } 项目尚未构建。是否构建？ - + 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 请在调试前改正设置。 @@ -6217,8 +6217,8 @@ p, li { white-space: pre-wrap; } 重新编译？ - - + + Save last open info error 保存上次打开信息失败 @@ -6227,37 +6227,37 @@ p, li { white-space: pre-wrap; } 无法删除旧上次打开信息文件'%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. 生成的可执行文件中会缺少调试符号信息，因此无法编译。 @@ -6265,82 +6265,82 @@ p, li { white-space: pre-wrap; } If you are using the Release compiler set, please use the Debug compiler set instead. 如果你正在使用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)"选项. + Or you can manually change the following settings in the options dialog's compiler set page: + 您也可以手动在选项对话框的编译器设置页中修正下列选项： - - Turned off the "Optimization level (-O)" option or set it to "Debug (-Og)". - - 关闭"优化级别(-O)选项，或将其设置为"调试(-Og)"级别. + - Turned on the "Generate debug info (-g3)" option. + - 打开“生成调试信息(-g3)"选项. - - You should recompile after change the compiler set or it's settings. - 在更换编译器设置集或修改其设置后，需要重新编译. + - 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已存在。是否覆盖？ @@ -6348,25 +6348,25 @@ p, li { white-space: pre-wrap; } - - - + + + Clear 清除 - + Export 导出 - + Insert Snippet 插入代码段 - - + + Problem Set %1 试题集%1 @@ -6395,56 +6395,56 @@ p, li { white-space: pre-wrap; } 项目已经被修改过，是否需要重新构建？ - + 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: 描述： @@ -6453,70 +6453,70 @@ p, li { white-space: pre-wrap; } 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove All Breakpoints Remove all breakpoints 删除所有断点 - + Line: %1 Col: %2 Sel:%3 Lines: %4 行: %1 列: %2 选中:%3 总行数: %4 - + Remove Breakpoint 删除当前断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - - + + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 @@ -6529,22 +6529,22 @@ p, li { white-space: pre-wrap; } 要现在去修改设置吗？ - + 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 @@ -6569,12 +6569,12 @@ p, li { white-space: pre-wrap; } 是否现在去改正? - + Missing Project Files 项目文件缺失 - + The following files is missing, can't build the project: 下列项目文件缺失，无法构建项目: @@ -6591,202 +6591,202 @@ p, li { white-space: pre-wrap; } 请取消该设置，重新编译然后重新启动调试。 - + 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! 保存设置失败 - + Folder Not Empty 文件夹非空 - + The project folder is not empty, existing files may be overwritten. 项目文件夹不是空的，已有的文件可能会被覆盖。 - + Do you want to proceed? 您确定要继续吗？ - + Watchpoint variable name 被监控的变量 - + Stop execution when the following variable is modified (it must be visible from the currect scope): 当下面的变量被修改时暂停执行（该变量必须可以从当前程序处访问）： @@ -6795,17 +6795,17 @@ p, li { white-space: pre-wrap; } 中止 - + FPS Problem Set Files (*.fps;*.xml) FPS试题集文件(*.fps;*.xml) - + FPS Problem Set Files (*.fps) FPS试题集文件(*.fps) - + Export Error 导出时出错 @@ -6815,7 +6815,7 @@ p, li { white-space: pre-wrap; } C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -6828,13 +6828,13 @@ p, li { white-space: pre-wrap; } 无标题%1 - - + + Do you really want to delete %1? 你真的要删除%1吗？ - + Do you really want to delete %1 files? 你真的要删除%1个文件吗？ @@ -6847,7 +6847,7 @@ p, li { white-space: pre-wrap; } 变量"%1"有改动： - + Old value: %1 旧值: %1 @@ -6856,63 +6856,63 @@ p, li { white-space: pre-wrap; } 新值: %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? 你真的想要那么做吗？ @@ -6921,12 +6921,12 @@ p, li { white-space: pre-wrap; } 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) @@ -6935,78 +6935,78 @@ p, li { white-space: pre-wrap; } 无标题%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'? @@ -7015,28 +7015,28 @@ p, li { white-space: pre-wrap; } 正在删除试题... - + 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 选择期望输出文件 @@ -7048,59 +7048,59 @@ p, li { white-space: pre-wrap; } - + 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! 提交信息不能为空！ @@ -7109,22 +7109,22 @@ p, li { white-space: pre-wrap; } 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Remove file 删除文件 - + Remove the file from disk? 同时从硬盘上删除文件？ @@ -7133,27 +7133,27 @@ p, li { white-space: pre-wrap; } 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 @@ -7170,12 +7170,12 @@ p, li { white-space: pre-wrap; } 请在工具栏中选择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. 本操作会删除此试题的所有案例。 @@ -7184,7 +7184,7 @@ p, li { white-space: pre-wrap; } 调试失败 - + The executable doesn't have symbol table, and can't be debugged. 可执行文件中没有符号表信息，无法调试。 @@ -7209,123 +7209,123 @@ p, li { white-space: pre-wrap; } 您也可以删除所有断点，打开“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 - - - - - - - - - - - - - - + + + + + + + + + + + + + + Error 错误 - + Recent Projects 项目历史 - - + + Load Theme Error 载入主题失败 - - + + Clear History 清除历史 @@ -7334,8 +7334,8 @@ p, li { white-space: pre-wrap; } 编译生成的可执行文件中没有符号表，无法被调试。 - - + + Version Control 版本控制 @@ -7344,61 +7344,61 @@ p, li { white-space: pre-wrap; } 请在工具栏中选用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 确认转换 - + Exact 完全一致 - + Ignore leading/trailing spaces 忽略行首/行尾空格 - + Ignore spaces 忽略多余空格 @@ -7407,43 +7407,43 @@ p, li { white-space: pre-wrap; } 行: %1 列: %2 (%3个字符) 总行数: %4 - - - + + + 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个文件） @@ -8844,17 +8844,25 @@ p, li { white-space: pre-wrap; } 编译/链接选项 + + QFileSystemModel + + + <b>The name "%1" cannot be used.</b><p>Try using another name, with fewer characters or no punctuation marks. + <b>文件名 "%1" 无法被使用！</b><p>可能是重名、过长、为空或者是使用了不能出现在文件名里的符号。 + + QObject - + Save 保存 - + Save changes to %1? 将修改保存到"%1"？ @@ -10862,18 +10870,18 @@ p, li { white-space: pre-wrap; } 性能 - - - - + + + + Compiler Set 编译器配置集 - - + + Compiler @@ -10885,7 +10893,7 @@ p, li { white-space: pre-wrap; } 自动链接 - + @@ -10961,15 +10969,15 @@ p, li { white-space: pre-wrap; } 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 @@ -11028,8 +11036,8 @@ p, li { white-space: pre-wrap; } 项目选项 - - + + diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index b861fc7c..571ddac6 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -6120,6 +6120,13 @@ + + QFileSystemModel + + <b>The name "%1" cannot be used.</b><p>Try using another name, with fewer characters or no punctuation marks. + + + QObject From 5ada4b6e4be87a205e5fc7d80102b83c58178ea0 Mon Sep 17 00:00:00 2001 From: Cyano Hao Date: Thu, 22 Feb 2024 10:31:07 +0800 Subject: [PATCH 3/5] Fix deb rules compatibility (#206) * workaround debian 10 and ubuntu 20.04 * add more Debian/Ubuntu to CI --- .github/workflows/build.yml | 51 ++++++++++++++++++++++++++----------- packages/debian/rules | 6 +++-- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dff87b81..d66eb51c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -172,21 +172,17 @@ jobs: name: Windows MSVC ARM64EC (do not use) path: pkg/ - deb: - name: Deb + debian: + name: Debian strategy: matrix: - image: - - "debian:10" # oldest LTS - - "ubuntu:23.10" # latest stable - - "debian:sid" # rolling + arch: [amd64, i386] + version: ["10", "11", "12", sid] include: - - image: debian:10 - displayImage: debian-10 - - image: ubuntu:23.10 - displayImage: ubuntu-23.10 - - image: debian:sid - displayImage: debian-sid + - arch: amd64 + platform: linux/amd64 + - arch: i386 + platform: linux/386 runs-on: ubuntu-latest @@ -195,16 +191,41 @@ jobs: - name: Fetch container image run: | - podman pull --platform linux/amd64 docker.io/amd64/${{ matrix.image }} + podman pull --platform ${{ matrix.platform }} docker.io/${{ matrix.arch }}/debian:${{ matrix.version }} - name: Build run: | - podman run --rm -e SOURCE_DIR=/src -v $GITHUB_WORKSPACE:/src --platform linux/amd64 ${{ matrix.image }} /src/packages/debian/01-in-docker.sh + podman run --rm -e SOURCE_DIR=/src -v $GITHUB_WORKSPACE:/src --platform linux/amd64 debian:${{ matrix.version }} /src/packages/debian/01-in-docker.sh - name: Upload uses: actions/upload-artifact@v2 with: - name: Deb - image=${{ matrix.displayImage }} + name: Debian ${{ matrix.version }} ${{ matrix.arch }} + path: dist/*.deb + + ubuntu: + name: Ubuntu + strategy: + matrix: + version: ["20.04", "22.04", "23.10", "devel"] + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Fetch container image + run: | + podman pull --platform linux/amd64 docker.io/amd64/ubuntu:${{ matrix.version }} + + - name: Build + run: | + podman run --rm -e SOURCE_DIR=/src -v $GITHUB_WORKSPACE:/src --platform linux/amd64 ubuntu:${{ matrix.version }} /src/packages/debian/01-in-docker.sh + + - name: Upload + uses: actions/upload-artifact@v2 + with: + name: Ubuntu ${{ matrix.version }} amd64 path: dist/*.deb archlinux: diff --git a/packages/debian/rules b/packages/debian/rules index acc5757b..11d20c39 100755 --- a/packages/debian/rules +++ b/packages/debian/rules @@ -11,7 +11,8 @@ ifeq ($(DEB_HOST_ARCH), amd64) MINGW_UTF8_OBJS = x86_64-w64-mingw32/utf8init.o i686-w64-mingw32/utf8init.o x86_64-w64-mingw32/utf8manifest.o i686-w64-mingw32/utf8manifest.o -execute_after_dh_auto_build: $(MINGW_UTF8_OBJS) +override_dh_auto_build: $(MINGW_UTF8_OBJS) + dh_auto_build -O--buildsystem qmake x86_64-w64-mingw32/utf8init.o: platform/windows/utf8/utf8init.cpp mkdir -p $(dir $@) @@ -29,7 +30,8 @@ i686-w64-mingw32/utf8manifest.o: platform/windows/utf8/utf8manifest.rc mkdir -p $(dir $@) i686-w64-mingw32-windres -O coff -o $@ $< -execute_after_dh_install: +override_dh_auto_install: + dh_auto_install -O--buildsystem=qmake dh_install debian/compiler_hint.lua usr/libexec/RedPandaCPP dh_install x86_64-w64-mingw32/* usr/libexec/RedPandaCPP/x86_64-w64-mingw32 dh_install i686-w64-mingw32/* usr/libexec/RedPandaCPP/i686-w64-mingw32 From 764c8cce8c7e1a96898637ef70e4070fba56ae38 Mon Sep 17 00:00:00 2001 From: XY0797 <98995022+XY0797@users.noreply.github.com> Date: Thu, 22 Feb 2024 14:19:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E6=96=87=E4=BB=B6=E6=97=A0=E6=B3=95=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=8A=B6=E6=80=81=E5=92=8C=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E7=8A=B6=E6=80=81=E7=9A=84BUG=20(#204)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Fixed a bug where newly created files would not automatically enter rename mode. * fix: Resolved an issue where files could not be selected in certain cases upon creation. --------- Co-authored-by: xy --- RedPandaIDE/mainwindow.cpp | 17 +++++++++++------ RedPandaIDE/mainwindow.h | 1 + 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 7e13ac37..401a7d63 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -4437,15 +4437,17 @@ void MainWindow::onShowInsertCodeSnippetMenu() void MainWindow::onFilesViewCreateFolderFolderLoaded(const QString& path) { - if (mFilesViewNewCreatedFolder.isEmpty()) + if (mFilesViewNewCreatedFolder.isEmpty() && mFilesViewNewCreatedFile.isEmpty()) return; - if (path!=extractFilePath(mFilesViewNewCreatedFolder)) + if (path!=extractFilePath(mFilesViewNewCreatedFolder) && path!=extractFilePath(mFilesViewNewCreatedFile)) return; disconnect(&mFileSystemModel,&QFileSystemModel::directoryLoaded, this,&MainWindow::onFilesViewCreateFolderFolderLoaded); - QModelIndex newIndex = mFileSystemModel.index(mFilesViewNewCreatedFolder); + + QModelIndex newIndex = mFileSystemModel.index(mFilesViewNewCreatedFolder.isEmpty() ? mFilesViewNewCreatedFile : mFilesViewNewCreatedFolder); + if (newIndex.isValid()) { ui->treeFiles->setCurrentIndex(newIndex); ui->treeFiles->edit(newIndex); @@ -4503,7 +4505,6 @@ void MainWindow::onFilesViewCreateFile() dir = QDir(mFileSystemModel.fileInfo(index).absoluteFilePath()); else dir = mFileSystemModel.fileInfo(index).absoluteDir(); - ui->treeFiles->expand(index); } else { dir = mFileSystemModel.rootDirectory(); } @@ -4525,8 +4526,12 @@ void MainWindow::onFilesViewCreateFile() // workaround: try create but do not truncate file.open(QFile::ReadWrite); #endif - QModelIndex newIndex = mFileSystemModel.index(fileName); - ui->treeFiles->setCurrentIndex(newIndex); + file.close(); + QModelIndex newIndex = mFileSystemModel.index(dir.filePath(fileName)); + connect(&mFileSystemModel,&QFileSystemModel::directoryLoaded, + this,&MainWindow::onFilesViewCreateFolderFolderLoaded); + ui->treeFiles->expand(index); + mFilesViewNewCreatedFile=mFileSystemModel.filePath(newIndex); } diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index 38243840..fe5ce1ee 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -906,6 +906,7 @@ private: QString mClassBrowserCurrentStatement; QString mFilesViewNewCreatedFolder; + QString mFilesViewNewCreatedFile; bool mCheckSyntaxInBack; bool mShouldRemoveAllSettings; From 556e5fad962083890ccc533660a453e826647fa4 Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Thu, 22 Feb 2024 14:47:49 +0800 Subject: [PATCH 5/5] update version number and NEWS.md --- NEWS.md | 6 ++++++ RedPandaIDE/RedPandaIDE.pro | 2 +- Red_Panda_CPP.pro | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 6b722e30..b1299659 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +Red Panda C++ Version 2.27 + + - enhancement: New chinese translation for invalid filename messagebox. (by XY0797@github.com) + - enhancement: Limit the minimum font size in options dialog to 5. (by XY0797@github.com) + - enhancement: After a new file is created in filesystem panel, auto select and rename it. (by XY0797@github.com) + Red Panda C++ Version 2.26 - enhancement: Code suggestion for embedded std::vectors. - change: Use ctrl+mouseMove event to highlight jumpable symbols (instead of ctrl+tooltip). diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro index ee02c1ac..8439cd22 100644 --- a/RedPandaIDE/RedPandaIDE.pro +++ b/RedPandaIDE/RedPandaIDE.pro @@ -15,7 +15,7 @@ CONFIG += ENABLE_SDCC APP_NAME = RedPandaCPP -APP_VERSION = 2.26 +APP_VERSION = 2.27 # TEST_VERSION = beta2 system(git rev-list HEAD --count): TEST_VERSION = $$system(git rev-list HEAD --count) diff --git a/Red_Panda_CPP.pro b/Red_Panda_CPP.pro index 47212503..6ae1fd32 100644 --- a/Red_Panda_CPP.pro +++ b/Red_Panda_CPP.pro @@ -21,7 +21,7 @@ qsynedit.depends = redpanda_qt_utils APP_NAME = RedPandaCPP -APP_VERSION = 2.26 +APP_VERSION = 2.27 win32: { SUBDIRS += \