diff --git a/NEWS.md b/NEWS.md index 4ce700e9..5ff6f0af 100644 --- a/NEWS.md +++ b/NEWS.md @@ -21,6 +21,8 @@ Red Panda C++ Version 1.0.0 - fix: correctly reset caret when redo cut with no selection - enhancement: close editor when middle button clicked on it's title tab - fix: error when insert text in column mode + - fix: error when delete contents in column mode on lines that has wide-chars + - fix: error when create folder in files view Red Panda C++ Version 0.14.5 - fix: the "gnu c++ 20" option in compiler set options is wrong diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index c919c8e4..e2dcb9e4 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -3781,18 +3781,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - + + + + + Issues 编译器 @@ -3866,7 +3866,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -4000,8 +4000,8 @@ Are you really want to continue? - - + + Compile 编译 @@ -4063,9 +4063,9 @@ Are you really want to continue? - - - + + + Copy 复制 @@ -4076,7 +4076,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -4087,8 +4087,8 @@ Are you really want to continue? - - + + Select All 选择全部 @@ -4208,14 +4208,14 @@ Are you really want to continue? - + Problem Set 试题集 - + New Problem Set 新建试题集 @@ -4234,14 +4234,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -4277,7 +4277,7 @@ Are you really want to continue? - + Problem 试题 @@ -4580,7 +4580,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -4681,7 +4681,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -4702,13 +4702,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -4977,7 +4977,7 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 @@ -4987,32 +4987,32 @@ Are you really want to continue? 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5021,178 +5021,178 @@ 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 覆写 - + Close project 关闭项目 - + Are you sure you want to close %1? 你确定要关闭'%1'吗? - - + + Confirm 确认 - - - + + + Source file is not compiled. 源文件尚未编译。 - - + + Compile now? 现在编译? - - + + Source file is more recent than executable. 源文件比可执行程序新。 - + Recompile now? 重新编译? - + 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'不存在。 - + Recompile? 重新编译? - - + + Save last open info error 保存上次打开信息失败 - + Can't remove old last open information file '%1' 无法删除旧上次打开信息文件'%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 打开源代码文件 - + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 - - - + + + Clear 清除 @@ -5208,7 +5208,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -5229,68 +5229,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: 描述: @@ -5299,375 +5299,379 @@ 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 重命名 - + Remove Folder 删除文件夹 - + Switch to normal view 切换为普通视图 - + Switch to custom view 切换为自定义视图 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - - - + + New Folder 新建文件夹 - - - - + + + + Delete 删除 - + Open in Editor 在编辑器中打开 - + Open in External Program 使用外部程序打开 - + Open in Terminal 在终端中打开 - + Open in Windows Explorer 在Windows浏览器中打开 - + Character sets 字符集 - + Convert to %1 - 转换为%1编码 + 转换为%1编码 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 - + C/C++Source Files (*.c *.cpp *.cc *.cxx) C/C++Source Files (*.c *.cpp *.cc *.cxx C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + + New Folder %1 + 新建文件夹%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? 你真的想要做那些吗? - + 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 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! 提交信息不能为空! @@ -5676,125 +5680,125 @@ Are you really want to continue? 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Remove file 删除文件 - + Remove the file from disk? 同时从硬盘上删除文件? - + untitled 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名: - + File Already Exists! 文件已存在! - + File '%1' already exists! 文件'%1'已经存在! - + Add to project 添加到项目 - + 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 @@ -5805,15 +5809,15 @@ Are you really want to continue? - - - - - - - - - + + + + + + + + + Error 错误 @@ -5823,94 +5827,94 @@ 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个文件) @@ -8053,7 +8057,7 @@ Are you really want to continue? 自动链接 - + @@ -8129,15 +8133,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 2d7a6f6f..42c8fb57 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -3595,11 +3595,13 @@ void MainWindow::onFilesViewCreateFolder() { QModelIndex index = ui->treeFiles->currentIndex(); QDir dir; - if (index.isValid()) { + if (index.isValid() + && ui->treeFiles->selectionModel()->isSelected(index)) { if (mFileSystemModel.isDir(index)) dir = QDir(mFileSystemModel.fileInfo(index).absoluteFilePath()); else dir = mFileSystemModel.fileInfo(index).absoluteDir(); + ui->treeFiles->expand(index); } else { dir = mFileSystemModel.rootDirectory(); } @@ -3607,9 +3609,9 @@ void MainWindow::onFilesViewCreateFolder() int count = 0; while (dir.exists(folderName)) { count++; - folderName = tr("New Folder").arg(count); + folderName = tr("New Folder %1").arg(count); } - mFileSystemModel.mkdir(index,folderName); + dir.mkdir(dir.filePath(folderName)); } void MainWindow::onFilesViewRemoveFiles() diff --git a/RedPandaIDE/qsynedit/SynEdit.cpp b/RedPandaIDE/qsynedit/SynEdit.cpp index 0d88c8bb..05ff4cf2 100644 --- a/RedPandaIDE/qsynedit/SynEdit.cpp +++ b/RedPandaIDE/qsynedit/SynEdit.cpp @@ -5324,65 +5324,65 @@ int SynEdit::insertTextByNormalMode(const QString &Value) return Result; } -int SynEdit::insertTextByColumnMode(const QString &Value, bool AddToUndoList) +int SynEdit::insertTextByColumnMode(const QString &value, bool addToUndoList) { - QString Str; - QString TempString; - int Start; - int P; - int Len; - int InsertCol; - BufferCoord LineBreakPos; - int Result = 0; + QString str; + QString tempString; + int start; + int p; + int len; + int insertCol; + BufferCoord lineBreakPos; + int result = 0; // Insert string at current position - InsertCol = charToColumn(mCaretY,mCaretX); - Start = 0; + insertCol = charToColumn(mCaretY,mCaretX); + start = 0; do { - P = GetEOL(Value,Start); - if (P != Start) { - Str = Value.mid(Start,P-Start); + p = GetEOL(value,start); + if (p != start) { + str = value.mid(start,p-start); // Move(Start^, Str[1], P - Start); if (mCaretY > mLines->count()) { - Result++; - TempString = QString(InsertCol - 1,' ') + Str; + result++; + tempString = QString(insertCol - 1,' ') + str; mLines->add(""); - if (AddToUndoList) { - LineBreakPos.Line = mCaretY - 1; - LineBreakPos.Char = mLines->getString(mCaretY - 2).length() + 1; + if (addToUndoList) { + lineBreakPos.Line = mCaretY - 1; + lineBreakPos.Char = mLines->getString(mCaretY - 2).length() + 1; mUndoList->AddChange(SynChangeReason::crLineBreak, - LineBreakPos, - LineBreakPos, + lineBreakPos, + lineBreakPos, "", SynSelectionMode::smNormal); } } else { - TempString = mLines->getString(mCaretY - 1); - Len = stringColumns(TempString,0); - if (Len < InsertCol) { - TempString = TempString + QString(InsertCol - Len - 1,' ') + Str; + tempString = mLines->getString(mCaretY - 1); + len = stringColumns(tempString,0); + if (len < insertCol) { + tempString = tempString + QString(insertCol - len - 1,' ') + str; } else { - int insertPos = charToColumn(TempString,InsertCol); - TempString.insert(insertPos-1,Str); + int insertPos = columnToChar(mCaretY,insertCol); + tempString.insert(insertPos-1,str); } } - properSetLine(mCaretY - 1, TempString); + properSetLine(mCaretY - 1, tempString); // Add undo change here from PasteFromClipboard - if (AddToUndoList) { + if (addToUndoList) { mUndoList->AddChange(SynChangeReason::crPaste, BufferCoord{mCaretX, mCaretY}, - BufferCoord{mCaretX + (P - Start), mCaretY}, "", mActiveSelectionMode); + BufferCoord{mCaretX + (p - start), mCaretY}, "", mActiveSelectionMode); } } - if (P