Skip to content

Commit 8844162

Browse files
committed
调整控件的提示词
1 parent b47a470 commit 8844162

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/EIDEProjectModules.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import * as child_process from 'child_process';
1010

1111
import { File } from "../lib/node-utility/File";
1212
import {
13-
view_str$compile$storageLayout, view_str$compile$useCustomScatterFile, view_str$compile$scatterFilePath,
13+
view_str$compile$storageLayout,
14+
view_str$compile$useCustomScatterFile, view_str$compile$scatterFilePath, view_str$compile$scatterFilePath_mdk,
1415
view_str$compile$floatingPointHardware, view_str$compile$cpuType, view_str$compile$deprecated,
1516
view_str$compile$options,
1617
view_str$flasher$binPath,
@@ -570,6 +571,9 @@ export abstract class ArmBaseCompileConfigModel
570571
}
571572

572573
GetKeyDescription(key: string): string {
574+
575+
const toolchain = this.prjConfigData.toolchain;
576+
573577
switch (key) {
574578
case 'cpuType':
575579
return view_str$compile$cpuType;
@@ -578,7 +582,9 @@ export abstract class ArmBaseCompileConfigModel
578582
case 'useCustomScatterFile':
579583
return view_str$compile$useCustomScatterFile;
580584
case 'scatterFilePath':
581-
return view_str$compile$scatterFilePath;
585+
return (toolchain == 'AC5' || toolchain == 'AC6')
586+
? view_str$compile$scatterFilePath_mdk
587+
: view_str$compile$scatterFilePath;
582588
case 'floatingPointHardware':
583589
return view_str$compile$floatingPointHardware;
584590
case 'options':

src/StringTable.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,18 @@ export const view_str$compile$storageLayout = [
209209
][langIndex];
210210

211211
export const view_str$compile$useCustomScatterFile = [
212-
'使用自定义的链接脚本',
213-
'Use Custom Linker Script File'
212+
'使用自定义的 Scatter File',
213+
'Use Custom Scatter File'
214214
][langIndex];
215215

216216
export const view_str$compile$scatterFilePath = [
217217
'链接脚本路径',
218218
'Linker Script File Path'
219219
][langIndex];
220+
export const view_str$compile$scatterFilePath_mdk = [
221+
'Scatter File 路径',
222+
'Scatter File Path'
223+
][langIndex];
220224

221225
export const view_str$compile$floatingPointHardware = [
222226
'硬件浮点选项',

0 commit comments

Comments
 (0)