From 7a5b6b8efcda31e5812f519263cdf60d3ee475aa Mon Sep 17 00:00:00 2001 From: "royqh1979@gmail.com" Date: Fri, 22 Oct 2021 15:02:54 +0800 Subject: [PATCH] - implement: files view --- NEWS.md | 1 + RedPandaIDE/RedPandaIDE_zh_CN.qm | Bin 97880 -> 98763 bytes RedPandaIDE/RedPandaIDE_zh_CN.ts | 702 +++++++++++--------- RedPandaIDE/editor.cpp | 2 +- RedPandaIDE/editorlist.cpp | 4 + RedPandaIDE/images/newlook24/046-Locate.png | Bin 300 -> 285 bytes RedPandaIDE/mainwindow.cpp | 213 +++++- RedPandaIDE/mainwindow.h | 11 +- RedPandaIDE/mainwindow.ui | 43 +- RedPandaIDE/settings.cpp | 3 + RedPandaIDE/utils.cpp | 2 +- 11 files changed, 626 insertions(+), 355 deletions(-) diff --git a/NEWS.md b/NEWS.md index 57cf32f6..605cdb47 100644 --- a/NEWS.md +++ b/NEWS.md @@ -11,6 +11,7 @@ Version 0.7.0 - enhancement: autosave/load bookmarks - enhancement: autosave/load breakpoints - enhancement: autosave/load watches + - implement: files view Version 0.6.8 - enhancement: add link to cppreference in the help menu diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index 2c684e08c9eadad74aff959c330ec354e6988421..688a619c9186ffdc6d69ba8c0e804baceb73009f 100644 GIT binary patch delta 9706 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 bx%}y0c$Odk&02Bnm5AAdA6qq<4Q=y3?qcVl diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index b6f68db0..af623a65 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -2801,40 +2801,40 @@ Are you really want to continue? 小熊猫C++ - - + + Issues 编译器 - + Compile Log 编译日志 - + File 文件 - + Tools 工具 - - + + Run 运行 - + Edit 编辑 - + Project 项目 @@ -2849,90 +2849,91 @@ Are you really want to continue? 结构 + Files - 文件 + 文件 Resource 资源 - - - - + + + + Debug 调试 - + Evaluate: 求值 - + Debug Console 调试主控台 - + Call Stack 调用栈 - + Breakpoints 断点 - + Locals 本地变量 - - + + Search 查找 - + History: 历史： - + Search Again 重新查找 - + Replace with: 替换为： - + Replace 替换 - + Close 关闭 - + Execute 运行 - - + + Code 代码 - + Window 窗口 @@ -2945,721 +2946,732 @@ Are you really want to continue? 工具栏2 - + New 新建 - + 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 编译 - + F9 F9 - + F10 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编码 - - + + Compile & Run 编译运行 - + F11 F11 - - + + Rebuild All 全部重编译 - + F12 F12 - + Stop Execution 停止执行 - + F6 F6 - + F5 F5 - + Step Over 单步跳过 - + F7 F7 - + Step Into 单步进入 - + Memory 内存 - + Address Expression: Address: 地址表达式： - + Cancel 取消 - + TODO TODO - + Bookmark 书签 - + Help 帮助 - + Refactor 重构 - + Main 主工具栏 - + Compiler Set 编译器配置集 - - + + New Source File 新建源代码文件 - + 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 清除全部监视 - + 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 跳转到声明处 - + Goto Definition 跳转到定义处 - + Find references 查找符号的引用 - + Open containing folder 打开所在的文件夹 - + Ctrl+B Ctrl+B - + Open a terminal here 打开命令行窗口 - + File Properties... 文件属性... - + Close Project 关闭项目 - + Project options 项目属性 - + New Project... 新建项目... - + 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/C++ Reference C/C++参考 - + EGE Manual EGE图形库手册 - + Add Bookmark 添加书签 - + Remove Bookmark 删除书签 - + Modify Bookmark Description 修改书签说明 - + + Locate in Files View + 在文件视图中定位 + + + + + Open Folder + 打开文件夹 + + + File Encoding 文件编码 - + Recent Files 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -3668,510 +3680,543 @@ 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' - + Copy all 全部复制 - - + + Clear 清除 - + Export 导出 - + Insert Snippet 插入代码段 - + Remove 删除 - + Modify Description 修改描述 - - - + + + Bookmark Description 书签描述 - - - + + + Description: 描述： - + Show debug logs in the debug console 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove all breakpoints 清除所有断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 - + Remove Folder 删除文件夹 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - + + Open in Editor + 在编辑器中打开 + + + + Open in External Program + 使用外部程序打开 + + + + Open in Terminal + 在终端中打开 + + + + Open in Windows Explorer + 在Windows浏览器中打开 + + + Character sets 字符集 - + %1 files autosaved 已自动保存%1个文件 - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - + Do you want to save it? 需要保存吗？ - + + + + Save Error + 保存失败 + + + 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 - + Red panda Dev-C++ project file (*.dev) 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Add to project 添加到项目 - + 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) - - - - - - - - - + + + + + + + + + + + + + + + Error 错误 - + Recent Projects 项目历史 - + 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个文件） @@ -6129,6 +6174,19 @@ Are you really want to continue? 本页中有尚未保存的设置修改，是否保存后再切换到其他页？ + + SettingsWidget + + + Load Error + 载入失败 + + + + Save Error + 保存失败 + + ShortcutManager diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index c9b50505..16840631 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -495,6 +495,7 @@ void Editor::focusInEvent(QFocusEvent *event) this, &SynEdit::invalidate); } + pMainWindow->updateAppTitle(); pMainWindow->updateEditorActions(); pMainWindow->updateStatusbarForLineCol(); pMainWindow->updateForStatusbarModeInfo(); @@ -511,7 +512,6 @@ void Editor::focusOutEvent(QFocusEvent *event) &SynEdit::invalidate); } //pMainWindow->updateClassBrowserForEditor(nullptr); - pMainWindow->updateEditorActions(); pMainWindow->updateStatusbarForLineCol(); pMainWindow->updateForStatusbarModeInfo(); pMainWindow->functionTip()->hide(); diff --git a/RedPandaIDE/editorlist.cpp b/RedPandaIDE/editorlist.cpp index abccd915..f3bdb504 100644 --- a/RedPandaIDE/editorlist.cpp +++ b/RedPandaIDE/editorlist.cpp @@ -153,6 +153,9 @@ bool EditorList::closeEditor(Editor* editor, bool transferFocus, bool force) { editor = getEditor(); pMainWindow->updateClassBrowserForEditor(editor); } + if (pageCount()==0) { + pMainWindow->updateAppTitle(); + } return true; } @@ -283,6 +286,7 @@ bool EditorList::closeAll(bool force) { return false; } } + pMainWindow->updateAppTitle(); return true; } diff --git a/RedPandaIDE/images/newlook24/046-Locate.png b/RedPandaIDE/images/newlook24/046-Locate.png index 06f161b441e51ac45a95f6a4a75b90c90ba44fc0..f09ed6a1ba3e2a759260b20c2450faf4d627c8ae 100644 GIT binary patch delta 257 zcmV+c0sj810-XYoB!3BTNLh0L01m?d01m?e$8V@)0002bNkl4HYtJ!m7$U{4)ww;^KYee=hHV;^z)O@_PoNJ-cSWV|`(X#ecCj&K zvg}s&w~|EXl!2#hs)y-xl-o14U;a&(67Adv|Gm*FiQaEt&cnW?BdKGF00000NkvXX Hu0mjf>^F1D delta 273 zcmV+s0q*{t0;~d%B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XS z000XS0e@s)kpKVy!AV3xR7gwRl35PJAP_@o?|searchView,&QTreeView::expandAll); ui->replacePanel->setVisible(false); - + //files view ui->treeFiles->setModel(&mFileSystemModel); - mFileSystemModel.setRootPath(pSettings->environment().currentFolder()); - ui->treeFiles->setRootIndex(mFileSystemModel.index(pSettings->environment().currentFolder())); + mFileSystemModel.setReadOnly(true); + setFilesViewRoot(pSettings->environment().currentFolder()); + for (int i=1;itreeFiles->hideColumn(i); + } + //class browser ui->classBrowser->setModel(&mClassBrowserModel); @@ -322,6 +326,8 @@ void MainWindow::updateEditorActions() ui->actionAdd_bookmark->setEnabled(false); ui->actionRemove_Bookmark->setEnabled(false); ui->actionModify_Bookmark_Description->setEnabled(false); + + ui->actionLocate_in_Files_View->setEnabled(false); } else { ui->actionAuto_Detect->setEnabled(true); ui->actionEncode_in_ANSI->setEnabled(true); @@ -362,6 +368,8 @@ void MainWindow::updateEditorActions() ui->actionAdd_bookmark->setEnabled(e->lines()->count()>0 && !e->hasBookmark(line)); ui->actionRemove_Bookmark->setEnabled(e->hasBookmark(line)); ui->actionModify_Bookmark_Description->setEnabled(e->hasBookmark(line)); + + ui->actionLocate_in_Files_View->setEnabled(!e->isNew()); } updateCompileActions(); @@ -2047,33 +2055,113 @@ void MainWindow::buildContextMenus() //toolbar for class browser mClassBrowserToolbar = new QWidget(); - QVBoxLayout* layout = dynamic_cast( ui->tabStructure->layout()); - layout->insertWidget(0,mClassBrowserToolbar); - QHBoxLayout* hlayout = new QHBoxLayout(); - hlayout->setContentsMargins(2,2,2,2); - mClassBrowserToolbar->setLayout(hlayout); - QToolButton * toolButton; - toolButton = new QToolButton; - toolButton->setDefaultAction(mClassBrowser_Sort_By_Type); - hlayout->addWidget(toolButton); - toolButton = new QToolButton; - toolButton->setDefaultAction(mClassBrowser_Sort_By_Name); - hlayout->addWidget(toolButton); - QFrame * vLine = new QFrame(); - vLine->setFrameShape(QFrame::VLine); - vLine->setFrameShadow(QFrame::Sunken); - hlayout->addWidget(vLine); - toolButton = new QToolButton; - toolButton->setDefaultAction(mClassBrowser_Show_Inherited); - hlayout->addWidget(toolButton); - hlayout->addStretch(); + { + QVBoxLayout* layout = dynamic_cast( ui->tabStructure->layout()); + layout->insertWidget(0,mClassBrowserToolbar); + QHBoxLayout* hlayout = new QHBoxLayout(); + hlayout->setContentsMargins(2,2,2,2); + mClassBrowserToolbar->setLayout(hlayout); + QToolButton * toolButton; + toolButton = new QToolButton; + toolButton->setDefaultAction(mClassBrowser_Sort_By_Type); + hlayout->addWidget(toolButton); + toolButton = new QToolButton; + toolButton->setDefaultAction(mClassBrowser_Sort_By_Name); + hlayout->addWidget(toolButton); + QFrame * vLine = new QFrame(); + vLine->setFrameShape(QFrame::VLine); + vLine->setFrameShadow(QFrame::Sunken); + hlayout->addWidget(vLine); + toolButton = new QToolButton; + toolButton->setDefaultAction(mClassBrowser_Show_Inherited); + hlayout->addWidget(toolButton); + hlayout->addStretch(); + } //menu for statusbar mFileEncodingStatus->setContextMenuPolicy(Qt::CustomContextMenu); connect(mFileEncodingStatus,&QWidget::customContextMenuRequested, this, &MainWindow::onFileEncodingContextMenu); - // + //menu for files view + ui->treeFiles->setContextMenuPolicy(Qt::CustomContextMenu); + connect(ui->treeFiles,&QWidget::customContextMenuRequested, + this, &MainWindow::onFilesViewContextMenu); + mFilesView_Open = createActionFor( + tr("Open in Editor"), + ui->treeFiles); + connect(mFilesView_Open, &QAction::triggered, + [this]() { + QString path = mFileSystemModel.filePath(ui->treeFiles->currentIndex()); + if (!path.isEmpty() && QFileInfo(path).isFile()) { + Editor *editor=mEditorList->getEditorByFilename(path); + if (editor) + editor->activate(); + } + }); + mFilesView_OpenWithExternal = createActionFor( + tr("Open in External Program"), + ui->treeFiles); + connect(mFilesView_OpenWithExternal, &QAction::triggered, + [this]() { + QString path = mFileSystemModel.filePath(ui->treeFiles->currentIndex()); + if (!path.isEmpty() && QFileInfo(path).isFile()) { + QDesktopServices::openUrl(QUrl::fromLocalFile(path)); + } + }); + mFilesView_OpenInTerminal = createActionFor( + tr("Open in Terminal"), + ui->treeFiles); + mFilesView_OpenInTerminal->setIcon(ui->actionOpen_Terminal->icon()); + connect(mFilesView_OpenInTerminal, &QAction::triggered, + [this]() { + QString path = mFileSystemModel.filePath(ui->treeFiles->currentIndex()); + if (!path.isEmpty()) { + QFileInfo fileInfo(path); + openShell(fileInfo.path(),"cmd.exe"); + } + }); + mFilesView_OpenInExplorer = createActionFor( + tr("Open in Windows Explorer"), + ui->treeFiles); + mFilesView_OpenInExplorer->setIcon(ui->actionOpen_Containing_Folder->icon()); + connect(mFilesView_OpenInExplorer, &QAction::triggered, + [this]() { + QString path = mFileSystemModel.filePath(ui->treeFiles->currentIndex()); + if (!path.isEmpty()) { + QFileInfo info(path); + if (info.isFile()){ + QDesktopServices::openUrl( + QUrl("file:///"+ + includeTrailingPathDelimiter(info.path()),QUrl::TolerantMode)); + } else if (info.isDir()){ + QDesktopServices::openUrl( + QUrl("file:///"+ + includeTrailingPathDelimiter(path),QUrl::TolerantMode)); + } + } + }); + + //toolbar for files view + mFilesViewToolbar = new QWidget(); + { + QVBoxLayout* layout = dynamic_cast( ui->tabFiles->layout()); + layout->insertWidget(0,mFilesViewToolbar); + QHBoxLayout* hlayout = new QHBoxLayout(); + hlayout->setContentsMargins(2,2,2,2); + mFilesViewToolbar->setLayout(hlayout); + QToolButton * toolButton; + toolButton = new QToolButton; + toolButton->setDefaultAction(ui->actionOpen_Folder); + toolButton->setFixedSize(32,32); + hlayout->addWidget(toolButton); + toolButton = new QToolButton; + toolButton->setDefaultAction(ui->actionLocate_in_Files_View); + toolButton->setFixedSize(32,32); + hlayout->addWidget(toolButton); + hlayout->addStretch(); + } + } void MainWindow::buildEncodingMenu() @@ -2345,6 +2433,26 @@ void MainWindow::onFileEncodingContextMenu(const QPoint &pos) mMenuEncoding->exec(mFileEncodingStatus->mapToGlobal(pos)); } +void MainWindow::onFilesViewContextMenu(const QPoint &pos) +{ + + QMenu menu(this); + menu.addAction(ui->actionOpen_Folder); + menu.addSeparator(); + menu.addAction(mFilesView_Open); + menu.addAction(mFilesView_OpenWithExternal); + menu.addSeparator(); + menu.addAction(mFilesView_OpenInTerminal); + menu.addAction(mFilesView_OpenInExplorer); + QString path = mFileSystemModel.filePath(ui->treeFiles->currentIndex()); + QFileInfo info(path); + mFilesView_Open->setEnabled(info.isFile()); + mFilesView_OpenWithExternal->setEnabled(info.isFile()); + mFilesView_OpenInTerminal->setEnabled(!path.isEmpty()); + mFilesView_OpenInExplorer->setEnabled(!path.isEmpty()); + menu.exec(ui->treeFiles->mapToGlobal(pos)); +} + void MainWindow::onShowInsertCodeSnippetMenu() { mMenuInsertCodeSnippet->clear(); @@ -2407,7 +2515,7 @@ void MainWindow::onEditorContextMenu(const QPoint &pos) menu.addSeparator(); menu.addAction(ui->actionOpen_Containing_Folder); menu.addAction(ui->actionOpen_Terminal); - + menu.addAction(ui->actionLocate_in_Files_View); menu.addSeparator(); menu.addAction(ui->actionReformat_Code); menu.addSeparator(); @@ -2443,6 +2551,7 @@ void MainWindow::onEditorContextMenu(const QPoint &pos) menu.addAction(ui->actionRemove_Bookmark); menu.addAction(ui->actionModify_Bookmark_Description); } + ui->actionLocate_in_Files_View->setEnabled(!editor->isNew()); ui->actionBreakpoint_property->setEnabled(editor->hasBreakpoint(line)); ui->actionAdd_bookmark->setEnabled( line>=0 && editor->lines()->count()>0 @@ -2477,6 +2586,7 @@ void MainWindow::onEditorTabContextMenu(QTabWidget* tabWidget, const QPoint &pos menu.addSeparator(); menu.addAction(ui->actionOpen_Containing_Folder); menu.addAction(ui->actionOpen_Terminal); + menu.addAction(ui->actionLocate_in_Files_View); menu.addSeparator(); menu.addAction(ui->actionMove_To_Other_View); menu.addSeparator(); @@ -2485,7 +2595,10 @@ void MainWindow::onEditorTabContextMenu(QTabWidget* tabWidget, const QPoint &pos tabWidget==ui->EditorTabsRight || tabWidget->count()>1 ); - + Editor * editor = dynamic_cast(tabWidget->widget(index)); + if (editor ) { + ui->actionLocate_in_Files_View->setEnabled(!editor->isNew()); + } menu.exec(tabBar->mapToGlobal(pos)); } @@ -2754,6 +2867,9 @@ void MainWindow::closeEvent(QCloseEvent *event) { settings.setLeftPanelIndex(ui->tabInfos->currentIndex()); settings.setLeftPanelOpenned(mLeftPanelOpenned); settings.save(); + + //save current folder ( for files view ) + pSettings->environment().save(); try { mBookmarkModel->save(includeTrailingPathDelimiter(pSettings->dirs().config()) +DEV_BOOKMARK_FILE); @@ -4343,6 +4459,15 @@ void MainWindow::showSearchReplacePanel(bool show) mSearchResultTreeModel->setSelectable(show); } +void MainWindow::setFilesViewRoot(const QString &path) +{ + mFileSystemModel.setRootPath(path); + ui->treeFiles->setRootIndex(mFileSystemModel.index(path)); + pSettings->environment().setCurrentFolder(path); + ui->txtFilesPath->setText(path); + ui->txtFilesPath->setCursorPosition(1); +} + Ui::MainWindow *MainWindow::mainWidget() const { return ui; @@ -4546,3 +4671,39 @@ void MainWindow::on_actionModify_Bookmark_Description_triggered() } } + +void MainWindow::on_actionLocate_in_Files_View_triggered() +{ + Editor * editor = mEditorList->getEditor(); + if (editor) { + QString fileDir = extractFileDir(editor->filename()); + if (!fileDir.isEmpty()) { + setFilesViewRoot(fileDir); + ui->treeFiles->setCurrentIndex(mFileSystemModel.index(editor->filename())); + } + } +} + + +void MainWindow::on_treeFiles_doubleClicked(const QModelIndex &index) +{ + QString filepath = mFileSystemModel.filePath(index); + QFileInfo file(filepath); + if (file.isFile()) { + Editor * editor = mEditorList->getEditorByFilename(filepath); + if (editor) { + editor->activate(); + } + } +} + + +void MainWindow::on_actionOpen_Folder_triggered() +{ + QString folder = QFileDialog::getExistingDirectory(this,tr("Open Folder"), + pSettings->environment().currentFolder()); + if (!folder.isEmpty()) { + setFilesViewRoot(folder); + } +} + diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index 44eb95ce..b34e34e3 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -192,6 +192,7 @@ private: void scanActiveProject(bool parse=false); void includeOrSkipDirs(const QStringList& dirs, bool skip); void showSearchReplacePanel(bool show); + void setFilesViewRoot(const QString& path); private slots: void onAutoSaveTimeout(); @@ -206,6 +207,7 @@ private slots: void onClassBrowserContextMenu(const QPoint& pos); void onDebugConsoleContextMenu(const QPoint& pos); void onFileEncodingContextMenu(const QPoint& pos); + void onFilesViewContextMenu(const QPoint& pos); void onShowInsertCodeSnippetMenu(); @@ -420,6 +422,12 @@ private slots: void on_actionModify_Bookmark_Description_triggered(); + void on_actionLocate_in_Files_View_triggered(); + + void on_treeFiles_doubleClicked(const QModelIndex &index); + + void on_actionOpen_Folder_triggered(); + private: Ui::MainWindow *ui; EditorList *mEditorList; @@ -511,9 +519,6 @@ private: QAction * mFilesView_OpenWithExternal; QAction * mFilesView_OpenInTerminal; QAction * mFilesView_OpenInExplorer; - QAction * mFilesView_OnlyShowDevFiles; - QAction * mFilesView_LocateCurrent; - QWidget * mFilesViewToolbar; //action for debug console diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index 1666e1fa..5474c461 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -85,7 +85,7 @@ QTabWidget::West - 2 + 3 true @@ -213,6 +213,9 @@ Files + + 0 + 0 @@ -226,7 +229,24 @@ 0 - + + + true + + + true + + + + + + + QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + + + QAbstractItemView::DragOnly + + @@ -931,6 +951,7 @@ File + @@ -1965,6 +1986,24 @@ Modify Bookmark Description + + + + :/icons/images/newlook24/046-Locate.png:/icons/images/newlook24/046-Locate.png + + + Locate in Files View + + + + + + :/icons/images/newlook24/053-open.png:/icons/images/newlook24/053-open.png + + + Open Folder + + diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index a43075e0..a9741e88 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -2619,6 +2619,9 @@ void Settings::Environment::doLoad() mInterfaceFontSize = intValue("interface font size",10); mLanguage = stringValue("language", QLocale::system().name()); mCurrentFolder = stringValue("current_folder",QDir::currentPath()); + if (!fileExists(mCurrentFolder)) { + mCurrentFolder = QDir::currentPath(); + } } int Settings::Environment::interfaceFontSize() const diff --git a/RedPandaIDE/utils.cpp b/RedPandaIDE/utils.cpp index 7c0b4238..5518f23c 100644 --- a/RedPandaIDE/utils.cpp +++ b/RedPandaIDE/utils.cpp @@ -748,7 +748,7 @@ QString parseMacros(const QString &s) QString result = s; Editor *e = pMainWindow->editorList()->getEditor(); - result.replace("", QDir().absolutePath()); + result.replace("", QDir::currentPath()); result.replace("", pSettings->dirs().executable()); result.replace("", DEVCPP_VERSION); result.replace("", pSettings->dirs().app());