rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fix: Refresh files view shouldn'tchange open/save dialog's default folder 

- enhancement: "locate in files view" will request user's confirmation when change the working folder
This commit is contained in:
Roy Qu 2022-03-10 20:28:01 +08:00
parent 4c8bed0445
commit 1b240f21ee
5 changed files with 97 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS.md
View File

@ -1,5 +1,7 @@
Red Panda C++ Version 1.0.0 Red Panda C++ Version 1.0.0
- fix: calculation for code snippets's tab stop positions is not correct - fix: calculation for code snippets's tab stop positions is not correct
- fix: Refresh files view shouldn'tchange open/save dialog's default folder
- enhancement: "locate in files view" will request user's confirmation when change the working folder
Red Panda C++ Version 0.14.5 Red Panda C++ Version 0.14.5
- fix: the "gnu c++ 20" option in compiler set options is wrong - fix: the "gnu c++ 20" option in compiler set options is wrong

118
RedPandaIDE/RedPandaIDE_zh_CN.ts
View File

@ -1270,12 +1270,12 @@ Are you really want to continue?</oldsource>
<translation type="vanished">失败</translation> <translation type="vanished">失败</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="259"/> <location filename="editor.cpp" line="261"/>
<location filename="editor.cpp" line="338"/> <location filename="editor.cpp" line="340"/>
<location filename="editor.cpp" line="1228"/> <location filename="editor.cpp" line="1237"/>
<location filename="editor.cpp" line="1233"/> <location filename="editor.cpp" line="1242"/>
<location filename="editor.cpp" line="1251"/> <location filename="editor.cpp" line="1260"/>
<location filename="editor.cpp" line="1256"/> <location filename="editor.cpp" line="1265"/>
<source>Error</source> <source>Error</source>
<translation>错误</translation> <translation>错误</translation>
</message> </message>
@ -1284,39 +1284,39 @@ Are you really want to continue?</oldsource>
<translation type="vanished">无法写入文件&quot;%1&quot;</translation> <translation type="vanished">无法写入文件&quot;%1&quot;</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="289"/> <location filename="editor.cpp" line="291"/>
<source>Save As</source> <source>Save As</source>
<translation>另存为</translation> <translation>另存为</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="1229"/> <location filename="editor.cpp" line="1238"/>
<source>The text to be copied exceeds count limit!</source> <source>The text to be copied exceeds count limit!</source>
<translation>要复制的内容超过了行数限制！</translation> <translation>要复制的内容超过了行数限制！</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="1234"/> <location filename="editor.cpp" line="1243"/>
<source>The text to be copied exceeds character limit!</source> <source>The text to be copied exceeds character limit!</source>
<translation>要复制的内容超过了字符数限制！</translation> <translation>要复制的内容超过了字符数限制！</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="1252"/> <location filename="editor.cpp" line="1261"/>
<source>The text to be cut exceeds count limit!</source> <source>The text to be cut exceeds count limit!</source>
<translation>要剪切的内容超过了行数限制！</translation> <translation>要剪切的内容超过了行数限制！</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="1257"/> <location filename="editor.cpp" line="1266"/>
<source>The text to be cut exceeds character limit!</source> <source>The text to be cut exceeds character limit!</source>
<translation>要剪切的内容超过了字符数限制！</translation> <translation>要剪切的内容超过了字符数限制！</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="2582"/> <location filename="editor.cpp" line="2685"/>
<source>Print Document</source> <source>Print Document</source>
<translation>打印文档</translation> <translation>打印文档</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="3179"/> <location filename="editor.cpp" line="3282"/>
<location filename="editor.cpp" line="3218"/> <location filename="editor.cpp" line="3321"/>
<location filename="editor.cpp" line="3272"/> <location filename="editor.cpp" line="3375"/>
<source>Ctrl+click for more info</source> <source>Ctrl+click for more info</source>
<translation>Ctrl+单击以获取更多信息</translation> <translation>Ctrl+单击以获取更多信息</translation>
</message> </message>
@ -1325,27 +1325,27 @@ Are you really want to continue?</oldsource>
<translation type="vanished">未找到符号&apos;%1&apos;!</translation> <translation type="vanished">未找到符号&apos;%1&apos;!</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="4000"/> <location filename="editor.cpp" line="4110"/>
<source>astyle not found</source> <source>astyle not found</source>
<translation>找不到astyle程序</translation> <translation>找不到astyle程序</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="4001"/> <location filename="editor.cpp" line="4111"/>
<source>Can&apos;t find astyle in &quot;%1&quot;.</source> <source>Can&apos;t find astyle in &quot;%1&quot;.</source>
<translation>找不到astyle程序&quot;%1&quot;.</translation> <translation>找不到astyle程序&quot;%1&quot;.</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="4151"/> <location filename="editor.cpp" line="4261"/>
<source>Break point condition</source> <source>Break point condition</source>
<translation>断点条件</translation> <translation>断点条件</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="4152"/> <location filename="editor.cpp" line="4262"/>
<source>Enter the condition of the breakpoint:</source> <source>Enter the condition of the breakpoint:</source>
<translation>输入当前断点的生效条件:</translation> <translation>输入当前断点的生效条件:</translation>
</message> </message>
<message> <message>
<location filename="editor.cpp" line="4367"/> <location filename="editor.cpp" line="4477"/>
<source>Readonly</source> <source>Readonly</source>
<translation>只读</translation> <translation>只读</translation>
</message> </message>
@ -4199,7 +4199,7 @@ Are you really want to continue?</oldsource>
<message> <message>
<location filename="mainwindow.ui" line="359"/> <location filename="mainwindow.ui" line="359"/>
<location filename="mainwindow.ui" line="362"/> <location filename="mainwindow.ui" line="362"/>
<location filename="mainwindow.cpp" line="6269"/> <location filename="mainwindow.cpp" line="6284"/>
<source>New Problem Set</source> <source>New Problem Set</source>
<translation>新建试题集</translation> <translation>新建试题集</translation>
</message> </message>
@ -4218,14 +4218,14 @@ Are you really want to continue?</oldsource>
<message> <message>
<location filename="mainwindow.ui" line="401"/> <location filename="mainwindow.ui" line="401"/>
<location filename="mainwindow.ui" line="404"/> <location filename="mainwindow.ui" line="404"/>
<location filename="mainwindow.cpp" line="6312"/> <location filename="mainwindow.cpp" line="6327"/>
<source>Save Problem Set</source> <source>Save Problem Set</source>
<translation>保存试题集</translation> <translation>保存试题集</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="415"/> <location filename="mainwindow.ui" line="415"/>
<location filename="mainwindow.ui" line="418"/> <location filename="mainwindow.ui" line="418"/>
<location filename="mainwindow.cpp" line="6336"/> <location filename="mainwindow.cpp" line="6351"/>
<source>Load Problem Set</source> <source>Load Problem Set</source>
<translation>载入试题集</translation> <translation>载入试题集</translation>
</message> </message>
@ -5172,7 +5172,7 @@ Are you really want to continue?</oldsource>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="277"/> <location filename="mainwindow.cpp" line="277"/>
<location filename="mainwindow.cpp" line="6278"/> <location filename="mainwindow.cpp" line="6293"/>
<source>Problem Set %1</source> <source>Problem Set %1</source>
<translation>试题集%1</translation> <translation>试题集%1</translation>
</message> </message>
@ -5452,7 +5452,7 @@ Are you really want to continue?</oldsource>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="3802"/> <location filename="mainwindow.cpp" line="3802"/>
<location filename="mainwindow.cpp" line="6272"/> <location filename="mainwindow.cpp" line="6287"/>
<source>Do you want to save it?</source> <source>Do you want to save it?</source>
<translation>需要保存吗？</translation> <translation>需要保存吗？</translation>
</message> </message>
@ -5476,7 +5476,7 @@ Are you really want to continue?</oldsource>
<location filename="mainwindow.cpp" line="4049"/> <location filename="mainwindow.cpp" line="4049"/>
<location filename="mainwindow.cpp" line="4059"/> <location filename="mainwindow.cpp" line="4059"/>
<location filename="mainwindow.cpp" line="4071"/> <location filename="mainwindow.cpp" line="4071"/>
<location filename="mainwindow.cpp" line="6325"/> <location filename="mainwindow.cpp" line="6340"/>
<source>Save Error</source> <source>Save Error</source>
<translation>保存失败</translation> <translation>保存失败</translation>
</message> </message>
@ -5546,71 +5546,87 @@ Are you really want to continue?</oldsource>
<translation>你真的要删除它吗？</translation> <translation>你真的要删除它吗？</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6850"/> <location filename="mainwindow.cpp" line="6223"/>
<source>Change working folder</source>
<translation>改变工作文件夹</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="6224"/>
<source>File &apos;%1&apos; is not in the current working folder.</source>
<oldsource>File &apos;%1&apos; is not in the current working folder</oldsource>
<translation>文件&apos;%1&apos;不在当前工作文件夹中。</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="6227"/>
<source>Do you want to change working folder to &apos;%1&apos;?</source>
<translation>是否将工作文件夹改设为&apos;%1&apos;?</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="6865"/>
<source>Can&apos;t Commit</source> <source>Can&apos;t Commit</source>
<translation>无法提交</translation> <translation>无法提交</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6851"/> <location filename="mainwindow.cpp" line="6866"/>
<source>Git needs user info to commit.</source> <source>Git needs user info to commit.</source>
<translation>Git需要用信息进行提交。</translation> <translation>Git需要用信息进行提交。</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="2556"/> <location filename="mainwindow.ui" line="2556"/>
<location filename="mainwindow.ui" line="2559"/> <location filename="mainwindow.ui" line="2559"/>
<location filename="mainwindow.cpp" line="6248"/> <location filename="mainwindow.cpp" line="6263"/>
<source>Choose Working Folder</source> <source>Choose Working Folder</source>
<translation>选择工作文件夹</translation> <translation>选择工作文件夹</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6618"/> <location filename="mainwindow.cpp" line="6633"/>
<location filename="mainwindow.cpp" line="6670"/> <location filename="mainwindow.cpp" line="6685"/>
<source>Header Exists</source> <source>Header Exists</source>
<translation>头文件已存在</translation> <translation>头文件已存在</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6619"/> <location filename="mainwindow.cpp" line="6634"/>
<location filename="mainwindow.cpp" line="6671"/> <location filename="mainwindow.cpp" line="6686"/>
<source>Header file &quot;%1&quot; already exists!</source> <source>Header file &quot;%1&quot; already exists!</source>
<translation>头文件&quot;%1&quot;已存在！</translation> <translation>头文件&quot;%1&quot;已存在！</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6676"/> <location filename="mainwindow.cpp" line="6691"/>
<source>Source Exists</source> <source>Source Exists</source>
<translation>源文件已存在！</translation> <translation>源文件已存在！</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6677"/> <location filename="mainwindow.cpp" line="6692"/>
<source>Source file &quot;%1&quot; already exists!</source> <source>Source file &quot;%1&quot; already exists!</source>
<translation>源文件&quot;%1&quot;已存在！</translation> <translation>源文件&quot;%1&quot;已存在！</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6829"/> <location filename="mainwindow.cpp" line="6844"/>
<source>Can&apos;t commit!</source> <source>Can&apos;t commit!</source>
<translation>无法提交！</translation> <translation>无法提交！</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6830"/> <location filename="mainwindow.cpp" line="6845"/>
<source>The following files are in conflicting:</source> <source>The following files are in conflicting:</source>
<translation>下列文件处于冲突状态，请解决后重新添加和提交：</translation> <translation>下列文件处于冲突状态，请解决后重新添加和提交：</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6835"/> <location filename="mainwindow.cpp" line="6850"/>
<source>Commit Message</source> <source>Commit Message</source>
<translation>提交信息</translation> <translation>提交信息</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6835"/> <location filename="mainwindow.cpp" line="6850"/>
<source>Commit Message:</source> <source>Commit Message:</source>
<translation>提交信息：</translation> <translation>提交信息：</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6838"/> <location filename="mainwindow.cpp" line="6853"/>
<source>Commit Failed</source> <source>Commit Failed</source>
<translation>提交失败</translation> <translation>提交失败</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6839"/> <location filename="mainwindow.cpp" line="6854"/>
<source>Commit message shouldn&apos;t be empty!</source> <source>Commit message shouldn&apos;t be empty!</source>
<translation>提交信息不能为空！</translation> <translation>提交信息不能为空！</translation>
</message> </message>
@ -5715,29 +5731,29 @@ Are you really want to continue?</oldsource>
<translation>HTML文件 (*.html)</translation> <translation>HTML文件 (*.html)</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6270"/> <location filename="mainwindow.cpp" line="6285"/>
<source>The current problem set is not empty.</source> <source>The current problem set is not empty.</source>
<translation>当前的试题集不是空的。</translation> <translation>当前的试题集不是空的。</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6288"/> <location filename="mainwindow.cpp" line="6303"/>
<source>Problem %1</source> <source>Problem %1</source>
<translation>试题%1</translation> <translation>试题%1</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6314"/> <location filename="mainwindow.cpp" line="6329"/>
<location filename="mainwindow.cpp" line="6338"/> <location filename="mainwindow.cpp" line="6353"/>
<source>Problem Set Files (*.pbs)</source> <source>Problem Set Files (*.pbs)</source>
<translation>试题集文件 (*.pbs)</translation> <translation>试题集文件 (*.pbs)</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6344"/> <location filename="mainwindow.cpp" line="6359"/>
<source>Load Error</source> <source>Load Error</source>
<translation>载入失败</translation> <translation>载入失败</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="3478"/> <location filename="mainwindow.cpp" line="3478"/>
<location filename="mainwindow.cpp" line="6358"/> <location filename="mainwindow.cpp" line="6373"/>
<source>Problem Case %1</source> <source>Problem Case %1</source>
<translation>试题案例%1</translation> <translation>试题案例%1</translation>
</message> </message>
@ -7994,7 +8010,7 @@ Are you really want to continue?</oldsource>
<translation>自动链接</translation> <translation>自动链接</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6259"/> <location filename="mainwindow.cpp" line="6274"/>
<location filename="settingsdialog/settingsdialog.cpp" line="170"/> <location filename="settingsdialog/settingsdialog.cpp" line="170"/>
<location filename="settingsdialog/settingsdialog.cpp" line="203"/> <location filename="settingsdialog/settingsdialog.cpp" line="203"/>
<location filename="settingsdialog/settingsdialog.cpp" line="209"/> <location filename="settingsdialog/settingsdialog.cpp" line="209"/>
@ -8070,15 +8086,15 @@ Are you really want to continue?</oldsource>
<translation>杂项</translation> <translation>杂项</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6260"/> <location filename="mainwindow.cpp" line="6275"/>
<location filename="mainwindow.cpp" line="6573"/> <location filename="mainwindow.cpp" line="6588"/>
<location filename="settingsdialog/settingsdialog.cpp" line="203"/> <location filename="settingsdialog/settingsdialog.cpp" line="203"/>
<location filename="settingsdialog/settingsdialog.cpp" line="206"/> <location filename="settingsdialog/settingsdialog.cpp" line="206"/>
<source>Program Runner</source> <source>Program Runner</source>
<translation>程序运行</translation> <translation>程序运行</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="6572"/> <location filename="mainwindow.cpp" line="6587"/>
<location filename="settingsdialog/settingsdialog.cpp" line="206"/> <location filename="settingsdialog/settingsdialog.cpp" line="206"/>
<source>Problem Set</source> <source>Problem Set</source>
<translation>试题集</translation> <translation>试题集</translation>

7
RedPandaIDE/main.cpp
View File

@ -352,9 +352,6 @@ int main(int argc, char *argv[])
QMessageBox::Ok); QMessageBox::Ok);
} }
//set default open folder
QDir::setCurrent(pSettings->environment().defaultOpenFolder());
MainWindow mainWindow; MainWindow mainWindow;
pMainWindow = &mainWindow; pMainWindow = &mainWindow;
if (app.arguments().count()>1) { if (app.arguments().count()>1) {
@ -375,6 +372,10 @@ int main(int argc, char *argv[])
setScreenDPI(mainWindow.screen()->logicalDotsPerInch()); setScreenDPI(mainWindow.screen()->logicalDotsPerInch());
#endif #endif
mainWindow.show(); mainWindow.show();
//reset default open folder
QDir::setCurrent(pSettings->environment().defaultOpenFolder());
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
WindowLogoutEventFilter filter; WindowLogoutEventFilter filter;
app.installNativeEventFilter(&filter); app.installNativeEventFilter(&filter);

30
RedPandaIDE/mainwindow.cpp
View File

@ -5929,14 +5929,15 @@ void MainWindow::showSearchReplacePanel(bool show)
mSearchResultTreeModel->setSelectable(show); mSearchResultTreeModel->setSelectable(show);
} }
void MainWindow::setFilesViewRoot(const QString &path) void MainWindow::setFilesViewRoot(const QString &path, bool setOpenFolder)
{ {
mFileSystemModelIconProvider.setRootFolder(path); mFileSystemModelIconProvider.setRootFolder(path);
mFileSystemModel.setIconProvider(&mFileSystemModelIconProvider); mFileSystemModel.setIconProvider(&mFileSystemModelIconProvider);
mFileSystemModel.setRootPath(path); mFileSystemModel.setRootPath(path);
ui->treeFiles->setRootIndex(mFileSystemModel.index(path)); ui->treeFiles->setRootIndex(mFileSystemModel.index(path));
pSettings->environment().setCurrentFolder(path); pSettings->environment().setCurrentFolder(path);
QDir::setCurrent(path); if (setOpenFolder)
QDir::setCurrent(path);
int pos = ui->cbFilesPath->findText(path); int pos = ui->cbFilesPath->findText(path);
if (pos<0) { if (pos<0) {
ui->cbFilesPath->addItem(mFileSystemModel.iconProvider()->icon(QFileIconProvider::Folder),path); ui->cbFilesPath->addItem(mFileSystemModel.iconProvider()->icon(QFileIconProvider::Folder),path);
@ -6216,15 +6217,30 @@ void MainWindow::on_actionLocate_in_Files_View_triggered()
{ {
Editor * editor = mEditorList->getEditor(); Editor * editor = mEditorList->getEditor();
if (editor) { if (editor) {
QModelIndex index = mFileSystemModel.index(editor->filename()); QFileInfo fileInfo(editor->filename());
if (!index.isValid()) { if (!fileInfo.absoluteFilePath().startsWith(
mFileSystemModel.rootDirectory().absolutePath()+"/",
PATH_SENSITIVITY
)) {
QString fileDir = extractFileDir(editor->filename()); QString fileDir = extractFileDir(editor->filename());
if (QMessageBox::question(this,
tr("Change working folder"),
tr("File '%1' is not in the current working folder.")
.arg(extractFileName(editor->filename()))
+"<br />"
+tr("Do you want to change working folder to '%1'?")
.arg(fileDir),
QMessageBox::Yes | QMessageBox::No,
QMessageBox::Yes
)!=QMessageBox::Yes) {
return;
}
if (!fileDir.isEmpty()) if (!fileDir.isEmpty())
setFilesViewRoot(fileDir); setFilesViewRoot(fileDir,true);
else else
return; return;
index = mFileSystemModel.index(editor->filename());
} }
QModelIndex index = mFileSystemModel.index(editor->filename());
ui->treeFiles->setCurrentIndex(index); ui->treeFiles->setCurrentIndex(index);
ui->treeFiles->scrollTo(index, QAbstractItemView::PositionAtCenter); ui->treeFiles->scrollTo(index, QAbstractItemView::PositionAtCenter);
ui->tabInfos->setCurrentWidget(ui->tabFiles); ui->tabInfos->setCurrentWidget(ui->tabFiles);
@ -6252,7 +6268,7 @@ void MainWindow::on_actionOpen_Folder_triggered()
QString folder = QFileDialog::getExistingDirectory(this,tr("Choose Working Folder"), QString folder = QFileDialog::getExistingDirectory(this,tr("Choose Working Folder"),
pSettings->environment().currentFolder()); pSettings->environment().currentFolder());
if (!folder.isEmpty()) { if (!folder.isEmpty()) {
setFilesViewRoot(folder); setFilesViewRoot(folder,true);
} }
} }

2
RedPandaIDE/mainwindow.h
View File

@ -243,7 +243,7 @@ private:
void scanActiveProject(bool parse=false); void scanActiveProject(bool parse=false);
void includeOrSkipDirs(const QStringList& dirs, bool skip); void includeOrSkipDirs(const QStringList& dirs, bool skip);
void showSearchReplacePanel(bool show); void showSearchReplacePanel(bool show);
void setFilesViewRoot(const QString& path); void setFilesViewRoot(const QString& path, bool setOpenFolder=false);
void clearIssues(); void clearIssues();
void doCompileRun(RunType runType); void doCompileRun(RunType runType);
void updateProblemCaseOutput(POJProblemCase problemCase); void updateProblemCaseOutput(POJProblemCase problemCase);