From a0e586d5587ef604c6530a6908879435c2812a55 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Fri, 20 May 2022 14:46:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=B8=E5=BC=A0=E3=80=81=E5=88=86=E8=BE=A8?= =?UTF-8?q?=E7=8E=87=E3=80=81=E5=AF=B9=E6=AF=94=E5=BA=A6=E3=80=81=E4=BA=AE?= =?UTF-8?q?=E5=BA=A6=E3=80=81=E5=8D=95=E5=8F=8C=E9=9D=A2=E9=87=87=E7=94=A8?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/G100-G200.txt | 12 ++++++------ docs/G139-239.txt | 12 ++++++------ docs/G300.txt | 10 +++++----- docs/G400.txt | 10 +++++----- tools/apps/hgjson/hgjsonDlg.cpp | 10 ++++++++++ 5 files changed, 32 insertions(+), 22 deletions(-) diff --git a/docs/G100-G200.txt b/docs/G100-G200.txt index 2e4da39..0fcc780 100644 --- a/docs/G100-G200.txt +++ b/docs/G100-G200.txt @@ -183,7 +183,7 @@ }, "17": { "category": "base", - "name": "cfg-17", + "name": "source", "title": "纸张尺寸", "desc": "设置纸张大小", "type": "string", @@ -265,7 +265,7 @@ }, "23": { "category": "base", - "name": "cfg-23", + "name": "duplex", "title": "扫描页面", "desc": "设置页面扫描方式", "type": "string", @@ -291,7 +291,7 @@ }, "25": { "category": "base", - "name": "cfg-25", + "name": "resolution", "title": "分辨率", "desc": "扫描仪分辨率", "type": "int", @@ -351,7 +351,7 @@ }, "31": { "category": "base", - "name": "cfg-31", + "name": "brightness", "title": "亮度值", "desc": "调整图片亮度", "type": "int", @@ -366,7 +366,7 @@ }, "32": { "category": "base", - "name": "cfg-32", + "name": "contrast", "title": "对比度", "desc": "调整图片对比度", "type": "int", @@ -497,7 +497,7 @@ "cur": "较弱", "default": "较弱", "size": 16, - "range": ["弱", "较弱", "一般", "较强","强"], + "range": ["弱", "较弱", "一般", "较强", "强"], "depend_or": ["41==true"] }, "43": { diff --git a/docs/G139-239.txt b/docs/G139-239.txt index 7a7622d..8992c63 100644 --- a/docs/G139-239.txt +++ b/docs/G139-239.txt @@ -183,7 +183,7 @@ }, "17": { "category": "base", - "name": "cfg-17", + "name": "source", "title": "纸张尺寸", "desc": "设置纸张大小", "type": "string", @@ -276,7 +276,7 @@ }, "24": { "category": "base", - "name": "cfg-24", + "name": "duplex", "title": "扫描页面", "desc": "设置页面扫描方式", "type": "string", @@ -302,7 +302,7 @@ }, "26": { "category": "base", - "name": "cfg-26", + "name": "resolution", "title": "分辨率", "desc": "扫描仪分辨率", "type": "int", @@ -374,7 +374,7 @@ }, "33": { "category": "base", - "name": "cfg-33", + "name": "brightness", "title": "亮度值", "desc": "调整图片亮度", "type": "int", @@ -388,7 +388,7 @@ }, "34": { "category": "base", - "name": "cfg-34", + "name": "contrast", "title": "对比度", "desc": "调整图片对比度", "type": "int", @@ -517,7 +517,7 @@ "cur": "较弱", "default": "较弱", "size": 16, - "range": ["弱", "较弱", "一般", "较强","强"], + "range": ["弱", "较弱", "一般", "较强", "强"], "depend_or": ["43==true"] }, "45": { diff --git a/docs/G300.txt b/docs/G300.txt index b57cd3b..1d5f795 100644 --- a/docs/G300.txt +++ b/docs/G300.txt @@ -183,7 +183,7 @@ }, "17": { "category": "base", - "name": "cfg-17", + "name": "source", "title": "纸张尺寸", "desc": "设置纸张大小", "type": "string", @@ -276,7 +276,7 @@ }, "24": { "category": "base", - "name": "cfg-24", + "name": "duplex", "title": "扫描页面", "desc": "设置页面扫描方式", "type": "string", @@ -302,7 +302,7 @@ }, "26": { "category": "base", - "name": "cfg-26", + "name": "resolution", "title": "分辨率", "desc": "扫描仪分辨率", "type": "int", @@ -362,7 +362,7 @@ }, "32": { "category": "base", - "name": "cfg-32", + "name": "brightness", "title": "亮度值", "desc": "调整图片亮度", "type": "int", @@ -377,7 +377,7 @@ }, "33": { "category": "base", - "name": "cfg-33", + "name": "contrast", "title": "对比度", "desc": "调整图片对比度", "type": "int", diff --git a/docs/G400.txt b/docs/G400.txt index e6e6cc2..84db4fd 100644 --- a/docs/G400.txt +++ b/docs/G400.txt @@ -183,7 +183,7 @@ }, "17": { "category": "base", - "name": "cfg-17", + "name": "source", "title": "纸张尺寸", "desc": "设置纸张大小", "type": "string", @@ -276,7 +276,7 @@ }, "24": { "category": "base", - "name": "cfg-24", + "name": "duplex", "title": "扫描页面", "desc": "设置页面扫描方式", "type": "string", @@ -302,7 +302,7 @@ }, "26": { "category": "base", - "name": "cfg-26", + "name": "resolution", "title": "分辨率", "desc": "扫描仪分辨率", "type": "int", @@ -362,7 +362,7 @@ }, "32": { "category": "base", - "name": "cfg-32", + "name": "brightness", "title": "亮度值", "desc": "调整图片亮度", "type": "int", @@ -376,7 +376,7 @@ }, "33": { "category": "base", - "name": "cfg-33", + "name": "contrast", "title": "对比度", "desc": "调整图片对比度", "type": "int", diff --git a/tools/apps/hgjson/hgjsonDlg.cpp b/tools/apps/hgjson/hgjsonDlg.cpp index 38b57ea..ddec3fc 100644 --- a/tools/apps/hgjson/hgjsonDlg.cpp +++ b/tools/apps/hgjson/hgjsonDlg.cpp @@ -6258,6 +6258,16 @@ void* ChgjsonDlg::create_json(int item, std::vector* def_h) jsn->set_value(L"name", coding::a2u(KNOWN_OPT_NAME_CUSTOM_GAMMA).c_str()); prefer_size = 3 * 256 * sizeof(SANE_Int); } + else if (hg_items_[item].title == L"\u7EB8\u5F20\u5C3A\u5BF8") + jsn->set_value(L"name", coding::a2u(KNOWN_OPT_NAME_PAPER).c_str()); + else if (hg_items_[item].title == L"\u626B\u63CF\u9875\u9762") + jsn->set_value(L"name", coding::a2u(KNOWN_OPT_NAME_PAGE).c_str()); + else if (hg_items_[item].title == L"\u5206\u8FA8\u7387") + jsn->set_value(L"name", coding::a2u(KNOWN_OPT_NAME_RESOLUTION).c_str()); + else if (hg_items_[item].title == L"\u4EAE\u5EA6\u503C") + jsn->set_value(L"name", coding::a2u(KNOWN_OPT_NAME_BRIGHTNESS).c_str()); + else if (hg_items_[item].title == L"\u5BF9\u6BD4\u5EA6") + jsn->set_value(L"name", coding::a2u(KNOWN_OPT_NAME_CONTRAST).c_str()); else if (hg_items_[item].title == L"\u626B\u63CF\u533A\u57DF\u5DE6\u4FA7\uFF08mm\uFF09") jsn->set_value(L"name", coding::a2u(KNOWN_OPT_NAME_CUSTOM_AREA_LEFT).c_str()); else if (hg_items_[item].title == L"\u626B\u63CF\u533A\u57DF\u4E0A\u4FA7\uFF08mm\uFF09")