From d3313b271b87fa1bf5900381d846d03a2b73bc6e Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Sun, 29 Jan 2023 11:18:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E8=AF=AD=E8=A8=80=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=AC=A1=E5=90=AF=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/Scanner_zh_CN.qm | Bin 37516 -> 37678 bytes app/scanner/Scanner_zh_CN.ts | 446 ++++++++++++++++++----------------- app/scanner/Scanner_zh_EN.qm | Bin 50804 -> 51110 bytes app/scanner/Scanner_zh_EN.ts | 444 +++++++++++++++++----------------- app/scanner/main.cpp | 55 ++--- app/scanner/mainwindow.cpp | 57 ++--- app/scanner/mainwindow.h | 5 +- app/scanner/qt_zh_CN.ts | 6 +- 8 files changed, 504 insertions(+), 509 deletions(-) diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index cca5fcf8bbfcd73defb12a4a62328411312916e7..d139276b7aa1540aadefc134a2b9396a274430c2 100644 GIT binary patch delta 2363 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 diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index 9ac22ef9..04ed4b01 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -2179,51 +2179,51 @@ bug description: 导出驱动日志 - + HuaGoScan 华高扫描软件 - + Grid 多列显示 - + Move To... 移动到... - + Insert files 插入文件 + + - - nodevice 没有发现扫描仪 - - - - - - + + + + + + Question 询问 - - + + modified, save it? 图像已被修改。 是否保存修改？ - + file lost, remove it? 文件已丢失，是否删除？ @@ -2232,7 +2232,7 @@ bug description: 已连接 - + disconnected 已断开连接 @@ -2249,17 +2249,17 @@ bug description: 扫描完成 - + Clear, then start scan 清空并启动扫描 - + Do NOT clear, then start scan 不清空并启动扫描 - + Already exist images in image list. Do you want to clear? 图像列表中已存在图像。 @@ -2274,12 +2274,12 @@ Do you want to clear? 磁盘空间不足，请删除不需要的文件，以保证有足够的空间 - + Open images 打开图片 - + Insert images 插入图片 @@ -2292,234 +2292,240 @@ Do you want to clear? 保存失败 - + binary 黑白 - + gray 256级灰度 - + rgb 24位彩色 - + 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! + 语言切换成功，下次启动软件时生效! + + + + + + + + + + + + already waked up device 已唤醒设备 - + be ready 就绪 - - - - - - + + + + + + folder limit 无法访问“我的文档”， 请前往“扫描至”更换可访问的扫描目录再进行扫描。 - + Insufficient access rights 文件访问权限不足 @@ -2532,47 +2538,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 错误 @@ -2587,17 +2593,17 @@ Continue to close? 是否继续关闭？ - + Sure to sign out administrator account? 是否确定登出管理员账户？ - + confirm the operation 确认操作 - + Are you sure to clear the rollor acount? 你确定要清除滚轴计数吗 @@ -2606,34 +2612,34 @@ Continue to close? 请重新进入关于界面以获取最新值 - + <p>%1: <a href='%2'>%3</a> - + <p>%1: %2 - + roller number 滚轴张数 - + open scanner 打开扫描仪 - - + + app name 华高扫描软件 - - + + success 成功 @@ -2650,22 +2656,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. 当前路径磁盘空间不足, 请重新选择路径或及时清理磁盘空间。 @@ -2675,143 +2681,145 @@ Continue to close? 配置丢失 - + apply setting 应用配置 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + start failed 启动失败 - + HanvonScan 汉王扫描软件 - + LanxumScan 立思辰扫描软件 - + CumtennScan 沧田扫描软件 - + menu_language 语言 - + act_simpCN 简体中文 - + act_English - 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 取消 @@ -2820,26 +2828,26 @@ Continue to close? 发现设备 - + reconnected 重新连接 - + already connected, but open faild 已经连接，但打开失败 - - + + save image failed: 存图失败： - - - - + + + + create savepath failed: 创建文件夹失败： @@ -2848,99 +2856,101 @@ 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. 文档丢失！文档可能已被删除或被重命名。 @@ -2973,28 +2983,28 @@ Are you sure to close? <br>导航地址: <a href='https://j.map.baidu.com/7e/1TO'>百度地图访问</a> - + About %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> - + 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> @@ -3015,7 +3025,7 @@ Are you sure to close? 错误 - + default_setting 默认设置 diff --git a/app/scanner/Scanner_zh_EN.qm b/app/scanner/Scanner_zh_EN.qm index c2e24c6ff49ee6ed0ea07829f84f404a398f8ac7..d6c516dd1794a060856dd29633ecd21b11c5092e 100644 GIT binary patch delta 2817 zcmXX|3sh9q8vf=C=giC*W=0JqB*rn7e1RE0QZL{GxCbKx@{l@9cl?{qKMO-}nFLJkC^? zY*&BiqPm&W_n5r%1fY2vIPy(STj<0iPdO?BR35~7;$-62#0X%pKk)H%V6+jCru1O% zM}Ut7D4MP$sAf2h1_Fyt0V93_5}W|l*JL-GfKnfZt97H4Ne5IiPj~@MtQ>lZZ)}gqkR*rwsu-A3=TgA`nmr z^;18f)Dupbhk%7^;dGJnuMdFJl`P;uRu2~0lmsDacj{PU*(11_iCXQnkpMmeFvJRBfzL6X#0h5dM&hPpD^r3B}8ow+N8$F zFMb4u+wppLQ2p^nD}yWQ4WCt723w6WZ;k?X&cm1!T|qCy*e?6fH!;2&&tihhMrLon zaz-5$zAg`;`Q*l}7}3|h1jZjg%&G}M`4YtBM+07K5jTR%i_;Jn5zg^F#C=r?tdewk2*}&NADxV#s z+i_myug;)dt(tbWmVOM1ujto5yG0ehmqD-CsY=*(87PQWoyZFYGLw}&(Q{(mSk>+A z6h~dWs^dP*nncxaVlsLCM%B4sCXiAlNN@5kmA8bKN3tTjoQWPk6h_Qou#g}5UV~` zw~QPEY#64#zLJR}eZ;rfB%v0oU*jt239o_@{y#H%wysc4PZ zE)U_pF=G2+CTxF^c<0J__+Z5Zu~WMSkW(b}&rC{MveYl4lNwb?{R0w#xw7Pu#sfz; zO6IilOwMhkP3PTzOCM?JdeT2=ne=WZ&p9w#is*ce*9})ZWV4XfrufQp9N8~RyJoVT zmA{bkKVuXh+>{FZZU7l?ONBLqI1ZK$#;yRecS)t?bRJkQRg5gAXv(CD`gGvXK&h^G zBW3VHs;^~ZTX|19-71pibm_~_9@8E!H4C*=&l#zui2jONq_d~Clbi(Uf@UyAU|fOp z-N}^{ZVoImTzf2Vv|3xXID>^NX^#w}G!B+4 zvz^V3ss!y0BRvPnT)`7FbZB z+r8%y9LR9fl{7E{^(EcsVZ#8!W!=|%QYqzSy4HVo0@F|F+HaDzIkR<-N{HoIx=yD` zKwKcJzlj6h+Ah1ekiC+Z7*-eVw}cgrP(b(G^! zx$N0-!1*<~(yZJxxC^`Ul@|tc(1vFDo{8BO_NLkI+&kLl?^ac7QdIpkLppVl2&bBsQu^K)595}AeEapA-dg-%0I@p;5 zl)Xl?P_aTeY4i*#`-lFKJEPj0<_!D4D34@kaWta~`oY;PDA59xyW(`E%-g|(ve=u*kK40-Nc?;XKl@OCzE_>p9X}TLrYK4++@($0RYj`=* zpIo>b+yfcmmR}8)suZANjA7uiCLq7kFf@`Btj#hE|Fsf`9boWY@*XQ}k73jY)WGgp zhJd(DOj)jBW>X|9Gr%xgWCnbm8Ro?>h*T$~Z?75i*M%7}=CXnc|1g|>^<6S?$8csV z6Z1-d;oALYz`l`&_I`Bx;W)#CR3^^hWBBXx0=5&4Q9ZGaOs_PWtZXx`PR4(@Qc4-` zD~Ef{aBPV-e%ruP(q|d3o-i^c7mV$jlUQLFjQ1wj@-^XYe7=u;pr+OM*IIroVWml! zvV}_AZxSoos6;oD^CAjk$W>FnK2zzo$uzXwkEIc08uk|X+~sYWax0W2k!qTAjZ_S* zG|dh0VOI?_Ej}_AgHScl6q7(Mw1O#V(HegC95k)?PZxHW?BV=0QhrwQde3k@GSBqf z@)6&m=S?q`)&oK<%e}6+=J(#wYrKwPA!1;K1@Q<&BBGH(jPADBunMuTBZ4a|e6lGX z<6Rw=?sbv0*!i@aD{XwXB8opN*V?;hdVD6*vifgJED|{C+SM~>LlSq`c}5tLyJvU; z=WVogS?sh$Vjw?w_+82Wl7%r=OMKYe#ORc;XsgAxD%KtmV~Mp{Y$*{DR+}v3hW;PoZd90df5)-2+FDb1OZlo58 zI$BbpLXR1fM{Ny@W{XEN+v8y$$>XJM57|Y3UFZJ2Uf=6`eZRkB%ho>1)NZlY{J6DO zjk0qaAioWi7jA8yJGQ)$U!{P?g;-0RNc@Hv3G|x)*qni3W<1Gvl^=j zPCm?SGfn}6e*RFC&pnMj*N#k&>ir22yNpfAZQP?PyERHDeN+f zfcFw$cZu__yTa~=EMRYB7Zy%YV}<#HR0l}y?*Zx?kYArf{#lTtn;G6OkTba5^Eu=~ z5!lyLeJ1$z&A$P;av4xr3%RZW@QQ=ZA)M3Gplf_g+PP}D)*8C*Ck*-O7hq64UVll- z3B#L6Ztrb)f2t$d!|)mH1?=n(pOY_0&%uZn;{!%x)Jtr{82j~9Z-shJJ3k`fW6aHE zZXAmd-SRasst^l49RrklVL@&*Ff;)%gSosY3^9=r{Jw*j^Cdv`Z7j;=x0|gCx5VO; z!%U1m63dDTfc1~C>>7h#U#@1^c?!GJ)i3R=5veP2!hIfhC*f2^64Q7A4NpD-KFdMN z|4FuT9&Z1^RKM997!SM+nrD$p$2P0~wpG_e_1fLveA$sIF+jLGT_(PM0tL31m+1*i(pwB6&d zyjXKz`~)~qsOg+O1z27xNTV6cp<_Z%+c9AHLcy{ADX_Jl`dIYnaqxr?s%rqc9}{Mt zX$7`4szW8efU+Xt(0X#%?Jpd=9S_782(^8!Jawq>m9HnTxkfnc8^@T9!r6B?pXemi z-L2!P2ZXEN9|1PCsD~u0aA<(~9pONs%D%@%uJrxBB$ zh>re$FjtR6Yx~G z(`n;>rLfgZzuO#Xb|&xH>n25Z_6OFER$UaUkasI?Y5&3{K-OZZ)h<&A^y?xgm_=NBtmw*Nx3Hr%t{&h~ujlsrL-lfc-5xp@Y-w(sVDS^s?z3 z^67O=sxIXGa$w|b-P~DZo!g|_9>0*iGfh`IE1kZ)uB#YGYwTO6zGbu~R|M+LD?B~0 zUe|Ex3cE^}uKB@Zplp<`{lh50y+p4|W|ukgvA)mcKESLy`U&q--1VON1-JYF`#-zT z-%h_M>H(w4)i0V)j4IGCN~Be~W$BkD6SwrzuiVJ>5qI>N@t1+=W%|$ai;#@8`+D0M zGSGgn|L2DT0n-)zH~C4l@^F3A80B>X~ z_V&zPQJXSQ)6QBCQ^x${3e4?PCWdo;-XSGG_=wrsssz>l3`|j!nGYD)Y9D3J+s(;< z`N)eOWOPdjUrhbi^-{u{ZZV6GmBd|aO&fBR4QF-$8-0|m+o_D2pyY?sHfn`Z+z?MQ zW+=sN6RAkDV)LYe8y+gQ&=js0727-#*tk@&?WqP*JC)Lo6M(V5Qf~c=Z>gwMEK%D{ zJ!A6Xl+)Jbe5Klzv+Z1=ou*vss|WnQQf`FOXsh=qcg&=|CR=IqokVOjh`&w+oYxv0 zZti7k8E5F-PQzwSGz9MZg?@80yc0tI8S)Gt7|3+{62pAm|Jd(LYOL8~_}*+oW-$ZJ z*BUmvv{5-HLvcenFh0sq(kqMx^fJ`0o6V~G$x#2wUEpA_dd}<-`b7`JLuba5A7(`S z3L0v%Q5?p&La!Sg!*2jF-bUw=p^VpN9Gu5@C-J<|TW;p_cZT?wkEpA0!c6Lu7^jY~ zcn;beWn7%b={fU^=}pmqPopu@TFN}%H6FjX82I8_K3p;mVb zPEPeTUp~WIQu>;&o-|Xdi{{qUI2P+g^PP!Rd~xi|PYamoBPHhN3EzP9EP{U;i(rLC zENiBz9WBNg^qTusi$jk99-C(waL|uc7HS#z1|5)NXYs!|m(`VInc8vzc&*$rEy$Y< z+Ql-fVjA2~-eFk~%OvRpOWcfA{0FtlvgBVcu+9=6F$~ytQr+D>xOaJf%hNvF_#9ub aJPWG@gsO#nd=roU)jfLE(Tq&zaeo7V$RvIM diff --git a/app/scanner/Scanner_zh_EN.ts b/app/scanner/Scanner_zh_EN.ts index efefe0ad..cc805e07 100644 --- a/app/scanner/Scanner_zh_EN.ts +++ b/app/scanner/Scanner_zh_EN.ts @@ -2022,167 +2022,169 @@ Please make sure the two passwords are the same. Export drive log... - + HanvonScan Hanvon scanning software - + LanxumScan LANXUM scanning software - + CumtennScan CUMTENN scanning software - + 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? @@ -2191,555 +2193,563 @@ 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 - - - - - - - - - - + + + + + + + + + + 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 - + <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! + QObject - + default_setting Default setting diff --git a/app/scanner/main.cpp b/app/scanner/main.cpp index 99416486..ebaf8ff1 100644 --- a/app/scanner/main.cpp +++ b/app/scanner/main.cpp @@ -12,7 +12,7 @@ int main(int argc, char *argv[]) lang_initialize(nullptr); - QString appLang = getCfgValue("global", "language", QString("Chinese")); + QString appLang = getCfgValue("global", "language", QString("chinese")); for (int i = 1; i < argc; i++) { char* z = argv[i]; @@ -26,39 +26,28 @@ int main(int argc, char *argv[]) appLang = "chinese"; } - while (1) + QString translator_qt_name = ":translation/qt_zh_CN.qm"; + QString translator_scanner_name = ":translation/Scanner_zh_CN.qm"; + int cp = 936; + if (appLang == "english") { - QString translator_qt_name = ":translation/qt_zh_CN.qm"; - QString translator_scanner_name = ":translation/Scanner_zh_CN.qm"; - int cp = 936; - if (appLang == "english") - { - translator_qt_name = ":translation/qt_zh_CN.qm"; - translator_scanner_name = ":translation/Scanner_zh_EN.qm"; - cp = 20127; - } - - QTranslator translator_qt; - if (translator_qt.load(translator_qt_name)) - a.installTranslator(&translator_qt); - QTranslator translator_scanner; - if (translator_scanner.load(translator_scanner_name)) - a.installTranslator(&translator_scanner); - - lang_set_code_page(cp); - - MainWindow w(appLang); - QScreen *screen = QGuiApplication::primaryScreen(); - w.move((screen->size().width() - w.width()) / 2, (screen->size().height() - w.height()) / 2); - w.show(); - a.exec(); - - saveCfgValue("global", "language", appLang); - if (!w.isContinue()) - { - break; - } + translator_qt_name = ":translation/qt_zh_CN.qm"; + translator_scanner_name = ":translation/Scanner_zh_EN.qm"; + cp = 20127; } - return 0; + QTranslator translator_qt; + if (translator_qt.load(translator_qt_name)) + a.installTranslator(&translator_qt); + QTranslator translator_scanner; + if (translator_scanner.load(translator_scanner_name)) + a.installTranslator(&translator_scanner); + + lang_set_code_page(cp); + + MainWindow w(appLang); + QScreen *screen = QGuiApplication::primaryScreen(); + w.move((screen->size().width() - w.width()) / 2, (screen->size().height() - w.height()) / 2); + w.show(); + return a.exec(); } diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index 269f29c8..2eac0b0e 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -51,12 +51,10 @@ #define PASSWORD_KEY 4 #define MY_URL_SCHEME "inscanner" -MainWindow::MainWindow(QString& appLang, QWidget *parent) +MainWindow::MainWindow(const QString& appLang, QWidget *parent) : QMainWindow(parent) , ui(new Ui::MainWindow) - , m_appLang(appLang) , m_currLang(appLang) - , m_isContinue(false) , m_versionDll(nullptr) , m_admin_loggedIn(false) , m_dpi(200) @@ -401,11 +399,6 @@ MainWindow::~MainWindow() delete ui; } -bool MainWindow::isContinue() -{ - return m_isContinue; -} - void MainWindow::exitFullScreen() { assert(nullptr != m_dlgFullScreen); @@ -4227,48 +4220,40 @@ void MainWindow::on_act_device_log_triggered() void MainWindow::on_act_simpCN_triggered() { - if (m_currLang == "english") - { - m_act_simpCN->setChecked(false); - m_act_English->setChecked(true); - } - else - { - m_act_simpCN->setChecked(true); - m_act_English->setChecked(false); - } + m_act_simpCN->setChecked(true); + m_act_English->setChecked(false); if (m_currLang == "chinese") { return; } - m_appLang = "chinese"; - m_closeTip = false; - m_isContinue = true; - close(); + m_currLang = "chinese"; + saveCfgValue("global", "language", m_currLang); + + QMessageBox msg(QMessageBox::Critical, tr("tips"), + tr("The language switch is successful and takes effect the next time the software is started!"), + QMessageBox::Ok, this); + msg.setButtonText(QMessageBox::Ok, tr("yes")); + msg.exec(); } void MainWindow::on_act_English_triggered() { - if (m_currLang == "english") - { - m_act_simpCN->setChecked(false); - m_act_English->setChecked(true); - } - else - { - m_act_simpCN->setChecked(true); - m_act_English->setChecked(false); - } + m_act_simpCN->setChecked(false); + m_act_English->setChecked(true); if (m_currLang == "english") { return; } - m_appLang = "english"; - m_closeTip = false; - m_isContinue = true; - close(); + m_currLang = "english"; + saveCfgValue("global", "language", m_currLang); + + QMessageBox msg(QMessageBox::Critical, tr("tips"), + tr("The language switch is successful and takes effect the next time the software is started!"), + QMessageBox::Ok, this); + msg.setButtonText(QMessageBox::Ok, tr("yes")); + msg.exec(); } diff --git a/app/scanner/mainwindow.h b/app/scanner/mainwindow.h index 2746753f..29a59591 100644 --- a/app/scanner/mainwindow.h +++ b/app/scanner/mainwindow.h @@ -79,10 +79,9 @@ class MainWindow : public QMainWindow std::vector wrong_imgs_; public: - MainWindow(QString& appLang, QWidget *parent = nullptr); + MainWindow(const QString& appLang, QWidget *parent = nullptr); virtual ~MainWindow() override; - bool isContinue(); void exitFullScreen(); static HGResult saveImage(HGImage image, const HGImgFmtSaveInfo* info, bool ocr, const HGChar *fileName); static QString getLogInfo(HGResult ret); @@ -275,9 +274,7 @@ private: private: Ui::MainWindow *ui; - QString &m_appLang; QString m_currLang; - bool m_isContinue; VersionDll *m_versionDll; QString m_password; bool m_admin_loggedIn; diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts index 9898b37b..3a13abf2 100644 --- a/app/scanner/qt_zh_CN.ts +++ b/app/scanner/qt_zh_CN.ts @@ -2158,6 +2158,10 @@ Are you sure to close? act_English + + The language switch is successful and takes effect the next time the software is started! + + Phonon:: @@ -4808,7 +4812,7 @@ Please verify the correct file name was given. default_setting - 默认设置 + 默认设置