- fix: Project's "static link" option is overwrited by global compiler set settings, when project options dialog is opened.

This commit is contained in:
Roy Qu 2022-12-18 12:31:19 +08:00
parent fc07b4dcd4
commit 1da2961970
3 changed files with 9 additions and 7 deletions

View File

@ -1,10 +1,10 @@
Red Panda C++ Version 2.7 Red Panda C++ Version 2.7
- enhancement: Remove multiple problems in the problem set view - enhancement: Remove multiple problems in the problem set view
- enhancement: Clear the proble view after a new problem set created - enhancement: Clear the problem view after a new problem set created
- enhancement: "Trim trailing spaces" in options / editor / misc - enhancement: "Trim trailing spaces" (Before saving a file) in options / editor / misc
- enhancement: "Trim trailing spaces" in code menu - enhancement: "Trim trailing spaces" in code menu
- change: Don't auto disable compile and debug buttons. - change: Don't auto disable compile and debug buttons for compiler sets that don't have compiler/debugger programs.
- enhancement: Better error messages for missing compile/debug/make programs. - enhancement: Better error messages for missing compile/debug/make programs.
- enhancement: "Show special chars" in options / editor / font - enhancement: "Show special chars" in options / editor / font
- fix: Lost compiler set settings if a compiler set's bin dirs is empty. - fix: Lost compiler set settings if a compiler set's bin dirs is empty.
@ -16,6 +16,8 @@ Red Panda C++ Version 2.7
- fix: "Compile" button disabled after app start with an empty new file. - fix: "Compile" button disabled after app start with an empty new file.
- enhancement: Don't add "-g3" option when generate assembely. - enhancement: Don't add "-g3" option when generate assembely.
- enhancement: Generate assembly is not correctly disabled when current file is not C/C++. - enhancement: Generate assembly is not correctly disabled when current file is not C/C++.
- change: Disable "Copy Limit" int "options"/"editor"/"Copy/Export" by default.
- fix: Project's "static link" option is overwrited by global compiler set settings, when project options dialog is opened.
Red Panda C++ Version 2.6 Red Panda C++ Version 2.6

View File

@ -1414,7 +1414,7 @@ void Settings::Editor::doLoad()
mGutterFontOnlyMonospaced = boolValue("gutter_font_only_monospaced",true); mGutterFontOnlyMonospaced = boolValue("gutter_font_only_monospaced",true);
//copy //copy
mCopySizeLimit = boolValue("copy_limit",true); mCopySizeLimit = boolValue("copy_limit",false);
mCopyCharLimits = intValue("copy_char_limits",100); mCopyCharLimits = intValue("copy_char_limits",100);
mCopyLineLimits = intValue("copy_line_limits",100000); mCopyLineLimits = intValue("copy_line_limits",100000);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN

View File

@ -47,6 +47,7 @@ void ProjectCompilerWidget::refreshOptions()
ui->tabOptions->resetUI(pSet,mOptions); ui->tabOptions->resetUI(pSet,mOptions);
ui->chkStaticLink->setChecked(pSet->staticLink()); ui->chkStaticLink->setChecked(pSet->staticLink());
ui->chkAddCharset->setChecked(pSet->autoAddCharsetParams());
QByteArray execEncoding = pMainWindow->project()->options().execEncoding; QByteArray execEncoding = pMainWindow->project()->options().execEncoding;
if (execEncoding == ENCODING_AUTO_DETECT if (execEncoding == ENCODING_AUTO_DETECT
@ -72,11 +73,10 @@ void ProjectCompilerWidget::refreshOptions()
void ProjectCompilerWidget::doLoad() void ProjectCompilerWidget::doLoad()
{ {
ui->chkAddCharset->setChecked(pMainWindow->project()->options().addCharset);
ui->chkStaticLink->setChecked(pMainWindow->project()->options().staticLink);
mOptions = pMainWindow->project()->options().compilerOptions; mOptions = pMainWindow->project()->options().compilerOptions;
ui->cbCompilerSet->setCurrentIndex(pMainWindow->project()->options().compilerSet); ui->cbCompilerSet->setCurrentIndex(pMainWindow->project()->options().compilerSet);
ui->chkAddCharset->setChecked(pMainWindow->project()->options().addCharset);
ui->chkStaticLink->setChecked(pMainWindow->project()->options().staticLink);
} }
void ProjectCompilerWidget::doSave() void ProjectCompilerWidget::doSave()