diff --git a/NEWS.md b/NEWS.md index 370b5ff5..e5949e58 100644 --- a/NEWS.md +++ b/NEWS.md @@ -12,6 +12,7 @@ Red Panda C++ Version 1.0.3 - change: don't auto jump to the first syntax error location when compile - enhancement: don't show folders that doesn't contain files in the project view - enhancement: redesigned new project unit dialog + - fix: some dialog's icon not correctly set Red Panda C++ Version 1.0.2 - enhancement: press tab in column mode won't exit column mode diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index 731e55b2..ecf0df9f 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -771,7 +771,7 @@ p, li { white-space: pre-wrap; } 删除非法文件夹 - + Choose Folder 选择文件夹 @@ -1270,10 +1270,10 @@ Are you really want to continue? - - - - + + + + Error 错误 @@ -1292,34 +1292,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+单击以获取更多信息 @@ -1328,27 +1328,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 只读 @@ -3804,18 +3804,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - + + + + + Issues 编译器 @@ -3889,7 +3889,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -3965,7 +3965,7 @@ Are you really want to continue? 工具栏2 - + New 新建 @@ -4023,8 +4023,8 @@ Are you really want to continue? - - + + Compile 编译 @@ -4097,9 +4097,9 @@ Are you really want to continue? - - - + + + Copy 复制 @@ -4110,7 +4110,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -4121,8 +4121,8 @@ Are you really want to continue? - - + + Select All 选择全部 @@ -4248,7 +4248,7 @@ Are you really want to continue? - + New Problem Set 新建试题集 @@ -4267,14 +4267,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -4335,7 +4335,7 @@ Are you really want to continue? - + Run All Cases Run Current Case 运行所有案例 @@ -4613,7 +4613,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -4709,7 +4709,7 @@ Are you really want to continue? Ctrl+Shift+Down - + New File 新建文件 @@ -4750,7 +4750,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -4771,13 +4771,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -5046,42 +5046,42 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5090,171 +5090,171 @@ 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 全部复制 @@ -5262,25 +5262,25 @@ Are you really want to continue? - - - + + + Clear 清除 - + Export 导出 - + Insert Snippet 插入代码段 - - + + Problem Set %1 试题集%1 @@ -5301,68 +5301,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: 描述: @@ -5371,173 +5371,173 @@ 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 重命名 - + 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 跳转到定义处 - - + + 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 选择答案源代码文件 @@ -5547,241 +5547,241 @@ Are you really want to continue? 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 Input Data File 选择输入数据文件 - - + + All files (*.*) 所有文件 (*.*) - + Choose Expected Output Data File Choose Expected Input Data File 选择期望输出文件 - - - + + + Line %1 第%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! 提交信息不能为空! @@ -5790,246 +5790,246 @@ 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 添加到项目 - + C/C++ Source Files (*.c *.cpp *.cc *.cxx) C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + 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 清除历史 - - + + 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个文件) @@ -6086,7 +6086,7 @@ Are you really want to continue? 源文件名: - + Path 路径 @@ -6129,7 +6129,7 @@ Are you really want to continue? 取消 - + Path 路径 @@ -6186,11 +6186,64 @@ Are you really want to continue? 项目%1 - - + + Default 缺省 + + + Choose directory + 选择文件夹 + + + + NewProjectUnitDialog + + Dialog + 对话框 + + + + New Project Unit + 新建项目文件 + + + + Folder + 文件夹 + + + + Filename + 文件名 + + + + + Browse + 浏览 + + + + Ok + 确定 + + + + Cancel + 取消 + + + + untitled + 无标题 + + + + Choose directory + 选择文件夹 + OJProblemCasesRunner @@ -6282,93 +6335,93 @@ Are you really want to continue? 无标题 - + Can't save file 无法保存文件 - + Can't save file '%1' 无法保存文件'%1'. - + Error Load File 载入文件错误 - + 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++编辑器开发 @@ -6775,32 +6828,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' @@ -7393,7 +7446,6 @@ Are you really want to continue? - untitled 无标题 @@ -8196,7 +8248,7 @@ Are you really want to continue? 自动链接 - + @@ -8272,15 +8324,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 8ef6691a..ba841516 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -5946,10 +5946,12 @@ void MainWindow::newProjectUnitFile() QString newFileName; PProjectUnit newUnit; if (mProject->modelType() == ProjectModelType::FileSystem) { + PProjectModelNode modelTypeNode = pNode; + while (modelTypeNode && modelTypeNode->folderNodeType==ProjectSpecialFolderNode::NonSpecial) { + modelTypeNode=modelTypeNode->parent.lock(); + } NewProjectUnitDialog newProjectUnitDialog; - QString folder = mProject->fileSystemNodeFolderPath(pNode); - newProjectUnitDialog.setFolder(folder); - switch (pNode->folderNodeType) { + switch (modelTypeNode->folderNodeType) { case ProjectSpecialFolderNode::HEADERS: newProjectUnitDialog.setSuffix("h"); break; @@ -5962,13 +5964,23 @@ void MainWindow::newProjectUnitFile() default: newProjectUnitDialog.setSuffix(""); } + QString folder = mProject->fileSystemNodeFolderPath(pNode); + qDebug()<options().isCpp) + newFileName += ".cpp"; + else + newFileName += ".c"; + } while (QDir(mProject->directory()).exists(newFileName)); newFileName = QInputDialog::getText( this, tr("New Project File Name"), @@ -5977,11 +5989,12 @@ void MainWindow::newProjectUnitFile() newFileName); if (newFileName.isEmpty()) return; - if (fileExists(QDir(mProject->directory()).absoluteFilePath(newFileName))) { - QMessageBox::critical(this,tr("File Already Exists!"), - tr("File '%1' already exists!").arg(newFileName)); - return; - } + newFileName = QDir(mProject->directory()).absoluteFilePath(newFileName); + } + if (fileExists(newFileName)) { + QMessageBox::critical(this,tr("File Already Exists!"), + tr("File '%1' already exists!").arg(newFileName)); + return; } newUnit = mProject->newUnit( pNode,newFileName); diff --git a/RedPandaIDE/project.cpp b/RedPandaIDE/project.cpp index 8749602f..9e64f4d6 100644 --- a/RedPandaIDE/project.cpp +++ b/RedPandaIDE/project.cpp @@ -1695,6 +1695,18 @@ QFileSystemWatcher *Project::fileSystemWatcher() const return mFileSystemWatcher; } +QString Project::fileSystemNodeFolderPath(const PProjectModelNode &node) +{ + QString result; + PProjectModelNode pNode = node; + while (pNode && pNode->folderNodeType == ProjectSpecialFolderNode::NonSpecial) { + result = node->text + "/" +result; + pNode = pNode->parent.lock(); + } + result = folder() + "/" + result; + return result; +} + EditorList *Project::editorList() const { return mEditorList; diff --git a/RedPandaIDE/project.h b/RedPandaIDE/project.h index ea5b96a9..c0620b22 100644 --- a/RedPandaIDE/project.h +++ b/RedPandaIDE/project.h @@ -237,6 +237,8 @@ public: QFileSystemWatcher *fileSystemWatcher() const; + QString fileSystemNodeFolderPath(const PProjectModelNode& node); + signals: void nodesChanged(); void modifyChanged(bool value); diff --git a/RedPandaIDE/widgets/newprojectunitdialog.cpp b/RedPandaIDE/widgets/newprojectunitdialog.cpp index 4e3045ff..d0cc3e7a 100644 --- a/RedPandaIDE/widgets/newprojectunitdialog.cpp +++ b/RedPandaIDE/widgets/newprojectunitdialog.cpp @@ -31,7 +31,7 @@ void NewProjectUnitDialog::setFolder(const QString &folderName) if (folderName!=folder()) { ui->txtFolder->setText(folderName); QDir dir(folder()); - if (dir.exists(filename()) || filename().isEmpty()) { + if (filename().isEmpty() || dir.exists(filename())) { //todo change filename QString newFileName; QString ext; @@ -50,6 +50,16 @@ void NewProjectUnitDialog::setFolder(const QString &folderName) } } +QString NewProjectUnitDialog::filename() const +{ + return ui->txtFilename->text(); +} + +void NewProjectUnitDialog::setFilename(const QString &filename) +{ + ui->txtFilename->setText(filename); +} + void NewProjectUnitDialog::onUpdateIcons() { pIconsManager->setIcon(ui->btnBrowse, IconsManager::ACTION_FILE_OPEN_FOLDER); @@ -90,21 +100,20 @@ void NewProjectUnitDialog::updateBtnOkStatus() && QFileInfo(ui->txtFolder->text()).isDir()); } -void NewProjectUnitDialog::closeEvent(QCloseEvent *event) -{ - reject(); -} - -bool NewProjectUnitDialog::suffix() const +const QString &NewProjectUnitDialog::suffix() const { return mSuffix; } -void NewProjectUnitDialog::setSuffix(bool newSuffix) +void NewProjectUnitDialog::setSuffix(const QString &newSuffix) { mSuffix = newSuffix; } +void NewProjectUnitDialog::closeEvent(QCloseEvent */*event*/) +{ + reject(); +} void NewProjectUnitDialog::on_txtFolder_textChanged(const QString &/*arg1*/) { diff --git a/RedPandaIDE/widgets/newprojectunitdialog.h b/RedPandaIDE/widgets/newprojectunitdialog.h index ea3f620e..67f8ca16 100644 --- a/RedPandaIDE/widgets/newprojectunitdialog.h +++ b/RedPandaIDE/widgets/newprojectunitdialog.h @@ -21,8 +21,8 @@ public: QString filename() const; void setFilename(const QString& filename); - bool suffix() const; - void setSuffix(bool newSuffix); + const QString &suffix() const; + void setSuffix(const QString &newSuffix); private slots: void onUpdateIcons(); @@ -40,7 +40,7 @@ private: private: Ui::NewProjectUnitDialog *ui; private: - bool mSuffix; + QString mSuffix; // QWidget interface protected: diff --git a/RedPandaIDE/widgets/newprojectunitdialog.ui b/RedPandaIDE/widgets/newprojectunitdialog.ui index 206d4a72..9fd064ae 100644 --- a/RedPandaIDE/widgets/newprojectunitdialog.ui +++ b/RedPandaIDE/widgets/newprojectunitdialog.ui @@ -6,12 +6,12 @@ 0 0 - 400 - 300 + 547 + 250 - Dialog + New Project Unit