- change: Change compiler set option "Syntax error when object larger than" to "Syntax error when function frame larger than"
- fix: Projects created by some templates are not correct when editor's default encoding is not utf8.
This commit is contained in:
parent
95b00afa1e
commit
7a64538982
5
NEWS.md
5
NEWS.md
|
@ -1,3 +1,8 @@
|
|||
Red Panda C++ Version 2.20
|
||||
|
||||
- change: Change compiler set option "Syntax error when object larger than" to "Syntax error when function frame larger than"
|
||||
- fix: Projects created by some templates are not correct when editor's default encoding is not utf8.
|
||||
|
||||
Red Panda C++ Version 2.19
|
||||
|
||||
- fix: Crash when directive line ends with '\' and at the last line.
|
||||
|
|
|
@ -8,7 +8,7 @@ isEmpty(APP_NAME) {
|
|||
}
|
||||
|
||||
isEmpty(APP_VERSION) {
|
||||
APP_VERSION = 2.19
|
||||
APP_VERSION = 2.20
|
||||
}
|
||||
|
||||
contains(QMAKE_HOST.arch, x86_64):{
|
||||
|
|
|
@ -424,9 +424,9 @@ QString Compiler::getCCompileArguments(bool checkSyntax)
|
|||
result += " "+ parseMacros(param);
|
||||
}
|
||||
} else {
|
||||
if (compilerSet()->maxObjectSize()>0 && compilerSet()->warnLargeObject()) {
|
||||
long long size = std::ceil(compilerSet()->maxObjectSize()*1024*1024);
|
||||
result += QString(" -Werror=larger-than-%1").arg(size);
|
||||
if (compilerSet()->maxFrameSize()>0 && compilerSet()->warnLargeFrame()) {
|
||||
long long size = std::ceil(compilerSet()->maxFrameSize()*1024*1024);
|
||||
result += QString(" -Werror=frame-larger-than=%1").arg(size);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
@ -469,9 +469,9 @@ QString Compiler::getCppCompileArguments(bool checkSyntax)
|
|||
result += " "+ parseMacros(param);
|
||||
}
|
||||
} else {
|
||||
if (compilerSet()->maxObjectSize()>0 && compilerSet()->warnLargeObject()) {
|
||||
long long size = std::ceil(compilerSet()->maxObjectSize()*1024*1024);
|
||||
result += QString(" -Werror=larger-than-%1").arg(size);
|
||||
if (compilerSet()->maxFrameSize()>0 && compilerSet()->warnLargeFrame()) {
|
||||
long long size = std::ceil(compilerSet()->maxFrameSize()*1024*1024);
|
||||
result += QString(" -Werror=frame-larger-than=%1").arg(size);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
|
|
@ -1669,7 +1669,7 @@ Settings::CompilerSet::CompilerSet():
|
|||
mAutoAddCharsetParams{false},
|
||||
mExecCharset{ENCODING_SYSTEM_DEFAULT},
|
||||
mStaticLink{false},
|
||||
mMaxObjectSize{0},
|
||||
mMaxFrameSize{0},
|
||||
mWarnLargeObject{false},
|
||||
mPreprocessingSuffix{DEFAULT_PREPROCESSING_SUFFIX},
|
||||
mCompilationProperSuffix{DEFAULT_COMPILATION_SUFFIX},
|
||||
|
@ -1685,7 +1685,7 @@ Settings::CompilerSet::CompilerSet(const QString& compilerFolder, const QString&
|
|||
mAutoAddCharsetParams{true},
|
||||
mExecCharset{ENCODING_SYSTEM_DEFAULT},
|
||||
mStaticLink{true},
|
||||
mMaxObjectSize{0},
|
||||
mMaxFrameSize{0},
|
||||
mWarnLargeObject{false},
|
||||
mPreprocessingSuffix{DEFAULT_PREPROCESSING_SUFFIX},
|
||||
mCompilationProperSuffix{DEFAULT_COMPILATION_SUFFIX},
|
||||
|
@ -1742,7 +1742,7 @@ Settings::CompilerSet::CompilerSet(const Settings::CompilerSet &set):
|
|||
mAutoAddCharsetParams{set.mAutoAddCharsetParams},
|
||||
mExecCharset{set.mExecCharset},
|
||||
mStaticLink{set.mStaticLink},
|
||||
mMaxObjectSize{set.mMaxObjectSize},
|
||||
mMaxFrameSize{set.mMaxFrameSize},
|
||||
mWarnLargeObject{set.mWarnLargeObject},
|
||||
|
||||
mPreprocessingSuffix{set.mPreprocessingSuffix},
|
||||
|
@ -2569,24 +2569,24 @@ QByteArray Settings::CompilerSet::getCompilerOutput(const QString &binDir, const
|
|||
return result.trimmed();
|
||||
}
|
||||
|
||||
bool Settings::CompilerSet::warnLargeObject() const
|
||||
bool Settings::CompilerSet::warnLargeFrame() const
|
||||
{
|
||||
return mWarnLargeObject;
|
||||
}
|
||||
|
||||
void Settings::CompilerSet::setWarnLargeObject(bool newWarnLargeObject)
|
||||
void Settings::CompilerSet::setWarnLargeFrame(bool newWarnLargeObject)
|
||||
{
|
||||
mWarnLargeObject = newWarnLargeObject;
|
||||
}
|
||||
|
||||
double Settings::CompilerSet::maxObjectSize() const
|
||||
double Settings::CompilerSet::maxFrameSize() const
|
||||
{
|
||||
return mMaxObjectSize;
|
||||
return mMaxFrameSize;
|
||||
}
|
||||
|
||||
void Settings::CompilerSet::setMaxObjectSize(double maxObjectSize)
|
||||
void Settings::CompilerSet::setMaxFrameSize(double maxFrameSize)
|
||||
{
|
||||
mMaxObjectSize = maxObjectSize;
|
||||
mMaxFrameSize = maxFrameSize;
|
||||
}
|
||||
|
||||
Settings::CompilerSet::CompilationStage Settings::CompilerSet::compilationStage() const
|
||||
|
@ -2758,8 +2758,8 @@ static void setReleaseOptions(Settings::PCompilerSet pSet) {
|
|||
pSet->setCompileOption(LINK_CMD_OPT_STRIP_EXE, COMPILER_OPTION_ON);
|
||||
pSet->setCompileOption(CC_CMD_OPT_USE_PIPE, COMPILER_OPTION_ON);
|
||||
pSet->setStaticLink(true);
|
||||
pSet->setMaxObjectSize(2); //default stack size of gcc is 2MB
|
||||
pSet->setWarnLargeObject(false);
|
||||
pSet->setMaxFrameSize(2); //default stack size of gcc is 2MB
|
||||
pSet->setWarnLargeFrame(false);
|
||||
}
|
||||
|
||||
static void setDebugOptions(Settings::PCompilerSet pSet, bool enableAsan = false) {
|
||||
|
@ -2779,8 +2779,8 @@ static void setDebugOptions(Settings::PCompilerSet pSet, bool enableAsan = false
|
|||
pSet->setCompileOption(CC_CMD_OPT_STACK_PROTECTOR, "-strong");
|
||||
pSet->setStaticLink(false);
|
||||
|
||||
pSet->setMaxObjectSize(2); //default stack size of gcc is 2MB
|
||||
pSet->setWarnLargeObject(true);
|
||||
pSet->setMaxFrameSize(2); //default stack size of gcc is 2MB
|
||||
pSet->setWarnLargeFrame(true);
|
||||
}
|
||||
|
||||
bool Settings::CompilerSets::addSets(const QString &folder, const QString& c_prog) {
|
||||
|
@ -3122,8 +3122,9 @@ void Settings::CompilerSets::saveSet(int index)
|
|||
mSettings->mSettings.setValue("AddCharset", pSet->autoAddCharsetParams());
|
||||
mSettings->mSettings.setValue("StaticLink", pSet->staticLink());
|
||||
mSettings->mSettings.setValue("ExecCharset", pSet->execCharset());
|
||||
mSettings->mSettings.setValue("WarnLargeObject",pSet->warnLargeObject());
|
||||
mSettings->mSettings.setValue("MaxObjectSize",pSet->maxObjectSize());
|
||||
mSettings->mSettings.setValue("WarnLargeFrame",pSet->warnLargeFrame());
|
||||
mSettings->mSettings.setValue("MaxFrameSize",pSet->maxFrameSize());
|
||||
|
||||
|
||||
mSettings->mSettings.setValue("preprocessingSuffix", pSet->preprocessingSuffix());
|
||||
mSettings->mSettings.setValue("compilationProperSuffix", pSet->compilationProperSuffix());
|
||||
|
@ -3207,8 +3208,8 @@ Settings::PCompilerSet Settings::CompilerSets::loadSet(int index)
|
|||
pSet->setCustomLinkParams(mSettings->mSettings.value("customLinkParams").toString());
|
||||
pSet->setAutoAddCharsetParams(mSettings->mSettings.value("AddCharset", true).toBool());
|
||||
pSet->setStaticLink(mSettings->mSettings.value("StaticLink", false).toBool());
|
||||
pSet->setMaxObjectSize(mSettings->mSettings.value("MaxObjectSize", 2).toDouble());
|
||||
pSet->setWarnLargeObject(mSettings->mSettings.value("WarnLargeObject", false).toBool());
|
||||
pSet->setMaxFrameSize(mSettings->mSettings.value("MaxFrameSize", 1).toDouble());
|
||||
pSet->setWarnLargeFrame(mSettings->mSettings.value("WarnLargeFrame", false).toBool());
|
||||
|
||||
pSet->setExecCharset(mSettings->mSettings.value("ExecCharset", ENCODING_SYSTEM_DEFAULT).toString());
|
||||
if (pSet->execCharset().isEmpty()) {
|
||||
|
|
|
@ -1427,11 +1427,11 @@ public:
|
|||
bool isOutputExecutable();
|
||||
bool isOutputExecutable(Settings::CompilerSet::CompilationStage stage);
|
||||
|
||||
double maxObjectSize() const;
|
||||
void setMaxObjectSize(double maxObjectSize);
|
||||
double maxFrameSize() const;
|
||||
void setMaxFrameSize(double maxFrameSize);
|
||||
|
||||
bool warnLargeObject() const;
|
||||
void setWarnLargeObject(bool newWarnLargeObject);
|
||||
bool warnLargeFrame() const;
|
||||
void setWarnLargeFrame(bool newWarnLargeObject);
|
||||
|
||||
private:
|
||||
void setDirectories(const QString& binDir, CompilerType mCompilerType);
|
||||
|
@ -1478,7 +1478,7 @@ public:
|
|||
bool mAutoAddCharsetParams;
|
||||
QString mExecCharset;
|
||||
bool mStaticLink;
|
||||
double mMaxObjectSize;
|
||||
double mMaxFrameSize;
|
||||
bool mWarnLargeObject;
|
||||
|
||||
QString mPreprocessingSuffix;
|
||||
|
|
|
@ -88,8 +88,8 @@ static void loadCompilerSetSettings(Settings::PCompilerSet pSet, Ui::CompilerSet
|
|||
ui->txtCustomLinkParams->setEnabled(pSet->useCustomLinkParams());
|
||||
ui->chkAutoAddCharset->setChecked(pSet->autoAddCharsetParams());
|
||||
ui->chkStaticLink->setChecked(pSet->staticLink());
|
||||
ui->spinMaxObjectSize->setValue(pSet->maxObjectSize());
|
||||
ui->chkWarnLargeObject->setChecked(pSet->warnLargeObject());
|
||||
ui->spinMaxObjectSize->setValue(pSet->maxFrameSize());
|
||||
ui->chkWarnLargeObject->setChecked(pSet->warnLargeFrame());
|
||||
//rest tabs in the options widget
|
||||
|
||||
ui->optionTabs->resetUI(pSet,pSet->compileOptions());
|
||||
|
@ -201,8 +201,8 @@ void CompilerSetOptionWidget::saveCurrentCompilerSet()
|
|||
pSet->setCustomLinkParams(ui->txtCustomLinkParams->toPlainText().trimmed());
|
||||
pSet->setAutoAddCharsetParams(ui->chkAutoAddCharset->isChecked());
|
||||
pSet->setStaticLink(ui->chkStaticLink->isChecked());
|
||||
pSet->setMaxObjectSize(ui->spinMaxObjectSize->value());
|
||||
pSet->setWarnLargeObject(ui->chkWarnLargeObject->isChecked());
|
||||
pSet->setMaxFrameSize(ui->spinMaxObjectSize->value());
|
||||
pSet->setWarnLargeFrame(ui->chkWarnLargeObject->isChecked());
|
||||
|
||||
pSet->setCCompiler(ui->txtCCompiler->text().trimmed());
|
||||
pSet->setCppCompiler(ui->txtCppCompiler->text().trimmed());
|
||||
|
|
|
@ -189,7 +189,7 @@
|
|||
<item>
|
||||
<widget class="QCheckBox" name="chkWarnLargeObject">
|
||||
<property name="text">
|
||||
<string>Syntax error for objects larger than</string>
|
||||
<string>Syntax error for stack frame larger than</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
@ -760,7 +760,7 @@
|
|||
<translation type="unfinished">MB</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Syntax error for objects larger than</source>
|
||||
<source>Syntax error for stack frame larger than</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
@ -7822,10 +7822,6 @@
|
|||
<source>Write to tools config file '%1' failed.</source>
|
||||
<translation>Falha ao gravar o arquivo de configurações '%1'.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Open compiled in explorer</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>WatchModel</name>
|
||||
|
|
|
@ -760,9 +760,8 @@ p, li { white-space: pre-wrap; }
|
|||
<translation>编译器配置方案</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../settingsdialog/compilersetoptionwidget.ui" line="192"/>
|
||||
<source>Syntax error for objects larger than</source>
|
||||
<translation>当变量占用栈空间大于此值时报错</translation>
|
||||
<translation type="vanished">当变量占用栈空间大于此值时报错</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../settingsdialog/compilersetoptionwidget.ui" line="322"/>
|
||||
|
@ -834,6 +833,11 @@ p, li { white-space: pre-wrap; }
|
|||
<source>Statically link libraries</source>
|
||||
<translation>用静态链接方式链接库文件</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../settingsdialog/compilersetoptionwidget.ui" line="192"/>
|
||||
<source>Syntax error for stack frame larger than</source>
|
||||
<translation>单个函数栈大小超过指定值时报错:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../settingsdialog/compilersetoptionwidget.ui" line="199"/>
|
||||
<source>MB</source>
|
||||
|
@ -4751,7 +4755,7 @@ Are you really want to continue?</oldsource>
|
|||
<location filename="../mainwindow.ui" line="786"/>
|
||||
<location filename="../mainwindow.ui" line="789"/>
|
||||
<location filename="../mainwindow.cpp" line="2549"/>
|
||||
<location filename="../mainwindow.cpp" line="8330"/>
|
||||
<location filename="../mainwindow.cpp" line="8321"/>
|
||||
<source>New Problem Set</source>
|
||||
<translation>新建试题集</translation>
|
||||
</message>
|
||||
|
@ -4773,7 +4777,7 @@ Are you really want to continue?</oldsource>
|
|||
<location filename="../mainwindow.ui" line="828"/>
|
||||
<location filename="../mainwindow.ui" line="831"/>
|
||||
<location filename="../mainwindow.cpp" line="2563"/>
|
||||
<location filename="../mainwindow.cpp" line="8391"/>
|
||||
<location filename="../mainwindow.cpp" line="8382"/>
|
||||
<source>Save Problem Set</source>
|
||||
<translation>保存试题集</translation>
|
||||
</message>
|
||||
|
@ -4781,7 +4785,7 @@ Are you really want to continue?</oldsource>
|
|||
<location filename="../mainwindow.ui" line="842"/>
|
||||
<location filename="../mainwindow.ui" line="845"/>
|
||||
<location filename="../mainwindow.cpp" line="2570"/>
|
||||
<location filename="../mainwindow.cpp" line="8427"/>
|
||||
<location filename="../mainwindow.cpp" line="8418"/>
|
||||
<source>Load Problem Set</source>
|
||||
<translation>载入试题集</translation>
|
||||
</message>
|
||||
|
@ -4912,14 +4916,14 @@ Are you really want to continue?</oldsource>
|
|||
<message>
|
||||
<location filename="../mainwindow.ui" line="856"/>
|
||||
<location filename="../mainwindow.cpp" line="2576"/>
|
||||
<location filename="../mainwindow.cpp" line="9576"/>
|
||||
<location filename="../mainwindow.cpp" line="9579"/>
|
||||
<source>Import FPS Problem Set</source>
|
||||
<translation>导入FPS试题集</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.ui" line="867"/>
|
||||
<location filename="../mainwindow.cpp" line="2582"/>
|
||||
<location filename="../mainwindow.cpp" line="9607"/>
|
||||
<location filename="../mainwindow.cpp" line="9610"/>
|
||||
<source>Export FPS Problem Set</source>
|
||||
<translation>导出FPS试题集</translation>
|
||||
</message>
|
||||
|
@ -5493,13 +5497,13 @@ Are you really want to continue?</oldsource>
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.ui" line="2816"/>
|
||||
<location filename="../mainwindow.cpp" line="8096"/>
|
||||
<location filename="../mainwindow.cpp" line="8087"/>
|
||||
<source>Export As RTF</source>
|
||||
<translation>导出为RTF</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.ui" line="2821"/>
|
||||
<location filename="../mainwindow.cpp" line="8118"/>
|
||||
<location filename="../mainwindow.cpp" line="8109"/>
|
||||
<source>Export As HTML</source>
|
||||
<translation>导出为HTML</translation>
|
||||
</message>
|
||||
|
@ -5998,22 +6002,22 @@ Are you really want to continue?</oldsource>
|
|||
<translation>全部复制</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="9475"/>
|
||||
<location filename="../mainwindow.cpp" line="9478"/>
|
||||
<source>Go to Line</source>
|
||||
<translation>跳转到行</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="9475"/>
|
||||
<location filename="../mainwindow.cpp" line="9478"/>
|
||||
<source>Line</source>
|
||||
<translation>行</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="9497"/>
|
||||
<location filename="../mainwindow.cpp" line="9500"/>
|
||||
<source>Template Exists</source>
|
||||
<translation>模板已存在</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="9498"/>
|
||||
<location filename="../mainwindow.cpp" line="9501"/>
|
||||
<source>Template %1 already exists. Do you want to overwrite?</source>
|
||||
<translation>模板%1已存在。是否覆盖?</translation>
|
||||
</message>
|
||||
|
@ -6039,7 +6043,7 @@ Are you really want to continue?</oldsource>
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="333"/>
|
||||
<location filename="../mainwindow.cpp" line="8339"/>
|
||||
<location filename="../mainwindow.cpp" line="8330"/>
|
||||
<source>Problem Set %1</source>
|
||||
<translation>试题集%1</translation>
|
||||
</message>
|
||||
|
@ -6109,15 +6113,15 @@ Are you really want to continue?</oldsource>
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="4508"/>
|
||||
<location filename="../mainwindow.cpp" line="8188"/>
|
||||
<location filename="../mainwindow.cpp" line="8230"/>
|
||||
<location filename="../mainwindow.cpp" line="8179"/>
|
||||
<location filename="../mainwindow.cpp" line="8221"/>
|
||||
<source>Bookmark Description</source>
|
||||
<translation>书签描述</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="4509"/>
|
||||
<location filename="../mainwindow.cpp" line="8189"/>
|
||||
<location filename="../mainwindow.cpp" line="8231"/>
|
||||
<location filename="../mainwindow.cpp" line="8180"/>
|
||||
<location filename="../mainwindow.cpp" line="8222"/>
|
||||
<source>Description:</source>
|
||||
<translation>描述:</translation>
|
||||
</message>
|
||||
|
@ -6447,12 +6451,12 @@ Are you really want to continue?</oldsource>
|
|||
<translation>保存设置失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="9705"/>
|
||||
<location filename="../mainwindow.cpp" line="9708"/>
|
||||
<source>Watchpoint variable name</source>
|
||||
<translation>被监控的变量</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="9706"/>
|
||||
<location filename="../mainwindow.cpp" line="9709"/>
|
||||
<source>Stop execution when the following variable is modified (it must be visible from the currect scope):</source>
|
||||
<translation>当下面的变量被修改时暂停执行(该变量必须可以从当前程序处访问):</translation>
|
||||
</message>
|
||||
|
@ -6461,17 +6465,17 @@ Are you really want to continue?</oldsource>
|
|||
<translation type="vanished">中止</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="9578"/>
|
||||
<location filename="../mainwindow.cpp" line="9581"/>
|
||||
<source>FPS Problem Set Files (*.fps;*.xml)</source>
|
||||
<translation>FPS试题集文件(*.fps;*.xml)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="9609"/>
|
||||
<location filename="../mainwindow.cpp" line="9612"/>
|
||||
<source>FPS Problem Set Files (*.fps)</source>
|
||||
<translation>FPS试题集文件(*.fps)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="9614"/>
|
||||
<location filename="../mainwindow.cpp" line="9617"/>
|
||||
<source>Export Error</source>
|
||||
<translation>导出时出错</translation>
|
||||
</message>
|
||||
|
@ -6532,7 +6536,7 @@ Are you really want to continue?</oldsource>
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="5119"/>
|
||||
<location filename="../mainwindow.cpp" line="8333"/>
|
||||
<location filename="../mainwindow.cpp" line="8324"/>
|
||||
<source>Do you want to save it?</source>
|
||||
<translation>需要保存吗?</translation>
|
||||
</message>
|
||||
|
@ -6544,15 +6548,15 @@ Are you really want to continue?</oldsource>
|
|||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="5326"/>
|
||||
<location filename="../mainwindow.cpp" line="9653"/>
|
||||
<location filename="../mainwindow.cpp" line="9720"/>
|
||||
<location filename="../mainwindow.cpp" line="9656"/>
|
||||
<location filename="../mainwindow.cpp" line="9723"/>
|
||||
<source>New Project File?</source>
|
||||
<translation>新建项目文件?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="5327"/>
|
||||
<location filename="../mainwindow.cpp" line="9654"/>
|
||||
<location filename="../mainwindow.cpp" line="9721"/>
|
||||
<location filename="../mainwindow.cpp" line="9657"/>
|
||||
<location filename="../mainwindow.cpp" line="9724"/>
|
||||
<source>Do you want to add the new file to the project?</source>
|
||||
<translation>您是否要将新建的文件加入项目?</translation>
|
||||
</message>
|
||||
|
@ -6561,7 +6565,7 @@ Are you really want to continue?</oldsource>
|
|||
<location filename="../mainwindow.cpp" line="5424"/>
|
||||
<location filename="../mainwindow.cpp" line="5435"/>
|
||||
<location filename="../mainwindow.cpp" line="5445"/>
|
||||
<location filename="../mainwindow.cpp" line="8416"/>
|
||||
<location filename="../mainwindow.cpp" line="8407"/>
|
||||
<source>Save Error</source>
|
||||
<translation>保存失败</translation>
|
||||
</message>
|
||||
|
@ -6660,18 +6664,18 @@ Are you really want to continue?</oldsource>
|
|||
<translation>你真的要删除它吗?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8253"/>
|
||||
<location filename="../mainwindow.cpp" line="8244"/>
|
||||
<source>Change working folder</source>
|
||||
<translation>改变工作文件夹</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8254"/>
|
||||
<location filename="../mainwindow.cpp" line="8245"/>
|
||||
<source>File '%1' is not in the current working folder.</source>
|
||||
<oldsource>File '%1' is not in the current working folder</oldsource>
|
||||
<translation>文件'%1'不在当前工作文件夹中。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8257"/>
|
||||
<location filename="../mainwindow.cpp" line="8248"/>
|
||||
<source>Do you want to change working folder to '%1'?</source>
|
||||
<translation>是否将工作文件夹改设为'%1'?</translation>
|
||||
</message>
|
||||
|
@ -6680,28 +6684,28 @@ Are you really want to continue?</oldsource>
|
|||
<translation type="vanished">正在删除试题...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8997"/>
|
||||
<location filename="../mainwindow.cpp" line="9000"/>
|
||||
<source>Can't Commit</source>
|
||||
<translation>无法提交</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8998"/>
|
||||
<location filename="../mainwindow.cpp" line="9001"/>
|
||||
<source>Git needs user info to commit.</source>
|
||||
<translation>Git需要用信息进行提交。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="9266"/>
|
||||
<location filename="../mainwindow.cpp" line="9269"/>
|
||||
<source>Choose Input Data File</source>
|
||||
<translation>选择输入数据文件</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="9268"/>
|
||||
<location filename="../mainwindow.cpp" line="9323"/>
|
||||
<location filename="../mainwindow.cpp" line="9271"/>
|
||||
<location filename="../mainwindow.cpp" line="9326"/>
|
||||
<source>All files (*.*)</source>
|
||||
<translation>所有文件 (*.*)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="9321"/>
|
||||
<location filename="../mainwindow.cpp" line="9324"/>
|
||||
<source>Choose Expected Output Data File</source>
|
||||
<oldsource>Choose Expected Input Data File</oldsource>
|
||||
<translation>选择期望输出文件</translation>
|
||||
|
@ -6713,59 +6717,59 @@ Are you really want to continue?</oldsource>
|
|||
<message>
|
||||
<location filename="../mainwindow.ui" line="2886"/>
|
||||
<location filename="../mainwindow.ui" line="2889"/>
|
||||
<location filename="../mainwindow.cpp" line="8309"/>
|
||||
<location filename="../mainwindow.cpp" line="8300"/>
|
||||
<source>Choose Working Folder</source>
|
||||
<translation>选择工作文件夹</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8766"/>
|
||||
<location filename="../mainwindow.cpp" line="8815"/>
|
||||
<location filename="../mainwindow.cpp" line="8769"/>
|
||||
<location filename="../mainwindow.cpp" line="8818"/>
|
||||
<source>Header Exists</source>
|
||||
<translation>头文件已存在</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8767"/>
|
||||
<location filename="../mainwindow.cpp" line="8816"/>
|
||||
<location filename="../mainwindow.cpp" line="8770"/>
|
||||
<location filename="../mainwindow.cpp" line="8819"/>
|
||||
<source>Header file "%1" already exists!</source>
|
||||
<translation>头文件"%1"已存在!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8821"/>
|
||||
<location filename="../mainwindow.cpp" line="8824"/>
|
||||
<source>Source Exists</source>
|
||||
<translation>源文件已存在!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8822"/>
|
||||
<location filename="../mainwindow.cpp" line="8825"/>
|
||||
<source>Source file "%1" already exists!</source>
|
||||
<translation>源文件"%1"已存在!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8976"/>
|
||||
<location filename="../mainwindow.cpp" line="8979"/>
|
||||
<source>Can't commit!</source>
|
||||
<translation>无法提交!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8977"/>
|
||||
<location filename="../mainwindow.cpp" line="8980"/>
|
||||
<source>The following files are in conflicting:</source>
|
||||
<translation>下列文件处于冲突状态,请解决后重新添加和提交:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8982"/>
|
||||
<location filename="../mainwindow.cpp" line="8985"/>
|
||||
<source>Commit Message</source>
|
||||
<translation>提交信息</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8982"/>
|
||||
<location filename="../mainwindow.cpp" line="8985"/>
|
||||
<source>Commit Message:</source>
|
||||
<translation>提交信息:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8985"/>
|
||||
<location filename="../mainwindow.cpp" line="8988"/>
|
||||
<source>Commit Failed</source>
|
||||
<translation>提交失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8986"/>
|
||||
<location filename="../mainwindow.cpp" line="8989"/>
|
||||
<source>Commit message shouldn't be empty!</source>
|
||||
<translation>提交信息不能为空!</translation>
|
||||
</message>
|
||||
|
@ -6906,58 +6910,58 @@ Are you really want to continue?</oldsource>
|
|||
<translation>新名称</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8001"/>
|
||||
<location filename="../mainwindow.cpp" line="8024"/>
|
||||
<location filename="../mainwindow.cpp" line="8035"/>
|
||||
<location filename="../mainwindow.cpp" line="8056"/>
|
||||
<location filename="../mainwindow.cpp" line="7992"/>
|
||||
<location filename="../mainwindow.cpp" line="8015"/>
|
||||
<location filename="../mainwindow.cpp" line="8026"/>
|
||||
<location filename="../mainwindow.cpp" line="8047"/>
|
||||
<source>Replace Error</source>
|
||||
<translation>替换出错</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8002"/>
|
||||
<location filename="../mainwindow.cpp" line="7993"/>
|
||||
<source>Can't open file '%1' for replace!</source>
|
||||
<translation>无法打开文件'%1'进行替换!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8036"/>
|
||||
<location filename="../mainwindow.cpp" line="8027"/>
|
||||
<source>Contents has changed since last search!</source>
|
||||
<translation>内容和上次查找时不一致。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8098"/>
|
||||
<location filename="../mainwindow.cpp" line="8089"/>
|
||||
<source>Rich Text Format Files (*.rtf)</source>
|
||||
<translation>RTF格式文件 (*.rtf)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8120"/>
|
||||
<location filename="../mainwindow.cpp" line="8111"/>
|
||||
<source>HTML Files (*.html)</source>
|
||||
<translation>HTML文件 (*.html)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8331"/>
|
||||
<location filename="../mainwindow.cpp" line="8322"/>
|
||||
<source>The current problem set is not empty.</source>
|
||||
<translation>当前的试题集不是空的。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8350"/>
|
||||
<location filename="../mainwindow.cpp" line="8341"/>
|
||||
<source>Problem %1</source>
|
||||
<translation>试题%1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8398"/>
|
||||
<location filename="../mainwindow.cpp" line="8429"/>
|
||||
<location filename="../mainwindow.cpp" line="8389"/>
|
||||
<location filename="../mainwindow.cpp" line="8420"/>
|
||||
<source>Problem Set Files (*.pbs)</source>
|
||||
<translation>试题集文件 (*.pbs)</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8443"/>
|
||||
<location filename="../mainwindow.cpp" line="9586"/>
|
||||
<location filename="../mainwindow.cpp" line="8434"/>
|
||||
<location filename="../mainwindow.cpp" line="9589"/>
|
||||
<source>Load Error</source>
|
||||
<translation>载入失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="4197"/>
|
||||
<location filename="../mainwindow.cpp" line="8457"/>
|
||||
<location filename="../mainwindow.cpp" line="8448"/>
|
||||
<source>Problem Case %1</source>
|
||||
<translation>试题案例%1</translation>
|
||||
</message>
|
||||
|
@ -6975,7 +6979,7 @@ Are you really want to continue?</oldsource>
|
|||
<location filename="../mainwindow.cpp" line="5369"/>
|
||||
<location filename="../mainwindow.cpp" line="6082"/>
|
||||
<location filename="../mainwindow.cpp" line="6094"/>
|
||||
<location filename="../mainwindow.cpp" line="9406"/>
|
||||
<location filename="../mainwindow.cpp" line="9409"/>
|
||||
<source>Error</source>
|
||||
<translation>错误</translation>
|
||||
</message>
|
||||
|
@ -7051,7 +7055,7 @@ Are you really want to continue?</oldsource>
|
|||
<location filename="../mainwindow.cpp" line="3465"/>
|
||||
<location filename="../mainwindow.cpp" line="6111"/>
|
||||
<location filename="../mainwindow.cpp" line="6125"/>
|
||||
<location filename="../mainwindow.cpp" line="9389"/>
|
||||
<location filename="../mainwindow.cpp" line="9392"/>
|
||||
<source>Confirm Convertion</source>
|
||||
<translation>确认转换</translation>
|
||||
</message>
|
||||
|
@ -7059,7 +7063,7 @@ Are you really want to continue?</oldsource>
|
|||
<location filename="../mainwindow.cpp" line="3466"/>
|
||||
<location filename="../mainwindow.cpp" line="6112"/>
|
||||
<location filename="../mainwindow.cpp" line="6126"/>
|
||||
<location filename="../mainwindow.cpp" line="9390"/>
|
||||
<location filename="../mainwindow.cpp" line="9393"/>
|
||||
<source>The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue?</source>
|
||||
<translation>当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗?</translation>
|
||||
</message>
|
||||
|
@ -7745,43 +7749,43 @@ Are you really want to continue?</oldsource>
|
|||
<translation>- 资源文件: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="574"/>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="576"/>
|
||||
<source>Compiling project changes...</source>
|
||||
<translation>正在编译项目修改...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="576"/>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="578"/>
|
||||
<source>- Project Filename: %1</source>
|
||||
<translation>- 项目文件名: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="577"/>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="579"/>
|
||||
<source>- Compiler Set Name: %1</source>
|
||||
<translation>- 编译器配置: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="586"/>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="588"/>
|
||||
<source>Make program '%1' doesn't exists!</source>
|
||||
<translation>Make程序“%1”不存在!</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="588"/>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="590"/>
|
||||
<source>Please check the "program" page of compiler settings.</source>
|
||||
<translation>请检查编译器配置中的“程序”页。</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="622"/>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="624"/>
|
||||
<source>Processing makefile:</source>
|
||||
<translation>正在处理makefile...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="624"/>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="626"/>
|
||||
<source>- makefile processer: %1</source>
|
||||
<translation>- makefile处理器: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="625"/>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="627"/>
|
||||
<location filename="../compiler/projectcompiler.cpp" line="629"/>
|
||||
<source>- Command: %1 %2</source>
|
||||
<translation>- 命令: %1 %2</translation>
|
||||
</message>
|
||||
|
@ -10172,7 +10176,7 @@ Are you really want to continue?</oldsource>
|
|||
<message>
|
||||
<location filename="../mainwindow.cpp" line="2194"/>
|
||||
<location filename="../mainwindow.cpp" line="2313"/>
|
||||
<location filename="../mainwindow.cpp" line="9414"/>
|
||||
<location filename="../mainwindow.cpp" line="9417"/>
|
||||
<location filename="../settingsdialog/settingsdialog.cpp" line="169"/>
|
||||
<location filename="../settingsdialog/settingsdialog.cpp" line="257"/>
|
||||
<source>Compiler Set</source>
|
||||
|
@ -10181,7 +10185,7 @@ Are you really want to continue?</oldsource>
|
|||
<message>
|
||||
<location filename="../mainwindow.cpp" line="2195"/>
|
||||
<location filename="../mainwindow.cpp" line="2314"/>
|
||||
<location filename="../mainwindow.cpp" line="9415"/>
|
||||
<location filename="../mainwindow.cpp" line="9418"/>
|
||||
<location filename="../settingsdialog/settingsdialog.cpp" line="169"/>
|
||||
<location filename="../settingsdialog/settingsdialog.cpp" line="172"/>
|
||||
<source>Compiler</source>
|
||||
|
@ -10193,7 +10197,7 @@ Are you really want to continue?</oldsource>
|
|||
<translation>自动链接</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8320"/>
|
||||
<location filename="../mainwindow.cpp" line="8311"/>
|
||||
<location filename="../settingsdialog/settingsdialog.cpp" line="175"/>
|
||||
<location filename="../settingsdialog/settingsdialog.cpp" line="216"/>
|
||||
<location filename="../settingsdialog/settingsdialog.cpp" line="222"/>
|
||||
|
@ -10269,15 +10273,15 @@ Are you really want to continue?</oldsource>
|
|||
<translation>杂项</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8321"/>
|
||||
<location filename="../mainwindow.cpp" line="8713"/>
|
||||
<location filename="../mainwindow.cpp" line="8312"/>
|
||||
<location filename="../mainwindow.cpp" line="8716"/>
|
||||
<location filename="../settingsdialog/settingsdialog.cpp" line="216"/>
|
||||
<location filename="../settingsdialog/settingsdialog.cpp" line="219"/>
|
||||
<source>Program Runner</source>
|
||||
<translation>程序运行</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../mainwindow.cpp" line="8712"/>
|
||||
<location filename="../mainwindow.cpp" line="8715"/>
|
||||
<location filename="../settingsdialog/settingsdialog.cpp" line="219"/>
|
||||
<source>Problem Set</source>
|
||||
<translation>试题集</translation>
|
||||
|
@ -10763,9 +10767,8 @@ Are you really want to continue?</oldsource>
|
|||
<translation>删除编译文件</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../toolsmanager.cpp" line="51"/>
|
||||
<source>Open compiled in explorer</source>
|
||||
<translation>在文件管理器中打开编译结果</translation>
|
||||
<translation type="vanished">在文件管理器中打开编译结果</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../toolsmanager.cpp" line="64"/>
|
||||
|
|
|
@ -657,7 +657,7 @@
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Syntax error for objects larger than</source>
|
||||
<source>Syntax error for stack frame larger than</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
|
@ -7158,10 +7158,6 @@
|
|||
<source>Write to tools config file '%1' failed.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Open compiled in explorer</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>WatchModel</name>
|
||||
|
|
|
@ -14,7 +14,7 @@ qsynedit.subdir = libs/qsynedit
|
|||
|
||||
APP_NAME = RedPandaCPP
|
||||
|
||||
APP_VERSION = 2.19
|
||||
APP_VERSION = 2.20
|
||||
|
||||
# Add the dependencies so that the RedPandaIDE project can add the depended programs
|
||||
# into the main app bundle
|
||||
|
|
|
@ -20,3 +20,4 @@ Cpp[zh_CN]=WinApp_zh_CN.c
|
|||
[Project]
|
||||
UnitCount=1
|
||||
Type=0
|
||||
Encoding=UTF-8
|
||||
|
|
|
@ -17,4 +17,5 @@ UnitCount=1
|
|||
Type=1
|
||||
IsCpp=0
|
||||
linker=-lrdrawing -lraylib -lopengl32 -lgdi32 -lwinmm
|
||||
Encoding=UTF-8
|
||||
ExecEncoding=UTF-8
|
||||
|
|
Loading…
Reference in New Issue