From 5d6bf0dbb557475f3b20a7eb59ced783a5e8c61e Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Thu, 17 Mar 2022 10:46:24 +0800 Subject: [PATCH] - enhancement: create file in files view --- NEWS.md | 1 + RedPandaIDE/RedPandaIDE_zh_CN.ts | 347 ++++++++++++++++--------------- RedPandaIDE/mainwindow.cpp | 40 ++++ RedPandaIDE/mainwindow.h | 2 + 4 files changed, 222 insertions(+), 168 deletions(-) diff --git a/NEWS.md b/NEWS.md index 716f04a0..9060f9f0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -33,6 +33,7 @@ Red Panda C++ Version 1.0.0 - fix: switch disassembly mode doesn't update contents - fix: if there is a Red Panda C++ process running program, other Red Panda C++ processes can't run program correctly. - enhancement: ctrl+enter insert a new line at the end of current line + - enhancement: create file 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 b76c3fa4..e0155096 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -689,54 +689,54 @@ p, li { white-space: pre-wrap; } CompilerManager - - - - - + + + + + No compiler set 无编译器设置 - - - - - + + + + + No compiler set is configured. 没有配置编译器设置。 - - - - - + + + + + Can't start debugging. 无法启动调试器 - + Encoding not support 不支持字符编码 - + Clang only support utf-8 encoding. Clang只支持UTF-8编码 - + Strings in the program might be wrongly processed. 程序中的文字内容可能无法被正确处理和显示。 - + Can't find Console Pauser 找不到Console Pauser程序 - + Console Pauser "%1" doesn't exists! 找不到Console Pauser程序"%1"！ @@ -2282,7 +2282,7 @@ Are you really want to continue? ExecutableRunner - + The runner process '%1' failed to start. The runner process failed to start. 无法启动程序运行进程'%1'。 @@ -2292,17 +2292,17 @@ Are you really want to continue? 程序运行进程启动后崩溃。 - + The last waitFor...() function timed out. waitFor()函数等待超时。 - + An error occurred when attempting to write to the runner process. 在向程序运行进程写入内容时出错。 - + An error occurred when attempting to read from the runner process. 在从程序运行进程读取内容时出错。 @@ -3788,11 +3788,11 @@ Are you really want to continue? - - - - - + + + + + Issues 编译器 @@ -4065,7 +4065,7 @@ Are you really want to continue? - + Copy 复制 @@ -4088,7 +4088,7 @@ Are you really want to continue? - + Select All 选择全部 @@ -4215,7 +4215,7 @@ Are you really want to continue? - + New Problem Set 新建试题集 @@ -4234,14 +4234,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -4580,7 +4580,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -4641,6 +4641,7 @@ Are you really want to continue? + New File 新建项目文件 @@ -4681,7 +4682,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -4702,13 +4703,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -4977,7 +4978,7 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 @@ -5192,7 +5193,7 @@ Are you really want to continue? - + Clear 清除 @@ -5208,7 +5209,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -5282,15 +5283,15 @@ Are you really want to continue? - - + + Bookmark Description 书签描述 - - + + Description: 描述： @@ -5402,276 +5403,286 @@ Are you really want to continue? - + 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 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 - + + Untitled + 无标题 + + + + Untitled %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! 提交信息不能为空！ @@ -5680,125 +5691,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 @@ -5811,13 +5822,13 @@ Are you really want to continue? - - - - - - - + + + + + + + Error 错误 @@ -5838,83 +5849,83 @@ Are you really want to continue? 清除历史 - - + + 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个文件） @@ -7577,12 +7588,12 @@ Are you really want to continue? 无标题 - + constructor 构造函数 - + destructor 析构函数 @@ -8065,7 +8076,7 @@ Are you really want to continue? 自动链接 - + @@ -8141,15 +8152,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 42c8fb57..f3d881ad 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -2744,6 +2744,13 @@ void MainWindow::buildContextMenus() ui->treeFiles); connect(mFilesView_CreateFolder, &QAction::triggered, this, &MainWindow::onFilesViewCreateFolder); + + mFilesView_CreateFile = createActionFor( + tr("New File"), + ui->treeFiles); + connect(mFilesView_CreateFile, &QAction::triggered, + this, &MainWindow::onFilesViewCreateFile); + mFilesView_RemoveFile = createActionFor( tr("Delete"), ui->treeFiles); @@ -3236,6 +3243,7 @@ void MainWindow::onFilesViewContextMenu(const QPoint &pos) menu.addAction(ui->actionOpen_Folder); menu.addSeparator(); menu.addAction(mFilesView_CreateFolder); + menu.addAction(mFilesView_CreateFile); menu.addSeparator(); if (pSettings->vcs().gitOk()) { if (hasRepository) { @@ -3614,6 +3622,38 @@ void MainWindow::onFilesViewCreateFolder() dir.mkdir(dir.filePath(folderName)); } +void MainWindow::onFilesViewCreateFile() +{ + QModelIndex index = ui->treeFiles->currentIndex(); + QDir dir; + 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(); + } + QString suffix; + if (pSettings->editor().defaultFileCpp()) + suffix=".cpp"; + else + suffix=".c"; + QString fileName = tr("Untitled")+suffix; + int count = 0; + while (dir.exists(fileName)) { + count++; + fileName = tr("Untitled %1").arg(count)+suffix; + } + QFile file(dir.filePath(fileName)); + file.open(QFile::NewOnly); + QModelIndex newIndex = mFileSystemModel.index(fileName); + ui->treeFiles->selectionModel()->select(newIndex, QItemSelectionModel::SelectionFlag::Rows); +} + + void MainWindow::onFilesViewRemoveFiles() { QModelIndexList indexList = ui->treeFiles->selectionModel()->selectedRows(); diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index 93ab94f2..7be9e629 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -290,6 +290,7 @@ private slots: void onShowInsertCodeSnippetMenu(); void onFilesViewCreateFolder(); + void onFilesViewCreateFile(); void onFilesViewRemoveFiles(); void on_actionNew_triggered(); @@ -716,6 +717,7 @@ private: QAction * mFilesView_OpenInTerminal; QAction * mFilesView_OpenInExplorer; QAction * mFilesView_CreateFolder; + QAction * mFilesView_CreateFile; QAction * mFilesView_RemoveFile; //action for debug console