diff --git a/NEWS.md b/NEWS.md
index f522bab5..a7fbc895 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -16,6 +16,7 @@ Red Panda C++ Version 3.1
- fix: All color scheme names are incorrectly displayed as bold, if the current one is a customed one.
- fix: Variables defined by using alias can't show completion info.
- enhancement: Support operator() overload.
+ - change: rename all "ansi" encoding to "system default".
Red Panda C++ Version 3.0
diff --git a/RedPandaIDE/settingsdialog/compilersetoptionwidget.cpp b/RedPandaIDE/settingsdialog/compilersetoptionwidget.cpp
index 3ae56149..cdc1c6bb 100644
--- a/RedPandaIDE/settingsdialog/compilersetoptionwidget.cpp
+++ b/RedPandaIDE/settingsdialog/compilersetoptionwidget.cpp
@@ -65,7 +65,7 @@ void CompilerSetOptionWidget::init()
{
ui->cbEncodingDetails->setVisible(false);
ui->cbEncoding->clear();
- ui->cbEncoding->addItem(tr("ANSI"),ENCODING_SYSTEM_DEFAULT);
+ ui->cbEncoding->addItem(tr("System Default(%1)").arg(QString(pCharsetInfoManager->getDefaultSystemEncoding())),ENCODING_SYSTEM_DEFAULT);
ui->cbEncoding->addItem(tr("UTF-8"),ENCODING_UTF8);
foreach (const QString& langName, pCharsetInfoManager->languageNames()) {
ui->cbEncoding->addItem(langName,langName);
diff --git a/RedPandaIDE/settingsdialog/editormiscwidget.cpp b/RedPandaIDE/settingsdialog/editormiscwidget.cpp
index 4d7bb962..c34beb40 100644
--- a/RedPandaIDE/settingsdialog/editormiscwidget.cpp
+++ b/RedPandaIDE/settingsdialog/editormiscwidget.cpp
@@ -99,7 +99,7 @@ void EditorMiscWidget::init()
{
ui->cbEncodingDetail->setVisible(false);
ui->cbEncoding->clear();
- ui->cbEncoding->addItem(tr("ANSI"),ENCODING_SYSTEM_DEFAULT);
+ ui->cbEncoding->addItem(tr("System Default(%1)").arg(QString(pCharsetInfoManager->getDefaultSystemEncoding())),ENCODING_SYSTEM_DEFAULT);
ui->cbEncoding->addItem(tr("UTF-8"),ENCODING_UTF8);
ui->cbEncoding->addItem(tr("UTF-8 BOM"),ENCODING_UTF8_BOM);
foreach (const QString& langName, pCharsetInfoManager->languageNames()) {
diff --git a/RedPandaIDE/settingsdialog/projectcompilerwidget.cpp b/RedPandaIDE/settingsdialog/projectcompilerwidget.cpp
index 79dca66e..e885ad2e 100644
--- a/RedPandaIDE/settingsdialog/projectcompilerwidget.cpp
+++ b/RedPandaIDE/settingsdialog/projectcompilerwidget.cpp
@@ -117,7 +117,7 @@ void ProjectCompilerWidget::init()
ui->cbCompilerSet->blockSignals(false);
ui->cbEncodingDetails->setVisible(false);
ui->cbEncoding->clear();
- ui->cbEncoding->addItem(tr("ANSI"),ENCODING_SYSTEM_DEFAULT);
+ ui->cbEncoding->addItem(tr("System Default(%1)").arg(QString(pCharsetInfoManager->getDefaultSystemEncoding())),ENCODING_SYSTEM_DEFAULT);
ui->cbEncoding->addItem(tr("UTF-8"),ENCODING_UTF8);
foreach (const QString& langName, pCharsetInfoManager->languageNames()) {
ui->cbEncoding->addItem(langName,langName);
diff --git a/RedPandaIDE/settingsdialog/projectfileswidget.cpp b/RedPandaIDE/settingsdialog/projectfileswidget.cpp
index 6ddf940d..a3e495e1 100644
--- a/RedPandaIDE/settingsdialog/projectfileswidget.cpp
+++ b/RedPandaIDE/settingsdialog/projectfileswidget.cpp
@@ -36,7 +36,7 @@ void ProjectFilesWidget::doLoad()
{
if (ui->cbEncoding->count()>0) {
if (pMainWindow->project()->options().encoding==ENCODING_SYSTEM_DEFAULT) {
- ui->cbEncoding->setItemText(0,tr("Project(%1)").arg(tr("ANSI")));
+ ui->cbEncoding->setItemText(0,tr("Project(%1)").arg(tr("System Default")));
} else {
ui->cbEncoding->setItemText(0,tr("Project(%1)").arg(QString(pMainWindow->project()->options().encoding)));
}
@@ -269,7 +269,7 @@ void ProjectFilesWidget::init()
} else {
ui->cbEncoding->addItem(tr("Project(%1)").arg(QString(project->options().encoding)),ENCODING_PROJECT);
}
- ui->cbEncoding->addItem(tr("ANSI"),ENCODING_SYSTEM_DEFAULT);
+ ui->cbEncoding->addItem(tr("System Default(%1)").arg(QString(pCharsetInfoManager->getDefaultSystemEncoding())),ENCODING_SYSTEM_DEFAULT);
ui->cbEncoding->addItem(tr("UTF-8"),ENCODING_UTF8);
foreach (const QString& langName, pCharsetInfoManager->languageNames()) {
ui->cbEncoding->addItem(langName,langName);
diff --git a/RedPandaIDE/settingsdialog/projectgeneralwidget.cpp b/RedPandaIDE/settingsdialog/projectgeneralwidget.cpp
index f0a274fc..59a592ca 100644
--- a/RedPandaIDE/settingsdialog/projectgeneralwidget.cpp
+++ b/RedPandaIDE/settingsdialog/projectgeneralwidget.cpp
@@ -221,7 +221,7 @@ void ProjectGeneralWidget::init()
{
ui->cbEncodingDetail->setVisible(false);
ui->cbEncoding->clear();
- ui->cbEncoding->addItem(tr("ANSI"),ENCODING_SYSTEM_DEFAULT);
+ ui->cbEncoding->addItem(tr("System Default(%1)").arg(QString(pCharsetInfoManager->getDefaultSystemEncoding())),ENCODING_SYSTEM_DEFAULT);
ui->cbEncoding->addItem(tr("UTF-8"),ENCODING_UTF8);
ui->cbEncoding->addItem(tr("UTF-8 BOM"),ENCODING_UTF8_BOM);
foreach (const QString& langName, pCharsetInfoManager->languageNames()) {
diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts
index 418ced91..2e877424 100644
--- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts
+++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts
@@ -876,9 +876,13 @@
Compilador de recursos (windres)
-
ANSI
- ANSI
+ ANSI
+
+
+
+ System Default(%1)
+
@@ -1426,7 +1430,7 @@
Impossível encontrar astyle em "%1"
-
+
Break point condition
Condição de parada
@@ -1441,7 +1445,7 @@
Apenas leitura
-
+
Error Load File
Erro ao carregar arquivo
@@ -1789,7 +1793,7 @@
Remover ...
-
+
@@ -2104,9 +2108,13 @@
Arquivos C
-
ANSI
- ANSI
+ ANSI
+
+
+
+ System Default(%1)
+
@@ -7779,12 +7787,11 @@
Aplicar link às bibliotecas estáticas
-
ANSI
- ANSI
+ ANSI
-
+
UTF-8
UTF-8
@@ -7794,7 +7801,12 @@
Definir codificação para o executável:
-
+
+ System Default(%1)
+
+
+
+
Wrong Compiler Type
@@ -7930,11 +7942,19 @@
+ System Default
+
+
+
-
ANSI
ANSI
+
+
+ System Default(%1)
+
+
UTF-8
@@ -8063,8 +8083,12 @@
+ System Default(%1)
+
+
+
ANSI
- ANSI
+ ANSI
@@ -9028,7 +9052,7 @@
Índice %1 fora dos limites
-
+
bytes
bytes
diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts
index ee14a92a..cbb9623d 100644
--- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts
+++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts
@@ -1097,9 +1097,13 @@ p, li { white-space: pre-wrap; }
小熊猫C++ 将会清除以前搜索到的编译器配置列表，然后在下列文件夹中搜索编译器:<br/> '%1'<br/> '%2'<br />你确定要继续吗？
-
ANSI
- ANSI
+ ANSI
+
+
+
+ System Default(%1)
+ 系统默认(%1)
@@ -1688,7 +1692,7 @@ p, li { white-space: pre-wrap; }
找不到astyle程序"%1".
-
+
Break point condition
断点条件
@@ -2039,7 +2043,7 @@ p, li { white-space: pre-wrap; }
背景色
-
+
@@ -2428,9 +2432,13 @@ p, li { white-space: pre-wrap; }
C语言文件
-
ANSI
- ANSI
+ ANSI
+
+
+
+ System Default(%1)
+ 系统默认(%1)
@@ -8471,9 +8479,13 @@ p, li { white-space: pre-wrap; }
在编译时加入字符集选项
-
ANSI
- ANSI
+ ANSI
+
+
+
+ System Default(%1)
+ 系统默认(%1)
@@ -8629,11 +8641,19 @@ p, li { white-space: pre-wrap; }
+ System Default
+ 系统默认
+
+
-
ANSI
ANSI
+
+
+ System Default(%1)
+ 系统默认(%1)
+
ANSI(System default)
ANSI
@@ -8758,8 +8778,12 @@ p, li { white-space: pre-wrap; }
+ System Default(%1)
+ 系统默认(%1)
+
+
ANSI
- ANSI
+ ANSI
@@ -9620,7 +9644,7 @@ p, li { white-space: pre-wrap; }
下标"%1"越界
-
+
bytes
字节
diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts
index 7f5c9aed..395c29a4 100644
--- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts
+++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts
@@ -765,12 +765,7 @@
-
- ANSI
-
-
-
-
+
UTF-8
@@ -903,7 +898,12 @@
-
+
+ System Default(%1)
+
+
+
+
Abort
@@ -1247,7 +1247,7 @@
-
+
Break point condition
@@ -1262,7 +1262,7 @@
-
+
Error Load File
@@ -1590,7 +1590,7 @@
-
+
@@ -1890,7 +1890,7 @@
- ANSI
+ System Default(%1)
@@ -7308,12 +7308,7 @@
-
- ANSI
-
-
-
-
+
UTF-8
@@ -7323,7 +7318,12 @@
-
+
+ System Default(%1)
+
+
+
+
Wrong Compiler Type
@@ -7455,11 +7455,19 @@
+ System Default
+
+
+
-
ANSI
+
+
+ System Default(%1)
+
+
UTF-8
@@ -7568,7 +7576,7 @@
- ANSI
+ System Default(%1)
@@ -8387,7 +8395,7 @@
-
+
bytes