From c3d2e52890f75c6bc74c44e4e65aebb432aa3b31 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Mon, 6 Feb 2023 16:18:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8E=E9=AB=98=E5=92=8C=E4=B8=AD=E6=99=B643?= =?UTF-8?q?99=E7=B3=BB=E5=88=97G400=E8=AE=BE=E5=A4=87=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=94=A4=E9=86=92=E8=AE=BE=E5=A4=87=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/Scanner_zh_CN.qm | Bin 38036 -> 37841 bytes app/scanner/Scanner_zh_CN.ts | 477 ++++++++++++++++++----------------- app/scanner/Scanner_zh_EN.qm | Bin 51676 -> 51505 bytes app/scanner/Scanner_zh_EN.ts | 477 ++++++++++++++++++----------------- app/scanner/mainwindow.cpp | 121 +++++++-- app/scanner/mainwindow.h | 11 + app/scanner/qt_zh_CN.ts | 10 +- 7 files changed, 606 insertions(+), 490 deletions(-) diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index d72e51dea4bb99ffe9d680d73ef8e28e21e1d3cc..36f2e82b28ad79508c42827c34e19f148408f771 100644 GIT binary patch delta 2917 zcmX9=d0Z3c7QLBdW|B!JQABYmA)<(ivWTEkK~O2O$)+Nk5(p5GMPw_r1&jJ~VR_YY ztp%-Bw5}*ZDL+B1SmD)H(4tmbtlMj~Pr<5Pe2VYb{E^?uWWMiy=bn4+{j%kAruzUh zbY_!j_`mx;+4}A1x6UMf+VazEqCtOc8oFEMPQ-^1t-86XW$9=I(b!o;?{yNnX^EI{ z3#uOyxf_Uz%1*a{wU|tbXDb@_mv*5f!3l``t zShkhqa~z09#gP1B7txdslKpl z;>$Clh+4^((I+i9LhK@cqA@Eh=sVql3zfu{Bc6dH_6U|6Jcw;S4%|f?;!tJ+as3N` z6~wz@|LA_=(|V9?6Y+2M*@qDSDU0X(QZ?gapI1$M9a1VY6aOZR{UK5gOCWmJnv@rx z6BV47UNQP9ORtmDj`Mh&OOwvrA<`cp*MG8HOj9l++rmraUZh0!4m5ST3sLqxDO9d! za{8n!xwBPh28HZQA`1J6Lf3mB#Te~;YONT^6Ra0wu3DIIRb^eh;lzN(O z{12IxO`>1^f|I5nkjZ;%h~|GMvzjm;tiFPC}$?mK=2m zyDgh@@f2K_>LuM*cup~Q$ug^vO=PkxtNeSS+_AFLTce56Tx8$89!fNIo$TAF=R|XK zvYVZ^h=TH@P}U}9f@~lvkZ92;hMSHYSNSnRYQKQ5KW9dCyd+u{$Jox;3Dc{X@qI9U z@Frj#Fo<#cFIbAh8Q-V*L?ySGASL=heT<1di|ES+OD(KEDSR(e61#oV_tT=sZfoaD_cTj(519U zY@|HBB#J1?Am40*V`!%QgaP>BE_vsqsYG#Z@|(HHYTQHl%{(|{0WZJh-HQ%?Dz$LV z_Mw{#}EF@B0Rs0^ZpUC)v9pYYr`r5KXe)I>fXGi$`MZ|`( z`hF-Eqc>Ft}<-P0&sS2WaPqtjPmMH5oTN{G){w#Z> z1M6}Yvvpe}9Jq^Z*sjC-TDGC(J}{JRw1%;=r?QRB46uT2Jk0}}*v5w-nw`jAQY&U+ z;(4*x0+$et+|J$-9I(-jy>%2a7VKm1T?K(i7j{5dj7*z3`F~J_#QU5ksQ{TxmONB; zDnCwtu?DnLqy&}TKIjn_rtlz2dd=ZrYU;-T8Sb<6j;^E32nY15GV8tD2UJEIA za}9&fL8%(9`P5U`CW>pj%))h7xv!c~!iAH$4(1eE`&X`WFX9!g<1V)T3#B{DUE;@L z6gZyZuD9f(7o)kyZ|Tv4ZCqda-?$}edF!`9C{^SgXEy*}N)3WDv*3z!Ul^B^*2iz$ zy8%77ov$i^z@hE@N8M|P0v_@^gSA9~m3+1LaddVve`qWwNNhZRD0vzj^fiBY3#1s~ zz&A$r;CN5IGZy=Uy!dYi!R*V&@Rugy_qc6RmfFrZMale$w@W`(23#n>e0i!|vKYza zZdD#yjMG2tRUV%JAHD0RY;t{o@~0`AUttm`mMPn+T8U;%Q?{>ufpzK13j(4~(JMQ< zzQ>gHRrWl2j@EXQ9;t2oY*gmEK1A9O3%dNM$}~LzXD3zWN|;4Bsmd({X1uSe$iISH zj8X0SWFJa%NVVrgI$Ek(3f0(@PE=iN6w1q}dRhzo;I?W&ag0c|S&)B| zff+hOu(n3QivJKM$oesjQiK^l*b%+cEchm1{feo=Y$gQ-dM?cE_?gJlM~Hr6f+8j% zJ`BpJ3M}a3CM4MUVeFh060)Ia>{2fw;qqNLBw1Lw14Gtm5LTbv3Ku2|o3~k1^3>|JJzkJ-DcU z1wO~+*{YcpjZ9#%I@9?gc!X`pP@!UaY&T)F^opS@6ms}Mj4*>`+<=&t>x_G-TQp}O zE354m^!{4RXX{AXsGATO(<5#OM?2*k#WwpmG>A+*zY(eqSt;Il^e28V7jF&2ndxW5 z{t~Dje^-3{eH6yo6Rq5<0qf0LT?!_XZi9BF4a}ILlGs6>k>RP@#>9H0k=>9(4gkTgu zr&6jMWE05f79S5s7rN;FNl5;;EvqTZp_vbj{Ik zkk?%}0U@HgbXP(_I>b|YG)S*oRjzw!*bLn^qxZ_rNV$`p>*ozl4wTl!9j#A_U!{3l zTmENKaOA;-V>fLsZ;j#cmkfTx$38qW#h903C^9ZfF%&E}RddLs)u!2-k#> z)JI1&CWfTvFA+Jllk^Wg(TbTQ+qjQNznNs0ux@poWY;#qy7@o&h-44ek&+_T;o})m zM7=nc(HiDA5*y`9WL-3bUekv#YB;eQaGxbd>_Kd|bRo9w2yiEHxQFu0iR+yQ^e28Q z&X4OQKBJRpNip$*=d6N=|B%J+J>o7#Z&k8@_J}Lpr7fF7;k7)5K z@dcxGN)~C-`)7$tUy}Xl+eF%rY3i#e7m(8xL|e9=oXg~hUPsfWPa#^gTMU+JnSweo zPwFr{q=bSh4MbrdQ1H7h2r*SWB(+Uxp~T82Fj`F+U0)DQSW1~??nLGJlv$Yp&nHv% zq}4>r!YMlyr^juk>~s5xax|1Xc$@jAAxKBLCV4Mb^n^qDT1DEr^kvH=>1v8Ikc77}HYQP+PE z+3Ndr|4$jw^p7Rdo7F_2-%Ey141rfGC9jvm>u^_z#k9>twv#2!+hHeBC7CHj9>RW= z_?$lh)us1|_hhb4SsNs|yAVxeo+NL>RieUMl2hBFVW(U2^-EKtY41obMD`K+Xe2i} zZV}C0DF(Aj(X2N3#KWHbg z9ypJ2d;~95=8V_V5-7BanIrEYQXXca&*1i)^I|irHH05z%55W1}Wz#LaQ4EF5A11x!c@y<{SZwATtU{_} zftj$LVJ(|;`!KvJkaX)>GJq=6gUn+c*-!%74r@HZdqkf41=y4=iRIyW!}fG3-U9%mW>7 z2K!xLBGKzR*js`QouiArbqF*rPGav~g9DN7?0|eJB5mTNzaR@KdpHwADHwPlx+p9Z z{haoEHORIU6BJsjxzD*!nF~>B6BoOp3q=~u#chQ5i*IwO1Gb=Jfw)UyA?XyG6`{rf z?)|`1DEMBk@+2Hs=)`@XzX=q%>f_cZ&1P04A zEY~pXOE9&cYdY~1vPs}tudq;E1^2~Cq%g{jYiCYC?0dP6k8t0TS={-Sf5Gt;+(mvo zT7m5e?)&CKqN3qk&l_6QU@P}H>o2?#wfx98;ZS-zZ#%02g8Ec!5FD8KKZ^GR8$)It zzy70jsJR{d=5i1m@(usq<+q9ayZOqwYN9#m{4UQUM44K?Zag|joEcx2>IMb9#UI!T zDn{%0#)wXscjY@`aenS>{=#bzd%;cqq8;Yr!^J$MMapk-<~dfA=ga-im7>2ql_xGh zFhybVx&^Slx>9~*B6PH*Uw(4xL!>`L-t+>UK$atK-P}Ut?j~?%QVhrr6AhPa5u{&dqrJKdBS#{a%Z`ehOw5drg;~r(WU5}6-To7i zt6qqHk_Kulg!oWUq$nLiy`zvY)*DTGg^-XBYLohege!NTlvH8)`)IZ)H-t53wn2?r zp<*k7&dV375}=&CokC4V3HDbAH9cO~#|yO%Aje=K)XsSuZW*2kwaM@^HB_jrZh#cG zh%PGIl(RyswiHnh2$!rBL{n3Rn{yzjc%$%84L1{ zER;1JAj^Kda=&RTYN|)s^i~|ON!f1RjZ{X8rfQ4uK4ov>dNiWXl~2dO_2OqHtRq}^ z+io&C;U*p~-ek=F$p~qc$)pd^^W#pKIP;x&${zsx@VvH|%!~#Hapfld>x)rM72;a8 z4U^4@htyi3+}`A}?`YIqh1jWf$S$0qGEbXHplO)FhB zA@_&|yDG3P4L#<8DwqXBy6dX&OgIz& znJS~u0T0p*F;An9h<#7BE(|49`i8323XvzBQk`870!J)Yb^Z1n^M0yZqi}upGF5Lm z2u`S0y}TNUu5(Z=ozZ|IvQ}#rq8n+}sXfe~vW0Ep3yrH?c!9bx`8X)~Oa1K`ST%&G zzdNM{RXOU1UMJ9azS1z>@1S>^i3zWn8UNHwIG{&;w`(TOMOF&}G~Pcaq88?9Lb|@e ztLCl=o9&EjHft6f3B#YzZcSz$h?oAQDKR+WQM{%pA2xv3ZjWa7R4raFKh24ATZue_ zG)>Wi$ZO6WMa=WMG~Wip>0mF-)hm`n-XWUnL5GPf98xqtRPJq9R9a%Ga})~~n;s93GnyQ?$UHXbzmxrSIRF3v diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index 7bba2c77..fae58b8c 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -2189,51 +2189,51 @@ bug description: 删除选中项 - + HuaGoScan 华高扫描软件 - + Grid 多列显示 - + Move To... 移动到... - + Insert files 插入文件 - - - + + + nodevice 没有发现扫描仪 - - - - - - + + + + + + Question 询问 - - + + modified, save it? 图像已被修改。 是否保存修改？ - + file lost, remove it? 文件已丢失，是否删除？ @@ -2242,7 +2242,7 @@ bug description: 已连接 - + disconnected 已断开连接 @@ -2259,17 +2259,17 @@ bug description: 扫描完成 - + Clear, then start scan 清空并启动扫描 - + Do NOT clear, then start scan 不清空并启动扫描 - + Already exist images in image list. Do you want to clear? 图像列表中已存在图像。 @@ -2284,12 +2284,12 @@ Do you want to clear? 磁盘空间不足，请删除不需要的文件，以保证有足够的空间 - + Open images 打开图片 - + Insert images 插入图片 @@ -2302,245 +2302,259 @@ Do you want to clear? 保存失败 - + binary 黑白 - + gray 256级灰度 - + rgb 24位彩色 - + + + + + + + + + + + Please wake up the device manually + 请手动唤醒设备 + + + thumbnailBar enabled 显示缩略图栏 - + thumbnailBar hidden 隐藏缩略图栏 - + cancel 取消 - - - + + + save succeed 保存成功 - - + + find savePath in thumbnail 图片名在列表中已存在 - + Please select at least one picture before export 请至少选中一张图片再进行导出 - + File name 文件名 - + File path 文件路径 - + File size 文件大小 - + Creation date/time 创建时间 - + Modified date/time 修改时间 - + Accessed date/time 访问时间 - + Format 格式 - + Width 宽度 - + Height 高度 - + depth 深度 - + Color model 色彩模式 - + DPI 每英寸像素点 - + Print size 打印尺寸 - + Frame 帧 - + None 无 - + Mono 黑白 - + Gray 灰度 - + Color 彩色 - + Warning 警告 - + Device is Running! Please finish scanning first. 设备正在运行！ 请先结束扫描。 - + Image processing failed 图像处理失败 - + Ocr init failed OCR初始化错误 - + Ocr failed OCR错误 - + File does not exist 文件不存在 - + Failed to load dynamic library 加载动态库失败 - + File data error 文件数据错误 - + Image format processing error 图像格式处理错误 - + Out of memory 内存不足 - + Failed 错误 - - + + The language switch is successful and takes effect the next time the software is started! 语言切换成功，下次启动软件时生效! - + Are you sure to delete selected file? 您确定彻底删除选中项文件？ - - - - - - - - - - + + + + + + + + + + already waked up device 已唤醒设备 - + be ready 就绪 - - - - - - + + + + + + folder limit 无法访问“我的文档”， 请前往“扫描至”更换可访问的扫描目录再进行扫描。 - + Insufficient access rights 文件访问权限不足 @@ -2553,47 +2567,47 @@ Please finish scanning first. 图像处理失败 - + Are you sure to close 您确定要断开设备： - + ? 吗? - - + + close 关闭 - + tip 提示 - + Other versions not available 未获取到其他版本 - - + + The device does not support this operation 设备不支持该操作 - - + + IO error IO错误 - - - + + + error 错误 @@ -2608,17 +2622,17 @@ Continue to close? 是否继续关闭？ - + Sure to sign out administrator account? 是否确定登出管理员账户？ - + confirm the operation 确认操作 - + Are you sure to clear the rollor acount? 你确定要清除滚轴计数吗 @@ -2627,34 +2641,36 @@ Continue to close? 请重新进入关于界面以获取最新值 - + + <p>%1: <a href='%2'>%3</a> - + + <p>%1: %2 - + roller number 滚轴张数 - + open scanner 打开扫描仪 - - + + app name 华高扫描软件 - - + + success 成功 @@ -2671,22 +2687,22 @@ Continue to close? 失败 - - + + failed 失败 - - - + + + warning 警告 - - - + + + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. 当前路径磁盘空间不足, 请重新选择路径或及时清理磁盘空间。 @@ -2696,152 +2712,152 @@ Continue to close? 配置丢失 - + apply setting 应用配置 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + start failed 启动失败 - + HanvonScan 汉王扫描软件 - + LanxumScan 立思辰扫描软件 - + CumtennScan 沧田扫描软件 - + MicrotekScan 中晶扫描软件 - + menu_language 语言 - + act_simpCN 简体中文 - + act_English English - + auto save 自动保存 - + when switching pictures, save the edited pictures directly without reminding 切换图片时，不提醒，直接保存编辑过的图片 - + statusBar displayed 显示状态栏 - + statusBar hidden 隐藏状态栏 - + toolBar displayed 显示工具栏 - + toolBar hidden 隐藏工具栏 - + colorInfo enabled 启用图像信息 - + colorInfo disenabled 关闭图像信息 - + enabling automatic saving 启用自动保存 - + cancel auto save 取消自动保存 - + Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save 切换图片时，自动保存编辑过的图像。若想取消，请取消勾选菜单项：图像->自动保存 - - - - - - - - - - - - - + + + + + + + + + + + + + yes 确定 - + save, do not remind again 保存，不再提醒 - - - - - - - - - - + + + + + + + + + + no 取消 @@ -2850,26 +2866,26 @@ Continue to close? 发现设备 - + reconnected 重新连接 - + already connected, but open faild 已经连接，但打开失败 - - + + save image failed: 存图失败： - - - - + + + + create savepath failed: 创建文件夹失败： @@ -2878,102 +2894,102 @@ Continue to close? %1%2%3.%4 - - + + create image doc failed: 创建图片文件失败： - - - - - - - - - - - - - + + + + + + + + + + + + + save image doc failed: 保存图片文件失败： - + start failed! 启动安装程序失败！ - + There are pictures that have not been saved. Are you sure to close? 有图像未保存，确定关闭？ - + found device : %1 发现设备 : %1 - - - - - - - - - - - - - + + + + + + + + + + + + + tips 提示 - + Are you sure to close? 确定关闭应用软件？ - + confirm operation 确认操作 - + are you sure to clear the roller count? 您确定要清除滚轴计数吗 - - - + + + hint 提示 - - + + Roller scanned count has been set to 0. 辊轴计数已置零 - - + + Roller scanned count reset failed. 重置滚轴计数失败 - + Error 错误 - + Document missing! It would be deleted or renamed. 文档丢失！文档可能已被删除或被重命名。 @@ -3006,28 +3022,29 @@ Are you sure to close? <br>导航地址: <a href='https://j.map.baidu.com/7e/1TO'>百度地图访问</a> - About %1 - 关于 %1 + 关于 %1 - <p>%1</p><p>Version: %2<br>CopyRight: &#169; %3</p><p>%4%5%6%7%8%9</p> - <p>%1</p><p>版本: %2<br>版权: &#169; %3</p><p>%4%5%6%7%8%9</p> + <p>%1</p><p>版本: %2<br>版权: &#169; %3</p><p>%4%5%6%7%8%9</p> + about %1 关于 %1 + <p>Version: %1</p> <p>版本: %1</p> <p>版本： %1</p> - + + <p>CopyRight: &#169; %1</p> <p>版权: &#169; %1</p> <p>版权： &#169; %1</p> diff --git a/app/scanner/Scanner_zh_EN.qm b/app/scanner/Scanner_zh_EN.qm index 1a6c2ccbdc48f5d80c5094779058d15699a182d3..45fe692e1172e7214bf568746ef2395694c18218 100644 GIT binary patch delta 3318 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 HzTV^iklF9c delta 3212 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 diff --git a/app/scanner/Scanner_zh_EN.ts b/app/scanner/Scanner_zh_EN.ts index 23941949..876f8609 100644 --- a/app/scanner/Scanner_zh_EN.ts +++ b/app/scanner/Scanner_zh_EN.ts @@ -2032,176 +2032,176 @@ Please make sure the two passwords are the same. Delete selected item - + HanvonScan Hanvon scanning software - + LanxumScan LANXUM scanning software - + CumtennScan CUMTENN scanning software - + MicrotekScan Microtek DocWizard EX V1.0 - + HuaGoScan HUAGOSCAN scanning software - + menu_language Language - + act_simpCN 简体中文 - + act_English English - + Grid Multi-column display - + Move To... Move to... - + Insert files Insert file - - - + + + nodevice No scanner detected - + auto save Auto save - + when switching pictures, save the edited pictures directly without reminding Do not show prompt and save the edited images directly when switching images. - + statusBar displayed Show status bar - + statusBar hidden Hide status bar - + toolBar displayed Show toolbar - + toolBar hidden Hide toolbar - + colorInfo enabled Enable image information - + colorInfo disenabled Disable image information - + enabling automatic saving Enable auto save - + cancel auto save Cancel auto save - + Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save Save edited images automatically when switching images. If you want to cancel, please deselect the menu item: Auto save images. - - - - - - + + + + + + Question Ask - - + + modified, save it? Image modified, save changes? - - - - - - - - - - - - - + + + + + + + + + + + + + yes Yes - + save, do not remind again Save, do not prompt again - - - - - - - - - - + + + + + + + + + + no No - + file lost, remove it? File lost; delete? @@ -2210,561 +2210,578 @@ Please make sure the two passwords are the same. Device discovered - + found device : %1 Device discovered: %1 - + reconnected reconnect - + already connected, but open faild connected, but failed to open - + disconnected disconnected - - - + + + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. Insufficient disk space for the current path. Please reselect a path or clear disk space immediately. - - - + + + warning Warning - - + + save image failed: Failed to save image: - - - - + + + + create savepath failed: Failed to create folder: - - + + create image doc failed: Failed to create image file: - - - - - - - - - - - - - + + + + + + + + + + + + + save image doc failed: Failed to save image: - + binary Black and white - + gray Grayscale - + rgb Color - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + start failed Failed to start - - - - - - - - - - + + + + + + + + + + + Please wake up the device manually + Please wake up the device manually + + + + + + + + + + + + already waked up device Device is awake - + thumbnailBar enabled Show thumbnail bar - + thumbnailBar hidden Hide thumbnail bar - + Clear, then start scan Clear and start scan - + Do NOT clear, then start scan Do not clear and start scan - + cancel Cancel - + Already exist images in image list. Do you want to clear? Image already exists in the list of images. Clear? - + Open images Open image - + Insert images Insert image - - - - - - - - - - - - - + + + + + + + + + + + + + tips prompt - - - + + + save succeed Saved successfully - - + + find savePath in thumbnail Image name already exists in the list - + Please select at least one picture before export Please select at least one image and then export - + File name File name - + File path File path - + File size File size - + Creation date/time Creation time - + Modified date/time Modification time - + Accessed date/time Access time - + Format Format - + Width Width - + Height Height - + depth Depth - + Color model Color mode - + DPI Pixels per inch - + Print size Print size - + Frame Frame - + None None - + Mono Black and white - + Gray Gray scale - + Color Color - + Warning Warning - + Device is Running! Please finish scanning first. Device is currently running! Please stop scanning first. - + There are pictures that have not been saved. Are you sure to close? There are unsaved images; are you sure you want to close? - + Are you sure to close? Are you sure you want to close? - + Sure to sign out administrator account? Are you sure you want to log out of the administrator account? - + confirm operation Confirm operation - + are you sure to clear the roller count? Are you sure you want to clear the roller count? - - - + + + hint Prompt - - + + Roller scanned count has been set to 0. Roller count reset to zero. - - + + Roller scanned count reset failed. Failed to reset roller count. - + Error Error - + Document missing! It would be deleted or renamed. File lost! File may be deleted or renamed. - + confirm the operation Confirm operation - + Are you sure to clear the rollor acount? Are you sure you want to clear the roller count? - About %1 - About %1 + About %1 - <p>%1</p><p>Version: %2<br>CopyRight: &#169; %3</p><p>%4%5%6%7%8%9</p> - <p>%1</p><p>Version: %2<br>Copyright: &#169; %3</p><p>%4%5%6%7%8%9</p> + <p>%1</p><p>Version: %2<br>Copyright: &#169; %3</p><p>%4%5%6%7%8%9</p> + about %1 About %1 + <p>Version: %1</p> <p>Version: %1</p> - + + <p>CopyRight: &#169; %1</p> <p>Copyright: &#169; %1</p> - + + <p>%1: <a href='%2'>%3</a> <p>%1: <a href='%2'>%3</a> - + + <p>%1: %2 <p>%1: %2 - + roller number Number of rollers - + open scanner Open scanner - - + + app name HUAGOSCAN scanning software - - + + success successfully - + be ready Ready - - + + failed failed - - - + + + error Error - + start failed! Failed to start! - - - - - - + + + + + + folder limit Cannot access “My Documents”. Please go to “Scan to” and change the accessible scan folder and then perform the scan. - + Insufficient access rights Insufficient file access permissions - + Image processing failed Image processing failed - + Ocr init failed OCR initialization error - + Ocr failed OCR failed - + File does not exist File does not exist - + Failed to load dynamic library Failed to load dynamic library - + File data error File data error - + Image format processing error Image format processing error - + Out of memory Insufficient memory - + Failed Failed - + apply setting Apply configuration - + Are you sure to close Are you sure you want to disconnect device: - + ? ? - - + + close Close - + tip Prompt - + Other versions not available No other versions obtained - - + + The device does not support this operation Device does not support this operation - - + + IO error IO error - - + + The language switch is successful and takes effect the next time the software is started! The language switch is successful and takes effect the next time the software is started! - + Are you sure to delete selected file? Are you sure to delete the selected file completely? diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index bf0cc459..d296b46b 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -1329,16 +1329,27 @@ void MainWindow::on_continueScan() ui->act_scannerSettings->setEnabled(false); m_dialogLog->updateStatus(false, false); m_dialogLog->show(); - QTime curTimer = QTime::currentTime().addMSecs(10000); - while (QTime::currentTime() < curTimer) + + if ("439" == getDevPid() || "9220" == getDevPid()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + m_dialogLog->addLog(tr("Please wake up the device manually"), true); + m_wndStatusBar->setDeviceStatusInfo(tr("Please wake up the device manually"), true); } + else + { + QTime curTimer = QTime::currentTime().addMSecs(10000); + while (QTime::currentTime() < curTimer) + { + QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + } + + m_dialogLog->addLog(tr("already waked up device"), false); + m_wndStatusBar->setDeviceStatusInfo(tr("already waked up device"), false); + } + ui->menu_scan->setEnabled(true); ui->act_acquire->setEnabled(true); ui->act_scannerSettings->setEnabled(true); - m_dialogLog->addLog(tr("already waked up device"), false); - m_wndStatusBar->setDeviceStatusInfo(tr("already waked up device"), false); m_dialogLog->updateStatus(true, false); } } @@ -3247,16 +3258,27 @@ void MainWindow::on_act_acquire_triggered() ui->act_scannerSettings->setEnabled(false); m_dialogLog->updateStatus(false, false); m_dialogLog->show(); - QTime curTimer = QTime::currentTime().addMSecs(10000); - while (QTime::currentTime() < curTimer) + + if ("439" == getDevPid() || "9220" == getDevPid()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + m_dialogLog->addLog(tr("Please wake up the device manually"), true); + m_wndStatusBar->setDeviceStatusInfo(tr("Please wake up the device manually"), true); } + else + { + QTime curTimer = QTime::currentTime().addMSecs(10000); + while (QTime::currentTime() < curTimer) + { + QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + } + + m_dialogLog->addLog(tr("already waked up device"), false); + m_wndStatusBar->setDeviceStatusInfo(tr("already waked up device"), false); + } + ui->menu_scan->setEnabled(true); ui->act_acquire->setEnabled(true); ui->act_scannerSettings->setEnabled(true); - m_dialogLog->addLog(tr("already waked up device"), false); - m_wndStatusBar->setDeviceStatusInfo(tr("already waked up device"), false); m_dialogLog->updateStatus(true, false); } } @@ -3314,16 +3336,27 @@ void MainWindow::on_act_acquireSingle_triggered() ui->act_scannerSettings->setEnabled(false); m_dialogLog->updateStatus(false, false); m_dialogLog->show(); - QTime curTimer = QTime::currentTime().addMSecs(10000); - while (QTime::currentTime() < curTimer) + + if ("439" == getDevPid() || "9220" == getDevPid()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + m_dialogLog->addLog(tr("Please wake up the device manually"), true); + m_wndStatusBar->setDeviceStatusInfo(tr("Please wake up the device manually"), true); } + else + { + QTime curTimer = QTime::currentTime().addMSecs(10000); + while (QTime::currentTime() < curTimer) + { + QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + } + + m_dialogLog->addLog(tr("already waked up device"), false); + m_wndStatusBar->setDeviceStatusInfo(tr("already waked up device"), false); + } + ui->menu_scan->setEnabled(true); ui->act_acquire->setEnabled(true); ui->act_scannerSettings->setEnabled(true); - m_dialogLog->addLog(tr("already waked up device"), false); - m_wndStatusBar->setDeviceStatusInfo(tr("already waked up device"), false); m_dialogLog->updateStatus(true, false); } } @@ -3397,16 +3430,27 @@ void MainWindow::on_act_acquireInto_triggered() ui->act_scannerSettings->setEnabled(false); m_dialogLog->updateStatus(false, false); m_dialogLog->show(); - QTime curTimer = QTime::currentTime().addMSecs(10000); - while (QTime::currentTime() < curTimer) + + if ("439" == getDevPid() || "9220" == getDevPid()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + m_dialogLog->addLog(tr("Please wake up the device manually"), true); + m_wndStatusBar->setDeviceStatusInfo(tr("Please wake up the device manually"), true); } + else + { + QTime curTimer = QTime::currentTime().addMSecs(10000); + while (QTime::currentTime() < curTimer) + { + QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + } + + m_dialogLog->addLog(tr("already waked up device"), false); + m_wndStatusBar->setDeviceStatusInfo(tr("already waked up device"), false); + } + ui->menu_scan->setEnabled(true); ui->act_acquire->setEnabled(true); ui->act_scannerSettings->setEnabled(true); - m_dialogLog->addLog(tr("already waked up device"), false); - m_wndStatusBar->setDeviceStatusInfo(tr("already waked up device"), false); m_dialogLog->updateStatus(true, false); } } @@ -3479,16 +3523,27 @@ void MainWindow::on_act_insertFromScanner_triggered() ui->act_scannerSettings->setEnabled(false); m_dialogLog->updateStatus(false, false); m_dialogLog->show(); - QTime curTimer = QTime::currentTime().addMSecs(10000); - while (QTime::currentTime() < curTimer) + + if ("439" == getDevPid() || "9220" == getDevPid()) { - QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + m_dialogLog->addLog(tr("Please wake up the device manually"), true); + m_wndStatusBar->setDeviceStatusInfo(tr("Please wake up the device manually"), true); } + else + { + QTime curTimer = QTime::currentTime().addMSecs(10000); + while (QTime::currentTime() < curTimer) + { + QCoreApplication::processEvents(QEventLoop::AllEvents, 100); + } + + m_dialogLog->addLog(tr("already waked up device"), false); + m_wndStatusBar->setDeviceStatusInfo(tr("already waked up device"), false); + } + ui->menu_scan->setEnabled(true); ui->act_acquire->setEnabled(true); ui->act_scannerSettings->setEnabled(true); - m_dialogLog->addLog(tr("already waked up device"), false); - m_wndStatusBar->setDeviceStatusInfo(tr("already waked up device"), false); m_dialogLog->updateStatus(true, false); } } @@ -4106,6 +4161,22 @@ void MainWindow::deleteUpgradePkg(const QString &cfgFilePath) } } +QString MainWindow::getDevPid() +{ + VIDPID vidpid; + int vidpid_val; + unsigned int len = sizeof(int); + sane_io_control(dev_que_.handle(), IO_CTRL_CODE_GET_VIDPID, &vidpid_val, &len); + vidpid.Value = vidpid_val; + int vid = vidpid.VID; + int pid = vidpid.PID; + char buf[10]; + char buf2[10]; + sprintf(buf, "%x", vid); + sprintf(buf2, "%x", pid); + return QString::fromStdString(buf2); +} + void MainWindow::on_scanOptions_changed(const QString &device, const QString &option, bool checked_now) { QString title(tr("app name")); diff --git a/app/scanner/mainwindow.h b/app/scanner/mainwindow.h index 10dab552..9bf95592 100644 --- a/app/scanner/mainwindow.h +++ b/app/scanner/mainwindow.h @@ -273,6 +273,7 @@ private: void upgradeFwAndLockDevice(); void deleteOverdueLogFile(const QString& logFilePath); void deleteUpgradePkg(const QString& cfgFilePath); + QString getDevPid(); private: Ui::MainWindow *ui; @@ -307,6 +308,16 @@ private: }SAVEOPT; SAVEOPT auto_save_info_; + union VIDPID + { + struct + { + unsigned short VID; + unsigned short PID; + }; + unsigned int Value; + }; + HGUInt m_dpi; QString m_currFilePath; int m_currIndex; diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts index 775dfef5..3fb72f6c 100644 --- a/app/scanner/qt_zh_CN.ts +++ b/app/scanner/qt_zh_CN.ts @@ -1835,11 +1835,7 @@ Please finish scanning first. About %1 - 关于 %1 - - - <p>%1</p><p>Version: %2<br>CopyRight: &#169; %3</p><p>%4%5%6%7%8%9</p> - + 关于 %1 about %1 @@ -2178,6 +2174,10 @@ Are you sure to close? Are you sure to delete selected file? + + Please wake up the device manually + + Phonon::