diff --git a/docs/G100-G200.txt b/docs/G100-G200.txt index 55b5aa3..ea037a2 100644 --- a/docs/G100-G200.txt +++ b/docs/G100-G200.txt @@ -194,7 +194,7 @@ }, "18": { "category": "base", - "name": "source", + "name": "cfg-18", "title": "纸张尺寸", "desc": "设置纸张大小", "type": "string", @@ -276,7 +276,7 @@ }, "24": { "category": "base", - "name": "duplex", + "name": "cfg-24", "title": "扫描页面", "desc": "设置页面扫描方式", "type": "string", diff --git a/docs/G139-239.txt b/docs/G139-239.txt index 322a877..1f9889b 100644 --- a/docs/G139-239.txt +++ b/docs/G139-239.txt @@ -194,7 +194,7 @@ }, "18": { "category": "base", - "name": "source", + "name": "cfg-18", "title": "纸张尺寸", "desc": "设置纸张大小", "type": "string", @@ -287,7 +287,7 @@ }, "25": { "category": "base", - "name": "duplex", + "name": "cfg-25", "title": "扫描页面", "desc": "设置页面扫描方式", "type": "string", diff --git a/docs/G300.txt b/docs/G300.txt index c09ccf3..969f826 100644 --- a/docs/G300.txt +++ b/docs/G300.txt @@ -194,7 +194,7 @@ }, "18": { "category": "base", - "name": "source", + "name": "cfg-18", "title": "纸张尺寸", "desc": "设置纸张大小", "type": "string", @@ -287,7 +287,7 @@ }, "25": { "category": "base", - "name": "duplex", + "name": "cfg-25", "title": "扫描页面", "desc": "设置页面扫描方式", "type": "string", diff --git a/docs/G400.txt b/docs/G400.txt index 5a20fe0..692208d 100644 --- a/docs/G400.txt +++ b/docs/G400.txt @@ -194,7 +194,7 @@ }, "18": { "category": "base", - "name": "source", + "name": "cfg-18", "title": "纸张尺寸", "desc": "设置纸张大小", "type": "string", @@ -287,7 +287,7 @@ }, "25": { "category": "base", - "name": "duplex", + "name": "cfg-25", "title": "扫描页面", "desc": "设置页面扫描方式", "type": "string", diff --git a/tools/apps/hgjson/hgjsonDlg.cpp b/tools/apps/hgjson/hgjsonDlg.cpp index ddec3fc..63d2766 100644 --- a/tools/apps/hgjson/hgjsonDlg.cpp +++ b/tools/apps/hgjson/hgjsonDlg.cpp @@ -6253,29 +6253,20 @@ void* ChgjsonDlg::create_json(int item, std::vector* def_h) int prefer_size = 0; jsn->set_value(L"category", hg_items_[item].advanced ? L"advanced" : L"base"); - if (hg_items_[item].title == L"\u81EA\u5B9A\u4E49\u4F3D\u739B") - { - 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()); + if (hg_items_[item].title == L"\u5206\u8FA8\u7387") + jsn->set_value(L"name", coding::a2u(SANE_STD_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()); + jsn->set_value(L"name", coding::a2u(SANE_STD_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()); + jsn->set_value(L"name", coding::a2u(SANE_STD_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()); + jsn->set_value(L"name", coding::a2u(SANE_STD_OPT_NAME_CUSTOM_AREA_LEFT).c_str()); else if (hg_items_[item].title == L"\u626B\u63CF\u533A\u57DF\u4E0A\u4FA7\uFF08mm\uFF09") - jsn->set_value(L"name", coding::a2u(KNOWN_OPT_NAME_CUSTOM_AREA_TOP).c_str()); + jsn->set_value(L"name", coding::a2u(SANE_STD_OPT_NAME_CUSTOM_AREA_TOP).c_str()); else if (hg_items_[item].title == L"\u626B\u63CF\u533A\u57DF\u53F3\u4FA7\uFF08mm\uFF09") - jsn->set_value(L"name", coding::a2u(KNOWN_OPT_NAME_CUSTOM_AREA_RIGHT).c_str()); + jsn->set_value(L"name", coding::a2u(SANE_STD_OPT_NAME_CUSTOM_AREA_RIGHT).c_str()); else if (hg_items_[item].title == L"\u626B\u63CF\u533A\u57DF\u4E0B\u4FA7\uFF08mm\uFF09") - jsn->set_value(L"name", coding::a2u(KNOWN_OPT_NAME_CUSTOM_AREA_BOTTOM).c_str()); + jsn->set_value(L"name", coding::a2u(SANE_STD_OPT_NAME_CUSTOM_AREA_BOTTOM).c_str()); else { swprintf_s(buf, _countof(buf) - 1, L"cfg-%d", hg_items_[item].index); diff --git a/tools/solution/Release/hgjson.exe b/tools/solution/Release/hgjson.exe index 8192187..c32f46a 100644 Binary files a/tools/solution/Release/hgjson.exe and b/tools/solution/Release/hgjson.exe differ