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

- fix: crash when rename an openned file, and choose "no" when ask if keep the editor open

This commit is contained in:
Roy Qu 2022-03-30 23:19:51 +08:00
parent f08b14978c
commit c30164a58a
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS.md
View File

@ -18,6 +18,8 @@ Red Panda C++ Version 1.0.2
- fix: error in auto generate makefile under linux - fix: error in auto generate makefile under linux
- fix: when open a project, and it's missing compiler set getten reset, it's modification flag is not correctly set. - fix: when open a project, and it's missing compiler set getten reset, it's modification flag is not correctly set.
- fix: vector vars can't be expanded in the watch panel - fix: vector vars can't be expanded in the watch panel
- change: use qt's mingw 8.1 (32bit) and 11.2 (64bit) in distributions, to provide better compatibility with simplified chinese windows.
- fix: crash when rename an openned file, and choose "no" when ask if keep the editor open
Red Panda C++ Version 1.0.1 Red Panda C++ Version 1.0.1
- fix: only convert project icon file when it's filename doesn't end with ".ico" - fix: only convert project icon file when it's filename doesn't end with ".ico"

6
RedPandaIDE/mainwindow.cpp
View File

@ -4129,6 +4129,7 @@ void MainWindow::onFileChanged(const QString &path)
} }
} }
} else { } else {
mFileSystemWatcher.removePath(path);
if (QMessageBox::question(this,tr("File Changed"), if (QMessageBox::question(this,tr("File Changed"),
tr("File '%1' was removed.").arg(path)+"<BR /><BR />" + tr("Keep it open?"), tr("File '%1' was removed.").arg(path)+"<BR /><BR />" + tr("Keep it open?"),
QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes|QMessageBox::No,
@ -4138,7 +4139,6 @@ void MainWindow::onFileChanged(const QString &path)
e->setModified(true); e->setModified(true);
e->updateCaption(); e->updateCaption();
} }
mFileSystemWatcher.removePath(e->filename());
} }
} }
} }
@ -6507,8 +6507,10 @@ void MainWindow::on_actionLocate_in_Files_View_triggered()
Editor * editor = mEditorList->getEditor(); Editor * editor = mEditorList->getEditor();
if (editor) { if (editor) {
QFileInfo fileInfo(editor->filename()); QFileInfo fileInfo(editor->filename());
qDebug()<<fileInfo.absoluteFilePath();
qDebug()<<includeTrailingPathDelimiter(mFileSystemModel.rootDirectory().absolutePath());
if (!fileInfo.absoluteFilePath().startsWith( if (!fileInfo.absoluteFilePath().startsWith(
mFileSystemModel.rootDirectory().absolutePath()+"/", includeTrailingPathDelimiter(mFileSystemModel.rootDirectory().absolutePath()),
PATH_SENSITIVITY PATH_SENSITIVITY
)) { )) {
QString fileDir = extractFileDir(editor->filename()); QString fileDir = extractFileDir(editor->filename());

2
windows/installer-scripts/config.nsh.in
View File

@ -1,6 +1,6 @@
#################################################################### ####################################################################
# Startup # Startup
!define COMPILERNAME \"MinGW-w64 X86_64 GCC 10.3\" !define COMPILERNAME \"MinGW-w64 X86_64 GCC 11.2\"
!define DEVCPP_VERSION \"$${APP_VERSION}\" !define DEVCPP_VERSION \"$${APP_VERSION}\"

2
windows/installer-scripts/config32.nsh.in
View File

@ -1,6 +1,6 @@
#################################################################### ####################################################################
# Startup # Startup
!define COMPILERNAME \"MinGW-w64 i686 GCC 10.3\" !define COMPILERNAME \"MinGW-w64 i686 GCC 8.1\"
!define DEVCPP_VERSION \"$${APP_VERSION}\" !define DEVCPP_VERSION \"$${APP_VERSION}\"