Skip to content

Commit 89d6c0c

Browse files
author
noodlefighter
committed
UI优化：调整UI元素位置，简化文字描述
1 parent af7a56f commit 89d6c0c

File tree

2 files changed

+42
-40
lines changed

2 files changed

+42
-40
lines changed

‎src/i18n.ts‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace i18n {
1212
export var BUTTON_RESET: string = "还原配置";
1313

1414
export var LABEL_TIP_FILE: string = "> 文件 / 预处理";
15-
export var LABEL_TIP_INPUTITEM: string = "> 导入项目";
15+
export var LABEL_TIP_Behavior: string = "> 脚本行为";
1616
export var LABEL_TIP_STYLE_AUTO: string = "> 格式 / 自动化";
1717

1818
export var LABEL_TEXTFILE: string = "LabelPlus文本:";
@@ -24,15 +24,16 @@ namespace i18n {
2424

2525

2626
export var CHECKBOX_OUTPUTLABELNUMBER: string = "导出标号";
27-
export var CHECKBOX_TEXTREPLACE: string = "文本替换(例:\"A->B|C->D\")";
27+
export var CHECKBOX_TextReplace: string = "文本替换(格式:\"A->B|C->D\")";
2828
export var CHECKBOX_OUTPUTNOSIGNPSD: string = "导出没有标号的文档";
29-
export var CHECKBOX_IGNOREIMGFILENAME: string = "无视翻译文本中指定的图片文件名";
30-
export var CHECKBOX_SETSOURCETYPE: string = "指定图源后缀名";
29+
export var CHECKBOX_AutoMatchImgFile: string = "按顺序自动匹配图片文件";
30+
export var BUTTON_AutoMatchImgFilePreview: string = "预览匹配结果";
31+
export var CHECKBOX_SetSourceType: string = "替换图片后缀名";
3132
export var CHECKBOX_RUNACTION: string = "导入文本后，执行以分组名命名的动作；打开图片时执行_start，关闭前执行_end动作";
3233
export var CHECKBOX_NOTCLOSE: string = "导入后不关闭文档";
33-
export var CHECKBOX_SETFONT: string = "修改默认字体";
34-
export var CHECKBOX_CUSTOMLEADING: string = "自定义行距";
35-
export var CHECKBOX_OUTPUTHORIZONTALTEXT: string = "使文字方向为横向";
34+
export var CHECKBOX_SetFont: string = "字体";
35+
export var CHECKBOX_SetLeading: string = "行距";
36+
export var CHECKBOX_OutputHorizontalText: string = "输出横向文本";
3637
export var CHECKBOX_LAYERNOTGROUP: string = "不对图层进行分组";
3738
export var CHECKBOX_OVERLAY: string = "对指定分组执行涂白动作(实验性功能)";
3839

@@ -47,16 +48,17 @@ namespace i18n {
4748
export var ERROR_NOTCHOOSEGROUP: string = "未选择导入分组";
4849

4950
declare var app: any;
51+
// if (true) {
5052
if (!(app.locale in {"zh_CN":1, "zh_TW":1, "zh_HK":1})) {
5153
TIP_TITLE = "Note";
52-
TIP_TEXT = "Help: http://noodlefighter.com/label_plus/";
54+
TIP_TEXT = "Help: https://noodlefighter.com/label_plus/";
5355
BUTTON_RUN = "Run";
5456
BUTTON_CANCEL = "Cancel";
5557
BUTTON_LOAD = "Load";
5658
BUTTON_SAVE = "Save";
5759
BUTTON_RESET = "Reset";
5860
LABEL_TIP_FILE = "> File / Preprocessing";
59-
LABEL_TIP_INPUTITEM = "> Input Item";
61+
LABEL_TIP_Behavior = "> Behavior";
6062
LABEL_TIP_STYLE_AUTO = "> Format / Automation";
6163
LABEL_TEXTFILE = "LabelPlus Text:";
6264
LABEL_SOURCE = "Image Source:";
@@ -65,15 +67,16 @@ namespace i18n {
6567
LABEL_SELECTIMAGE = "Select Image";
6668
LABEL_SELECTGROUP = "Select Group";
6769
CHECKBOX_OUTPUTLABELNUMBER = "Output Label Number";
68-
CHECKBOX_TEXTREPLACE = "Text Replace(e.g. \"A->B|C->D\")";
70+
CHECKBOX_TextReplace = "Text Replace(e.g. \"A->B|C->D\")";
6971
CHECKBOX_OUTPUTNOSIGNPSD = "Output no label file";
70-
CHECKBOX_IGNOREIMGFILENAME = "Ignore filename in LabelPlus Text";
71-
CHECKBOX_SETSOURCETYPE = "Replace file extension";
72+
CHECKBOX_AutoMatchImgFile = "Auto Match Imgage Source File";
73+
BUTTON_AutoMatchImgFilePreview = "Preview Match Result";
74+
CHECKBOX_SetSourceType = "Replace file extension";
7275
CHECKBOX_RUNACTION = "Execute actions named of group name;\"_start\" after open, \"_end\" before close";
7376
CHECKBOX_NOTCLOSE = "Do not close the file";
74-
CHECKBOX_SETFONT = "Set default font";
75-
CHECKBOX_CUSTOMLEADING = "Set leading size";
76-
CHECKBOX_OUTPUTHORIZONTALTEXT = "Output horizontal text";
77+
CHECKBOX_SetFont = "Set default font";
78+
CHECKBOX_SetLeading = "Set leading size";
79+
CHECKBOX_OutputHorizontalText = "Output horizontal text";
7780
CHECKBOX_LAYERNOTGROUP = "Layer not grouping";
7881
CHECKBOX_OVERLAY = "Execute \"Text Overlay\" on specified group";
7982
COMPLETE = "Export completed!";

‎src/main.ts‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class LabelPlusInput extends GenericUI {
103103
x: 200,
104104
y: 200,
105105
w: 875,
106-
h: 670
106+
h: 630
107107
};
108108

109109
self.title = i18n.APPNAME + " " + Global.VER; // our window title
@@ -305,13 +305,13 @@ LabelPlusInput.prototype.createPanel = function (pnl: any, ini: any) {
305305
yy += 25;
306306

307307
// 无视LabelPlus文本中的图源文件名
308-
pnl.ignoreImgFileNameCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_IGNOREIMGFILENAME);
308+
pnl.ignoreImgFileNameCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_AutoMatchImgFile);
309309
pnl.ignoreImgFileNameCheckBox.onClick = function () {
310310
pnl.setSourceFileTypeCheckBox.value = false; // 与指定图源互斥
311311
pnl.ignoreImgFileNameTestButton.enabled = pnl.ignoreImgFileNameCheckBox.value;
312312
}
313313
xx += 260;
314-
pnl.ignoreImgFileNameTestButton = pnl.add('button', [xx, yy, xx + 80, yy + 18], 'preview');
314+
pnl.ignoreImgFileNameTestButton = pnl.add('button', [xx, yy - 5, xx + 80, yy + 20], i18n.BUTTON_AutoMatchImgFilePreview);
315315
pnl.ignoreImgFileNameTestButton.enabled = false;
316316

317317
// 预览无视文件名效果
@@ -337,7 +337,7 @@ LabelPlusInput.prototype.createPanel = function (pnl: any, ini: any) {
337337
yy += 20;
338338

339339
// 使用指定类型图源
340-
pnl.setSourceFileTypeCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_SETSOURCETYPE);
340+
pnl.setSourceFileTypeCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_SetSourceType);
341341
pnl.setSourceFileTypeCheckBox.onClick = function () {
342342
pnl.ignoreImgFileNameCheckBox.value = false; //与无视图源文件名互斥
343343
pnl.setSourceFileTypeList.enabled = pnl.setSourceFileTypeCheckBox.value;
@@ -352,19 +352,8 @@ LabelPlusInput.prototype.createPanel = function (pnl: any, ini: any) {
352352
xx = xOfs;
353353
yy += 20;
354354

355-
// 处理无标号文档
356-
pnl.outputNoSignPsdCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_OUTPUTNOSIGNPSD);
357-
pnl.outputNoSignPsdCheckBox.value = true;
358-
xx = xOfs;
359-
yy += 20;
360-
361-
// 导入后不关闭文档
362-
pnl.notCloseCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_NOTCLOSE);
363-
xx = xOfs;
364-
yy += 20;
365-
366355
// 文本替换(例:"A->B|C->D")
367-
pnl.textReplaceCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_TEXTREPLACE);
356+
pnl.textReplaceCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_TextReplace);
368357
pnl.textReplaceCheckBox.onClick = function () {
369358
pnl.textReplaceTextBox.enabled = pnl.textReplaceCheckBox.value;
370359
};
@@ -376,27 +365,37 @@ LabelPlusInput.prototype.createPanel = function (pnl: any, ini: any) {
376365
yy += 20;
377366

378367

379-
// >>>>>导入项目
380-
yy += 10;
381-
pnl.add('statictext', [xx, yy, xx + 120, yy + 20], i18n.LABEL_TIP_INPUTITEM);
368+
// >>>>>脚本行为
369+
yy += 5;
370+
pnl.add('statictext', [xx, yy, xx + 120, yy + 20], i18n.LABEL_TIP_Behavior);
382371
yy += 20;
383372

384-
// 导出标号选项
385-
pnl.outputLabelNumberCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_OUTPUTLABELNUMBER);
373+
// 处理无标号文档
374+
pnl.outputNoSignPsdCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_OUTPUTNOSIGNPSD);
375+
pnl.outputNoSignPsdCheckBox.value = true;
376+
xx += 250;
377+
378+
// 导入后不关闭文档
379+
pnl.notCloseCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_NOTCLOSE);
386380
xx = xOfs;
387381
yy += 20;
388382

383+
// 导出标号选项
384+
pnl.outputLabelNumberCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_OUTPUTLABELNUMBER);
385+
xx += 250;
386+
389387
// 不对图层进行分组
390388
pnl.layerNotGroupCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_LAYERNOTGROUP);
391389
yy += 20;
392390

393391
// >>>>>格式 / 自动化
394-
yy += 10;
392+
xx = xOfs;
393+
yy += 5;
395394
pnl.add('statictext', [xx, yy, xx + 120, yy + 20], i18n.LABEL_TIP_STYLE_AUTO);
396395
yy += 20;
397396

398397
// 使用自定义字体设置
399-
pnl.setFontCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_SETFONT);
398+
pnl.setFontCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_SetFont);
400399
pnl.setFontCheckBox.onClick = function () {
401400
let value = pnl.setFontCheckBox.value;
402401
pnl.font.family.enabled = value;
@@ -418,7 +417,7 @@ LabelPlusInput.prototype.createPanel = function (pnl: any, ini: any) {
418417
yy += 25;
419418

420419
// 自定义行距
421-
pnl.setTextLeadingCheckBox = pnl.add('checkbox', [xx, yy, xx + 120, yy + 20], i18n.CHECKBOX_CUSTOMLEADING);
420+
pnl.setTextLeadingCheckBox = pnl.add('checkbox', [xx, yy, xx + 120, yy + 20], i18n.CHECKBOX_SetLeading);
422421
pnl.setTextLeadingCheckBox.onClick = function () {
423422
pnl.textLeadingTextBox.enabled = pnl.setTextLeadingCheckBox.value;
424423
}
@@ -432,7 +431,7 @@ LabelPlusInput.prototype.createPanel = function (pnl: any, ini: any) {
432431
yy += 20;
433432

434433
// 输出横排文字
435-
pnl.outputHorizontalCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_OUTPUTHORIZONTALTEXT);
434+
pnl.outputHorizontalCheckBox = pnl.add('checkbox', [xx, yy, xx + 250, yy + 22], i18n.CHECKBOX_OutputHorizontalText);
436435
xx = xOfs;
437436
yy += 20;
438437

0 commit comments

Comments
 (0)