diff --git a/docs/G100-G200.txt b/docs/G100-G200.txt index a5a930e..8e6db1a 100644 --- a/docs/G100-G200.txt +++ b/docs/G100-G200.txt @@ -2,7 +2,7 @@ "global": { "device_type": "G100-G200", "button_count": 0, - "option_count": 66 + "option_count": 67 }, "restore": { "cat": "base", @@ -531,6 +531,28 @@ }, "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] }, + "blank-edge-width": { + "cat": "base", + "readonly": false, + "affect": 0, + "group": "base", + "enable": true, + "field": "Common", + "pos": 0, + "unit": "None", + "title": " 跳过空白页边缘宽度（mm）", + "desc": "数值越大，越容易忽略纸张边缘", + "type": "int", + "cur": 20, + "default": 20, + "size": 4, + "range": { + "min": 1, + "max": 30, + "step": 1 + }, + "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] + }, "fold-type": { "cat": "base", "readonly": false, diff --git a/docs/G139-239.txt b/docs/G139-239.txt index d40238b..fa47e39 100644 --- a/docs/G139-239.txt +++ b/docs/G139-239.txt @@ -2,7 +2,7 @@ "global": { "device_type": "G139-G239", "button_count": 0, - "option_count": 79 + "option_count": 80 }, "restore": { "cat": "base", @@ -548,6 +548,28 @@ }, "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] }, + "blank-edge-width": { + "cat": "base", + "readonly": false, + "affect": 0, + "group": "base", + "visible": true, + "field": "Common", + "pos": 0, + "unit": "None", + "title": " 跳过空白页边缘宽度（mm）", + "desc": "数值越大，越容易忽略纸张边缘", + "type": "int", + "cur": 20, + "default": 20, + "size": 4, + "range": { + "min": 1, + "max": 30, + "step": 1 + }, + "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] + }, "fold-type": { "cat": "base", "readonly": false, diff --git a/docs/G300.txt b/docs/G300.txt index 84f8eea..bc22cc9 100644 --- a/docs/G300.txt +++ b/docs/G300.txt @@ -2,7 +2,7 @@ "global": { "device_type": "G300", "button_count": 0, - "option_count": 69 + "option_count": 70 }, "restore": { "cat": "base", @@ -548,6 +548,28 @@ }, "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] }, + "blank-edge-width": { + "cat": "base", + "readonly": false, + "affect": 0, + "group": "base", + "visible": true, + "field": "Common", + "pos": 0, + "unit": "None", + "title": " 跳过空白页边缘宽度（mm）", + "desc": "数值越大，越容易忽略纸张边缘", + "type": "int", + "cur": 20, + "default": 20, + "size": 4, + "range": { + "min": 1, + "max": 30, + "step": 1 + }, + "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] + }, "fold-type": { "cat": "base", "readonly": false, diff --git a/docs/G302.txt b/docs/G302.txt index e6ff47c..1ae8748 100644 --- a/docs/G302.txt +++ b/docs/G302.txt @@ -2,7 +2,7 @@ "global": { "device_type": "G302", "button_count": 0, - "option_count": 64 + "option_count": 65 }, "restore": { "cat": "base", @@ -531,6 +531,28 @@ }, "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] }, + "blank-edge-width": { + "cat": "base", + "readonly": false, + "affect": 0, + "group": "base", + "visible": true, + "field": "Common", + "pos": 0, + "unit": "None", + "title": " 跳过空白页边缘宽度（mm）", + "desc": "数值越大，越容易忽略纸张边缘", + "type": "int", + "cur": 20, + "default": 20, + "size": 4, + "range": { + "min": 1, + "max": 30, + "step": 1 + }, + "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] + }, "fold-type": { "cat": "base", "readonly": false, diff --git a/docs/G306.txt b/docs/G306.txt index 3af20fa..210ca9e 100644 --- a/docs/G306.txt +++ b/docs/G306.txt @@ -2,7 +2,7 @@ "global": { "device_type": "G300", "button_count": 5, - "option_count": 73 + "option_count": 74 }, "restore": { "cat": "base", @@ -548,6 +548,28 @@ }, "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] }, + "blank-edge-width": { + "cat": "base", + "readonly": false, + "affect": 0, + "group": "base", + "visible": true, + "field": "Common", + "pos": 0, + "unit": "None", + "title": " 跳过空白页边缘宽度（mm）", + "desc": "数值越大，越容易忽略纸张边缘", + "type": "int", + "cur": 20, + "default": 20, + "size": 4, + "range": { + "min": 1, + "max": 30, + "step": 1 + }, + "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] + }, "fold-type": { "cat": "base", "readonly": false, diff --git a/docs/G400.txt b/docs/G400.txt index b4e4f61..8ad59da 100644 --- a/docs/G400.txt +++ b/docs/G400.txt @@ -2,7 +2,7 @@ "global": { "device_type": "G400", "button_count": 0, - "option_count": 67 + "option_count": 68 }, "restore": { "cat": "base", @@ -531,6 +531,28 @@ }, "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] }, + "blank-edge-width": { + "cat": "base", + "readonly": false, + "affect": 0, + "group": "base", + "visible": true, + "field": "Common", + "pos": 0, + "unit": "None", + "title": " 跳过空白页边缘宽度（mm）", + "desc": "数值越大，越容易忽略纸张边缘", + "type": "int", + "cur": 20, + "default": 20, + "size": 4, + "range": { + "min": 1, + "max": 30, + "step": 1 + }, + "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] + }, "fold-type": { "cat": "base", "readonly": false, diff --git a/docs/G402.txt b/docs/G402.txt index 47a5b09..623cdbf 100644 --- a/docs/G402.txt +++ b/docs/G402.txt @@ -2,7 +2,7 @@ "global": { "device_type": "G402", "button_count": 0, - "option_count": 64 + "option_count": 65 }, "restore": { "cat": "base", @@ -531,6 +531,28 @@ }, "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] }, + "blank-edge-width": { + "cat": "base", + "readonly": false, + "affect": 0, + "group": "base", + "visible": true, + "field": "Common", + "pos": 0, + "unit": "None", + "title": " 跳过空白页边缘宽度（mm）", + "desc": "数值越大，越容易忽略纸张边缘", + "type": "int", + "cur": 20, + "default": 20, + "size": 4, + "range": { + "min": 1, + "max": 30, + "step": 1 + }, + "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] + }, "fold-type": { "cat": "base", "readonly": false, diff --git a/docs/G439.txt b/docs/G439.txt index 23b860b..4b7884e 100644 --- a/docs/G439.txt +++ b/docs/G439.txt @@ -2,7 +2,7 @@ "global": { "device_type": "G439", "button_count": 0, - "option_count": 73 + "option_count": 74 }, "restore": { "cat": "base", @@ -548,6 +548,28 @@ }, "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] }, + "blank-edge-width": { + "cat": "base", + "readonly": false, + "affect": 0, + "group": "base", + "visible": true, + "field": "Common", + "pos": 0, + "unit": "None", + "title": " 跳过空白页边缘宽度（mm）", + "desc": "数值越大，越容易忽略纸张边缘", + "type": "int", + "cur": 20, + "default": 20, + "size": 4, + "range": { + "min": 1, + "max": 30, + "step": 1 + }, + "depend_or": ["page==跳过空白页（发票纸）", "==跳过空白页（通用）", "discardblank==true"] + }, "fold-type": { "cat": "base", "readonly": false, diff --git a/tools/apps/hgjson/hgjsonDlg.cpp b/tools/apps/hgjson/hgjsonDlg.cpp index b5b6c40..794bea7 100644 --- a/tools/apps/hgjson/hgjsonDlg.cpp +++ b/tools/apps/hgjson/hgjsonDlg.cpp @@ -5957,6 +5957,7 @@ struct , {SANE_STD_OPT_NAME_OUT_BOUNDARY , OPTION_TITLE_BJJC} , {SANE_STD_OPT_NAME_SETTOKEN , OPTION_TITLE_SDLP} , {SANE_STD_OPT_NAME_MAXSIZE_COLLECT_HEIGHT ,OPTION_TITLE_ZDFMCJGD} + , {SANE_STD_OPT_NAME_BLANK_EDGE_WIDTH , OPTION_TITLE_TGKBYBYKD} }, g_discard[] = { {SANE_STD_OPT_NAME_REVERSE_01 , "\351\273\221\347\231\275\345\233\276\345\203\217\345\217\215\350\211\262\350\276\223\345\207\272\357\274\210\346\255\243\345\270\270\351\242\234\350\211\262\344\270\272\357\274\2320-\351\273\221\350\211\262\357\274\2331-\347\231\275\350\211\262\357\274\211"} // ڰͼɫɫΪ0-ɫ1-ɫ , {SANE_STD_OPT_NAME_FILTER , "\347\201\260\345\272\246\346\210\226\351\273\221\347\231\275\345\233\276\345\203\217 - \351\231\244\350\211\262"} // ҶȻڰͼ - ɫ diff --git a/tools/solution/Release/hgjson.exe b/tools/solution/Release/hgjson.exe index b754b5e..cf0a382 100644 Binary files a/tools/solution/Release/hgjson.exe and b/tools/solution/Release/hgjson.exe differ