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

Merge branch 'master' into git 

# Conflicts:
#	NEWS.md
This commit is contained in:
royqh1979@gmail.com 2022-02-11 09:55:59 +08:00
parent 4e16a2e186 cb0fd24ebe
commit 7b7caecf4f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.md
View File

@ -2,6 +2,7 @@ Red Panda C++ Version 0.14.2
- enhancement: file system view mode for project - enhancement: file system view mode for project
- enhancement: remove / rename / create new folder in the files view - enhancement: remove / rename / create new folder in the files view
- fix: crash when there are catch blocks in the upper most scope - fix: crash when there are catch blocks in the upper most scope
- fix: can't read project templates when path has non-ascii chars
- change: rename "compile log" panel to "tools output" - change: rename "compile log" panel to "tools output"
- fix: debug panel can't be correctly show/hide - fix: debug panel can't be correctly show/hide
- enhancement: redesign tools output's context menu, add "clear" menu item - enhancement: redesign tools output's context menu, add "clear" menu item

2
RedPandaIDE/projecttemplate.cpp
View File

@ -84,7 +84,7 @@ void ProjectTemplate::readTemplateFile(const QString &fileName)
if (QFile(fileName).exists()) { if (QFile(fileName).exists()) {
mFileName = fileName; mFileName = fileName;
mIni = std::make_shared<SimpleIni>(); mIni = std::make_shared<SimpleIni>();
if (mIni->LoadFile(toByteArray(mFileName)) != SI_OK) { if (mIni->LoadFile(mFileName.toLocal8Bit()) != SI_OK) {
QMessageBox::critical(pMainWindow, QMessageBox::critical(pMainWindow,
tr("Read failed."), tr("Read failed."),
tr("Can't read template file '%1'.").arg(fileName), tr("Can't read template file '%1'.").arg(fileName),