From dcc0a1c90f4d762f10b1a266920031c20e8b9d86 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Fri, 10 Mar 2023 13:39:50 +0800 Subject: [PATCH] =?UTF-8?q?app=E6=B7=BB=E5=8A=A0=E7=B4=AB=E5=85=89oem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/Scanner_resource.qrc | 1 + app/scanner/Scanner_zh_CN.qm | Bin 39020 -> 39078 bytes app/scanner/Scanner_zh_CN.ts | 645 +++++++++--------- app/scanner/Scanner_zh_EN.qm | Bin 52902 -> 52990 bytes app/scanner/Scanner_zh_EN.ts | 645 +++++++++--------- app/scanner/VersionDll.cpp | 4 + app/scanner/dialog_aquireinto.cpp | 2 + app/scanner/dialog_feedback.cpp | 2 + app/scanner/dialog_upgrade.cpp | 2 + app/scanner/image_rsc/logo/uniscan.ico | Bin 0 -> 16958 bytes app/scanner/mainwindow.cpp | 30 + app/upgrade/HGUpgrade.cpp | 14 + app/upgrade/main.cpp | 2 + .../HGSolution/HGFWUpgrade/HGFWUpgrade.pro | 23 +- build-qt/HGSolution/HGScanner/HGScanner.pro | 22 +- build-qt/HGSolution/HGUpgrade/HGUpgrade.pro | 17 +- 16 files changed, 768 insertions(+), 641 deletions(-) create mode 100644 app/scanner/image_rsc/logo/uniscan.ico diff --git a/app/scanner/Scanner_resource.qrc b/app/scanner/Scanner_resource.qrc index 55392fab..a8d056bf 100644 --- a/app/scanner/Scanner_resource.qrc +++ b/app/scanner/Scanner_resource.qrc @@ -103,5 +103,6 @@ image_rsc/scroll/vScrollSlider_Push.png image_rsc/action/btnEdit.png image_rsc/logo/Microtek_logo.ico + image_rsc/logo/uniscan.ico diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index 35539dfbaf769485cd883aa9c3a22aec26717192..94613f25335ea4498fc7ea38e87485d3533c0c3c 100644 GIT binary patch delta 1989 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所有页 - - - - + + + + e.g. '%1%2' 例如.“%1%2” - + ok 确定 - + cancel 取消 - + Browse directory 文件夹路径 @@ -546,36 +546,36 @@ Page range will be "Chosen Pages". 多页保存(TIFF/PDF/OFD/GIF) - - + + Input is not valid. Page range will be 'Chosen Pages'. 输入无效。 页码范围将是“被选页码” - + English 英语 - + Simplified Chinese 中文(简体) - + Traditional Chinese 中文(繁体) - + Japanese 日文 - + Korean 韩文 @@ -593,17 +593,17 @@ Page range will be 'Chosen Pages'. 停止导出 - + export failed: 导出失败： - + tip 提示 - + export succeed 导出完成 @@ -663,34 +663,34 @@ Page range will be 'Chosen Pages'. 请留下您的电话、QQ或者邮箱等联系方式（必填）。 - - - + + + error 错误 - + Comments and suggestions cannot be empty. 意见与建议不能为空哦 - + The contact information column cannot be empty. 联系方式一栏不能为空哦 - + tip 提示 - + submit succeed. 提交成功 - + submit failed. 提交失败 @@ -1007,22 +1007,22 @@ Page range will be 'Chosen Pages'. 图像信息 - + ok 确定 - + File 文件 - + Image 图像 - + None 无 @@ -1055,17 +1055,17 @@ Page range will be 'Chosen Pages'. 应用到图像 - + ok 确定 - + cancel 取消 - + restore default 恢复默认 @@ -1139,22 +1139,22 @@ Page range will be 'Chosen Pages'. 处理后 - + Image crop 裁剪/纠偏/消除黑框 - + ok 确定 - + cancel 取消 - + restore default 恢复默认 @@ -1215,12 +1215,12 @@ Page range will be 'Chosen Pages'. 最后一页之后 - + ok 确定 - + cancel 取消 @@ -1418,12 +1418,12 @@ This operation will NOT rotate the files that may contain multiple pages, such a 此操作不会旋转可能包含多页的文件，例如PDF、TIFF等。 - + ok 确定 - + cancel 取消 @@ -1473,12 +1473,12 @@ This operation will NOT rotate the files that may contain multiple pages, such a 页数： - + ok 确定 - + cancel 取消 @@ -1528,43 +1528,43 @@ Password length should between 8-20 charactors. 取消 - + Type old password 输入旧密码 - + Type new password 输入新密码 - + Retype new password 确认新密码 - - + + Warning 警告 - + Old password incorrect. Please try again. 旧密码错误。请重试。 - + New password and confirm password are not matched. Please make sure the two passwords are the same. 新密码和确认密码不匹配。 请确保两个密码相同。 - - - + + + Password only allowed to use numbers, English and special characters. 新密码只允许使用数字、英文和特殊字符。 @@ -1592,27 +1592,27 @@ Please make sure the two passwords are the same. OCR类型： - + English 英语 - + Simplified Chinese 中文(简体) - + Traditional Chinese 中文(繁体) - + Japanese 日文 - + Korean 韩文 @@ -1791,7 +1791,7 @@ Please make sure the two passwords are the same. - + upgrade contents: 更新内容： @@ -1806,19 +1806,19 @@ bug description: - + The current version is the latest! The current version number is : 当前为最新版本！版本号为： - - + + Discover the new version : 发现新版本： - - + + ,the current version is : ，当前版本为： @@ -2072,269 +2072,270 @@ bug description: 扫描单张 - + + act_acquireInto 扫描至... - + act_fullscreen 全屏显示 - + act_fitWindowSize 适应视图框尺寸 - + act_fitWindowWidth 适应视图框宽度 - + act_realSize 真实大小 - + act_zoomIn 放大 - + act_zoomOut 缩小 - + act_toolBar 工具栏 - + act_statusBar 状态栏 - + act_thumbnailBar 缩略图栏 - + act_colorInfo 色彩信息 - + act_previous 上一张 - + act_next 下一张 - + act_first 第一张 - + act_last 最后一张 - + act_openPageNum 跳转至... - + act_previousPage 上一页 - + act_nextPage 下一页 - + act_firstPage 第一页 - + act_lastPage 最后一页 - + act_adjust 亮度/对比度/伽马... - + act_90Left 左旋转90度 - + act_90Right 右旋转90度 - + act_180 旋转180度 - + act_multiRotate 多页旋转... - + act_autoCrop 裁剪/纠偏/消除黑框... - + act_signIn 登录... - + act_passwordChange 密码修改... - + act_signOut 登出 - + act_log 日志管理... - + act_clrCache 缓存设置... - + act_consume 耗材状态... - + act_help 帮助 - + act_about 关于... - + act_insertFromScanner 从扫描插入... - + act_clearRoller 清除滚轴计数 - + act_imageEdit 图像编辑... - + act_sortPages 书籍排序 - + act_autoSave 自动保存 - + act_update 检查更新... - + act_feedback 意见反馈... - + act_device_log 导出设备日志 - + act_driver_log 导出驱动日志 - + act_deleteFile 删除选中项 - + HuaGoScan 华高扫描软件 - + Grid 多列显示 - + Move To... 移动到... - + Insert files 插入文件 - - - + + + nodevice 没有发现扫描仪 - - - - - + + + + + Question 询问 - + modified, save it? 图像已被修改。 是否保存修改？ - + file lost, remove it? 文件已丢失，是否删除？ @@ -2343,7 +2344,7 @@ bug description: 已连接 - + disconnected 已断开连接 @@ -2360,17 +2361,17 @@ bug description: 扫描完成 - + Clear, then start scan 清空并启动扫描 - + Do NOT clear, then start scan 不清空并启动扫描 - + Already exist images in image list. Do you want to clear? 图像列表中已存在图像。 @@ -2385,12 +2386,12 @@ Do you want to clear? 磁盘空间不足，请删除不需要的文件，以保证有足够的空间 - + Open images 打开图片 - + Insert images 插入图片 @@ -2403,260 +2404,269 @@ Do you want to clear? 保存失败 - + binary 黑白 - + gray 256级灰度 - + rgb 24位彩色 - - - - - - - - - - + + + + + + + + + + + + Please wake up the device manually 请手动唤醒设备 - + + UniScan + 紫光扫描软件 + + + 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 彩色 - + Not supported 不支持 - + Warning 警告 - + Device is Running! Please finish scanning first. 设备正在运行！ 请先结束扫描。 - + cache path folder limit:%1 无法访问当前缓存路径：%1 请尝试在【用户】菜单登录管理员账户，前往【缓存设置】更改缓存路径。 - + aquireinto folder limit:%1 无法访问当前缓存路径：%1 请尝试在【扫描到】更改缓存路径。 - + 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 就绪 @@ -2666,7 +2676,7 @@ Please finish scanning first. 请尝试在【用户】菜单登录管理员账户，前往【缓存设置】更改缓存路径 - + Insufficient access rights 文件访问权限不足 @@ -2679,46 +2689,46 @@ 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 错误 @@ -2733,17 +2743,17 @@ Continue to close? 是否继续关闭？ - + Sure to sign out administrator account? 是否确定登出管理员账户？ - + confirm the operation 确认操作 - + Are you sure to clear the rollor acount? 你确定要清除滚轴计数吗 @@ -2752,36 +2762,36 @@ Continue to close? 请重新进入关于界面以获取最新值 - - + + <p>%1: <a href='%2'>%3</a> - - + + <p>%1: %2 - + roller number 滚轴张数 - + open scanner 打开扫描仪 - - + + app name 华高扫描软件 - - + + success 成功 @@ -2798,22 +2808,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. 当前路径磁盘空间不足, 请重新选择路径或及时清理磁盘空间。 @@ -2823,26 +2833,29 @@ Continue to close? 配置丢失 - + apply setting 应用配置 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + start failed 启动失败 @@ -2867,72 +2880,72 @@ Continue to close? Microtek DocWizard EX 扫描软件 - + 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 切换图片时，自动保存编辑过的图像。若想取消，请取消勾选菜单项：图像->自动保存 @@ -2953,26 +2966,26 @@ Continue to close? 发现设备 - + reconnected 重新连接 - + already connected, but open faild 已经连接，但打开失败 - - + + save image failed: 存图失败： - - - - + + + + create savepath failed: 创建文件夹失败： @@ -2981,102 +2994,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. 文档丢失！文档可能已被删除或被重命名。 @@ -3117,21 +3130,21 @@ Are you sure to close? <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 88b4f9b50423ee9a5afad43caf5d993bc785c20c..1f9e065b869dd40655413370d6ad6feefe86c517 100644 GIT binary patch delta 2262 zcmX9)lsAlMLNl4T?`nMoM9{XC84V9=?Dz`$o1(vwK=JA8SAup$Uv%jpvR-Qexx3CyVb zge69JH})j#gJC`E?uRj=2L}Yf*E${8s;E15P|@C{D(6l4Q`%FhGXeuO{m zN6tyz!T&Uc*3-Y>?_56uY)WRCl9|h3Ws=$PtT65fapF)X#6=|ni(`biw5h-{MTkH1 zlw3H3J(kSwRYJXsB~Xwcv<&hFGPJ_|C1J#om2f|aZE z**IA$9@R#8O4@z&3n2fZv_Eb!P#7;AI7ml_Zj%lTDg)~7ONSaViK=heN7*#xt#r2j z4Vhq})XdkCMGB>seYCscf6}F8i#V@Uf8od2$IEwoQ8RxjmiMOL`gifvUK# z#(E@0-#k|17F0(@&SWwAaP9*;sdu&7YOASqrb_wouBI}21d#KAz16!7U8lJ^pq1RP zO4HHzF7Vl6&C{q`z|8xa{|q<`xSZGgHs@<9;$d3;J&BR!$R-->`F(V2gUK>WTR9_( ziqD{}b|;}Le_;g%vu~32qD;*(xK!J6jgImiu5Eqw7O35#?VLNGnr5|5yV{qUVS>)# zrUNj$kIsJ@ah27~o*PV#`*aIek;=XDbW2tf7F+6alWzjky>&ZwmJ*{`%tbNJ&C}f& z*A0Xe>)Ia>pOaqeUY8RdY0`CDP}<^DS@<~~m^e(fw*CpI3YFctPAa|#+4rs)m@mo! zk@Ww5Q4Zo`h}qlnnC1t-_$PAsE6OorG%HigGppsu8;^+J>+-7Y)F^ViexwAL5vXX+{Tu5kUIw7*dUiD6YnH_K=G+%gNGbe2Bf?ghz~!X6vV++HTCZk7r9 z*ZnAq(jx{WFQZ3lJo8gs<-7pHz+!64>DO3-YU2LFGF3-SSdj;?rjwPaX7?yV;`&x# zZmuEgMl2q2~6H(sK1&>l)DqP;Yy5HFF#Je^1`LaR2}S delta 2203 zcmX96j7Clu(Rd-iYU4Tdj6&jI6K)?tpnBamUV&Xz{L@_7<8H53G0oMeTMMV&o z=K{E(4s-obHYgq;w^x&i|eAY8lxj9&@i%}AhH!xY}ATL6ojn}D+E%$tw*sD#ut z9oYQH+ySj!6q#p3 zd+{~!Z3%M_OtS{StKb~1R1Esz0pRru2KOWq@&-e$5gvL0zhzoV&>j8(zQD}-54i6n z{F{0b4#3bJyGIp<_n>Dm0&O#Z;-A?LA)a$#?*(Jn2+S{x2YkAa=tZ`QI3&i#0KRjP z_~RjZzY_pmES8iM0~<$T$sH;@=QkE*;md7hn=BliH=V}!uF>S| ziIchMKzbBf-oyc0@8kCWDY1sp?2?7i<1p7J{WP%XK4rd${>FaQqe5`INRb z3%FW;bdQXoo~B(1lZ!jvLzGe$4Vtr|HZda?iE|(4LT`rnGF9Tu}vEn>wvDibb+0KA3IkA41O7; zPn&quwl}T2#iNZpuy2ldv`IslFCP8nB%zOZS#JTD+Qhc7Ie_~&V!P~0eh0+%%Ci(U zQ+#yuUqtUdv0J+Wevs27;W1UdahqfrL#kN!lVlg$O+sBJ^%+Nf3$KwJvM8`$tmK$Q zj#X!wDErzEks`k)8Mwqsv-2q2As;EW+Z|Y+!6wO${Px={S)MYcNGb@U;c(=xRMu(7RBAa$-eu*|#gm&U;Q;Bfh7=ZHA^mh>5eYV5>g?x8r&&qQ5`L#!+(%>k z2}R%XM&lk_PYNB%;`9+*89SkOvtccoau>QOYjZT^vBQDfGWJ^U{_!x)WzSY1(@S%| z&n@7ig_NB#g+ZE3U))Rxc80gg3k zt38P5@;tV~(iAvA`=d<5F{DJ>a)pix9Hwo3{u-zY)^>e0kA`NoPP;mgWa*%Dy6yzb z>8%^}7wT2ca`x2H*#8S%(kf!vYLjl!YQn;1U0&*SV1~bL_ns2!XdrV{OkV}*u1)9$ zLW^|m_o$y!Ug}<&36Ct$bz4x{;xt*fkO)i~D%;wgp&9hM?7?-><%^U9Z<&C3qC7f^ z{y$hR2lH{%*>&=`^Y?&>kL8Hxlw-zAR;rk0&6T6BJ*56#l~)zepxF3O&TQTRusuaT_TU5JHd!AY zN?hxU^t1F7d#^_SSM3WLAiY_o!QHw@pI2%Dl<4*O4xLoDE9)?rxNs(_?$!?amwhRV zk{C;*E~SzAKNh6A$$4FtUPUyPGuE(V)yNHG*=m1Qr8;s}?2_sze|OXJYKT1vAe_Bc zeZvZrkLHa6Vnda_p%gt|uQ=7D0kyrA{$HL2_P8E)9S_LF$DL%8JNx|PJ zz8li1-=502#7y$5W64%Vu9#(8P5xp{my$D;6j^#xIpsW?G-jck+ejt$%TsPYeG8an zrQMDWDQHl-(y0Ym-O3*~Xuf^>vq2a^?cA`{pvKV+HCh-xH4@pI_cK@P(ADb=*PCAx z2}y>wCIgV-Z)jha0&tfNPe#|#Rje_*E2c};7-{%pgUXLtPt$9yDps_TRP0sD z8APhvUDeJem`;794m>;(m_I`G_>71tUaF3{KL?19QYYW0wmR3VQ^)xcA$97^>Z!Co z+NRD=z6)r1HD$&MdPls}h5zWmrD|%-$MmpIV~S0L-4OMi(>5T@PkkTR2=H|YK$Cav ON}E?}YEQD!pZp05R<17q diff --git a/app/scanner/Scanner_zh_EN.ts b/app/scanner/Scanner_zh_EN.ts index 47da6a89..019662c7 100644 --- a/app/scanner/Scanner_zh_EN.ts +++ b/app/scanner/Scanner_zh_EN.ts @@ -313,25 +313,25 @@ User custom pages - - - - + + + + e.g. '%1%2' For example"%1%2" - + ok OK - + cancel Cancel - + Browse directory Folder path @@ -527,36 +527,36 @@ The page range will be “selected pages” Cancel - - + + Input is not valid. Page range will be 'Chosen Pages'. Input invalid. The page range will be “selected pages” - + English English - + Simplified Chinese Simplified Chinese - + Traditional Chinese Traditional Chinese - + Japanese Japanese - + Korean Korean @@ -574,17 +574,17 @@ The page range will be “selected pages” Stop exporting - + export succeed Export completed - + export failed: Export failed: - + tip Prompt @@ -636,34 +636,34 @@ The page range will be “selected pages” Please leave a contact method, such as a phone number or E-mail address (required). - - - + + + error Error - + Comments and suggestions cannot be empty. Opinions and suggestions cannot be blank - + The contact information column cannot be empty. The contact method field cannot be blank - + tip Prompt - + submit succeed. Submitted successfully. - + submit failed. Submission failed. @@ -932,22 +932,22 @@ The page range will be “selected pages” Image information - + ok OK - + File File - + Image Image - + None None @@ -980,17 +980,17 @@ The page range will be “selected pages” Apply to image - + ok OK - + cancel Cancel - + restore default Restore defaults @@ -1064,22 +1064,22 @@ The page range will be “selected pages” After processing - + Image crop Crop/ Deskew/ Remove black box - + ok OK - + cancel Cancel - + restore default Restore defaults @@ -1140,12 +1140,12 @@ The page range will be “selected pages” After the last page - + ok OK - + cancel Cancel @@ -1339,12 +1339,12 @@ This operation will NOT rotate the files that may contain multiple pages, such a This operation will not rotate files that may include multiple pages. - + ok OK - + cancel Cancel @@ -1394,12 +1394,12 @@ This operation will not rotate files that may include multiple pages.Page number: - + ok OK - + cancel Cancel @@ -1449,42 +1449,42 @@ The password length should be within characters. Cancel - + Type old password Enter old password - + Type new password Enter new password - + Retype new password Confirm new password - - + + Warning Warning - + Old password incorrect. Please try again. Old password error. Please try again. - + New password and confirm password are not matched. Please make sure the two passwords are the same. New password and confirm password do not match. - - - + + + Password only allowed to use numbers, English and special characters. Please make sure the two passwords are the same. @@ -1512,27 +1512,27 @@ Please make sure the two passwords are the same. OCR type: - + English English - + Simplified Chinese Simplified Chinese - + Traditional Chinese Traditional Chinese - + Japanese Japanese - + Korean Korean @@ -1666,24 +1666,24 @@ Please make sure the two passwords are the same. Check for updates - + The current version is the latest! The current version number is : Currently the latest version! The version number is: - - + + Discover the new version : New version discovered: - - + + ,the current version is : , the current version is: - + upgrade contents: Update content: @@ -1915,222 +1915,223 @@ Please make sure the two passwords are the same. Scan single page - + + act_acquireInto Scan to... - + act_fullscreen Fullscreen display - + act_fitWindowSize Fit view box size - + act_fitWindowWidth Fit view box width - + act_realSize Real size - + act_zoomIn Zoom in - + act_zoomOut Zoom out - + act_toolBar ToolBar - + act_statusBar Status bar - + act_thumbnailBar Thumbnail bar - + act_colorInfo Color information - + act_previous Previous - + act_next Next - + act_first First - + act_last Last - + act_openPageNum Jump to... - + act_previousPage Previous page - + act_nextPage Next page - + act_firstPage First page - + act_lastPage Last page - + act_adjust Brightness/ contrast/ gamma... - + act_90Left Rotate 90 degrees left - + act_90Right Rotate 90 degrees right - + act_180 Rotate 180 degrees - + act_multiRotate Rotate multiple pages... - + act_autoCrop Crop/ Deskew/ Remove black box... - + act_signIn Login... - + act_passwordChange Change password... - + act_signOut Logout - + act_log Log management... - + act_clrCache Cache settings... - + act_consume Consumable status... - + act_help Help - + act_about About... - + act_insertFromScanner Insert from scan... - + act_clearRoller Clear roller count - + act_imageEdit Image edit... - + act_sortPages Book sorting - + act_autoSave Auto save - + act_update Check for updates... - + act_feedback Opinions and feedback... - + act_device_log Export device log... - + act_driver_log Export drive log... - + act_deleteFile Delete selected item @@ -2155,113 +2156,113 @@ Please make sure the two passwords are the same. 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? @@ -2278,7 +2279,7 @@ Please make sure the two passwords are the same. No - + file lost, remove it? File lost; delete? @@ -2287,396 +2288,408 @@ 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 - - - - - - - - - - + + UniScan + UNI scanning software + + + + + + + + + + + + + + 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 - + Not supported Not supported - + 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? - + cache path folder limit:%1 Unable to access the current path:%1 Please try to log in to the administrator account in the [User] menu and go to the [Cache settings] to change the cache path. - + aquireinto folder limit:%1 Unable to access the current path:%1 Please try to change the cache path in [Scan to]. @@ -2690,76 +2703,76 @@ Please try to change the cache path in [Scan to]. <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! @@ -2769,106 +2782,106 @@ Please try to change the cache path in [Scan to]. 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/VersionDll.cpp b/app/scanner/VersionDll.cpp index ed492012..d379e978 100644 --- a/app/scanner/VersionDll.cpp +++ b/app/scanner/VersionDll.cpp @@ -61,6 +61,8 @@ HGResult VersionDll::Load() strcat(dllPath, "CTSVersion.dll"); #elif defined(OEM_ZHONGJING) strcat(dllPath, "ZJVersion.dll"); + #elif defined(OEM_ZIGUANG) + strcat(dllPath, "ZGVersion.dll"); #else strcat(dllPath, "HGVersion.dll"); #endif @@ -73,6 +75,8 @@ HGResult VersionDll::Load() strcpy(dllPath, "libCtsVersion.so"); #elif defined(OEM_ZHONGJING) strcpy(dllPath, "libZjVersion.so"); + #elif defined(OEM_ZIGUANG) + strcpy(dllPath, "libZgVersion.so"); #else strcpy(dllPath, "libHGVersion.so"); #endif diff --git a/app/scanner/dialog_aquireinto.cpp b/app/scanner/dialog_aquireinto.cpp index 95ef6067..7ec6699b 100644 --- a/app/scanner/dialog_aquireinto.cpp +++ b/app/scanner/dialog_aquireinto.cpp @@ -43,6 +43,8 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) : ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("CTSScan"))); #elif defined(OEM_ZHONGJING) ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("ZJScan"))); +#elif defined(OEM_ZIGUANG) + ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("ZGScan"))); #else ui->lineEdit_fileName->setText(getCfgValue("aquire", "namePrefix", QString("HGScan"))); #endif diff --git a/app/scanner/dialog_feedback.cpp b/app/scanner/dialog_feedback.cpp index bcf5cc31..c8a7d8e6 100644 --- a/app/scanner/dialog_feedback.cpp +++ b/app/scanner/dialog_feedback.cpp @@ -33,6 +33,8 @@ void Dialog_Feedback::on_pbtn_submit_clicked() oemName = HGVERSION_OEMNAME_CUMTENN; #elif defined(OEM_ZHONGJING) oemName = HGVERSION_OEMNAME_MICROTEK; +#elif defined(OEM_ZIGUANG) + oemName = HGVERSION_OEMNAME_UNISCAN; #else oemName = HGVERSION_OEMNAME_HUAGO; #endif diff --git a/app/scanner/dialog_upgrade.cpp b/app/scanner/dialog_upgrade.cpp index 16e695d2..2068f52a 100644 --- a/app/scanner/dialog_upgrade.cpp +++ b/app/scanner/dialog_upgrade.cpp @@ -27,6 +27,8 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers oemName = HGVERSION_OEMNAME_CUMTENN; #elif defined(OEM_ZHONGJING) oemName = HGVERSION_OEMNAME_MICROTEK; +#elif defined(OEM_ZIGUANG) + oemName = HGVERSION_OEMNAME_UNISCAN; #else oemName = HGVERSION_OEMNAME_HUAGO; #endif diff --git a/app/scanner/image_rsc/logo/uniscan.ico b/app/scanner/image_rsc/logo/uniscan.ico new file mode 100644 index 0000000000000000000000000000000000000000..0ef56baeea73e776951b3a22966391cf158d1194 GIT binary patch literal 16958 zcmds9YfP189Dlt`U2BubIoFl!GTK^eeqd`gWv&m^nlsy4E$3YI!OAvT=K7!qlADNx ziVEIln24faTue*^#9O1%5O1j{XB5F2s?A`vstPa6caJ2Fl%l*n!`}K@p&2&`FRJBn*kNRiH%BBv3$n><=aI zEd&$=Ivr<@*Dg-g&_5USaDQMh(FtEdP)=jPZ-eao57c+o7uJyn76;g7IiCZn2L%e3 zuAXbKJsULKB=1aRVDAOc0g$f0{gr+nddg-E_b^ z67@Va2ysjNt6a)f;f_PP_#9-^#!uB zY|Fnb;$p=GQL&`V6%P}iAv4#z4B(k_`5Ika>!+lPJC|-N`yS|o#q)P*=a&Z~*OBgr z0QZx1v1df2iF>#21sal;KDI5oetV^#Bm;nUFU{+{z0OCX#pTLNTE6;9-05_RPG_gD zPfG80&nvR`)lZ$q8f7B!1Gj~Ht+K!A?F~x)$wZxYwjZOyGBK2)t-`M^%!u!io)_w&uK z?}t|$RB=ySufFD2hd-MMp)tziC&p=6c(S&QF59lXHtsKJ>DU#OuY~{Z&1U6#@9o3Y zWB(}WXQIqE*K7IiZ3p*%4`!zA^pAH`XfQXCjX2bZt~^IjXFG`^;=@{T_d^ z!Bcd7WBR3GiGpQM<;t3#sqJ6cq7oI=t~4bJi?#K8F!M|n_w$Y98?QDh`Dijv=bTaX z`h7#Ck^h+c@LbwNQ~Vdo&MUcCnQ=thzjc$-m2@*vP3bvp{lM%5@oXN~{w{*FbyTkT zRmsQmCHnqx+^jkeyoIrdf&Vz0=RR8q*>nSWvHR;nCHxJw4JQ7H=K5wO{q3#oB5}O# zy0{~`YyB^JstNvWA7&}}$99rqW?dUsj;hZCSH6;}tlxb;(GlT=pL?Ev>-x7vaURGZ znaqPu7o1dzFB4@=|3Mi)aGnNr+Y7}r`vM&uA_r@ks#o48Ia<2u%WrGd+86q;E2=<8 zf0WF7$x$Y7*4Q;4P}Z|Qp;Q&VIGD0uS+C3oopn}@$EBPN=UIRdiQAjwz1Ddb?qAZb z3Yn}^Bs~@>^v8jH6zJH{i-7}cosMp8elIb28Tea*(>cU`X4>*SHQ<;~Tdvdmk7(cRK2*$pVeH_kgo3(X4vG(>1I~*Sb z(-?{C*!+{%0lQ$2eFMkJ4{*M~{Y#!#cJxbmR|zI;bI!y%XS|mPS=~MbW!-gdB~-=7 zfk@+t1J_Wr*O4^vbH9q`RL2bjCKDU*jcaLKPfQ101nK6jS9*s)n_Gi6Hw}6wgOuhk zCVuya4E+U71aXgr`%HzPY7pn)-uuoxgTZqsRVYXKz{@jPJeP*Ed0ppJ`@=^pVAYOx ztzvap))d~{v8=J=F_txgoL0f`*_EJ`{Aoy$L$aJ431i5IxsyYnlaH1aExAh^3S8n) zAUUk@8e8jP_xWhg^XPK-`w^1IxSxml6!<;>py0QVO6r~m)} literal 0 HcmV?d00001 diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index 96122d3b..aa4f7f34 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -112,6 +112,10 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) this->setWindowIcon(QIcon(":images/image_rsc/logo/Microtek_logo.ico")); this->setWindowTitle(tr("MicrotekScan")); m_oemName = HGVERSION_OEMNAME_MICROTEK; +#elif defined(OEM_ZIGUANG) + this->setWindowIcon(QIcon(":images/image_rsc/logo/uniscan.ico")); + this->setWindowTitle(tr("UniScan")); + m_oemName = HGVERSION_OEMNAME_UNISCAN; #else this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico")); this->setWindowTitle(tr("HuaGoScan")); @@ -354,6 +358,8 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) m_password = "cumtenn"; #elif defined(OEM_ZHONGJING) m_password = "microtek"; + #elif defined(OEM_ZIGUANG) + m_password = "uniscan"; #else m_password = "huagoscan"; #endif @@ -3168,6 +3174,8 @@ void MainWindow::on_act_help_triggered() QString filename = QApplication::applicationDirPath() + "/CumtennScan_App_Help_manual.pdf"; #elif defined(OEM_ZHONGJING) QString filename = QApplication::applicationDirPath() + "/MicrotekScan_App_Help_manual.pdf"; + #elif defined(OEM_ZIGUANG) + QString filename = QApplication::applicationDirPath() + "/UniScan_App_Help_manual.pdf"; #else QString filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3195,6 +3203,8 @@ void MainWindow::on_act_help_triggered() filename = "/opt/apps/com.cumtennchina.cumtennscan/entries/help/CumtennScan_App_Help_manual.pdf"; #elif defined(OEM_ZHONGJING) filename = "/opt/apps/com.microtekchina.microtekscan/entries/help/MicrotekScan_App_Help_manual.pdf"; +#elif defined(OEM_ZIGUANG) + filename = "/opt/apps/com.uniscanchina.uniscan/entries/help/UniScan_App_Help_manual.pdf"; #else filename = "/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3209,6 +3219,8 @@ void MainWindow::on_act_help_triggered() filename = "/opt/apps/scanner-driver-cumtenn/doc/CumtennScan_App_Help_manual.pdf"; #elif defined(OEM_ZHONGJING) filename = "/opt/apps/scanner-driver-microtek/doc/MicrotekScan_App_Help_manual.pdf"; +#elif defined(OEM_ZIGUANG) + filename = "/opt/apps/scanner-driver-uniscan/doc/UniScan_App_Help_manual.pdf"; #else filename = "/opt/apps/scanner-driver-huagao/doc/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3905,6 +3917,13 @@ void MainWindow::upgradeApp(QString pkgPath) // QFile::copy(curPath + "ZJBase.dll", tmpPath + "ZJBase.dll"); // QFile::remove(tmpPath + "ZJVersion.dll"); // QFile::copy(curPath + "ZJVersion.dll", tmpPath + "ZJVersion.dll"); +// #elif defined(OEM_ZIGUANG) +// QFile::remove(tmpPath + "ZGUpgradeApp.exe"); +// QFile::copy(curPath + "ZGUpgradeApp.exe", tmpPath + "ZGUpgradeApp.exe"); +// QFile::remove(tmpPath + "ZGBase.dll"); +// QFile::copy(curPath + "ZGBase.dll", tmpPath + "ZGBase.dll"); +// QFile::remove(tmpPath + "ZGVersion.dll"); +// QFile::copy(curPath + "ZGVersion.dll", tmpPath + "ZGVersion.dll"); // #else QFile::remove(tmpPath + "HGUpgradeApp.exe"); @@ -3965,6 +3984,13 @@ void MainWindow::upgradeApp(QString pkgPath) // //QFile::copy(curPath + "libZjBase.so", tmpPath + "libZjBase.so"); // //QFile::remove(tmpPath + "libZjVersion.so"); // //QFile::copy(curPath + "libZjVersion.so", tmpPath + "libZjVersion.so"); +// #elif defined(OEM_ZIGUANG) +// QFile::remove(tmpPath + "ZgUpgradeApp"); +// QFile::copy(curPath + "ZgUpgradeApp", tmpPath + "ZgUpgradeApp"); +// //QFile::remove(tmpPath + "libZgBase.so"); +// //QFile::copy(curPath + "libZgBase.so", tmpPath + "libZgBase.so"); +// //QFile::remove(tmpPath + "libZgVersion.so"); +// //QFile::copy(curPath + "libZgVersion.so", tmpPath + "libZgVersion.so"); // #else QFile::remove(tmpPath + "HGUpgradeApp"); QFile::copy(curPath + "HGUpgradeApp", tmpPath + "HGUpgradeApp"); @@ -3993,6 +4019,8 @@ void MainWindow::upgradeApp(QString pkgPath) // isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp.exe", argList); // #elif defined(OEM_ZHONGJING) // isSuccessdStart = proc.startDetached(tmpPath + "ZJUpgradeApp.exe", argList); +// #elif defined(OEM_ZIGUANG) +// isSuccessdStart = proc.startDetached(tmpPath + "ZGUpgradeApp.exe", argList); // #else isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp.exe", argList); // #endif @@ -4005,6 +4033,8 @@ void MainWindow::upgradeApp(QString pkgPath) // isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp", argList); // #elif defined(OEM_ZHONGJING) // isSuccessdStart = proc.startDetached(tmpPath + "ZjUpgradeApp", argList); +// #elif defined(OEM_ZIGUANG) +// isSuccessdStart = proc.startDetached(tmpPath + "ZgUpgradeApp", argList); // #else isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp", argList); // #endif diff --git a/app/upgrade/HGUpgrade.cpp b/app/upgrade/HGUpgrade.cpp index 19356c06..12d8ae04 100644 --- a/app/upgrade/HGUpgrade.cpp +++ b/app/upgrade/HGUpgrade.cpp @@ -24,6 +24,8 @@ bool AppIsRun(const std::string& appName) std::wstring regName = L"SOFTWARE\\CumtennScan"; #elif defined(OEM_ZHONGJING) std::wstring regName = L"SOFTWARE\\MicrotekScan"; + #elif defined(OEM_ZIGUANG) + std::wstring regName = L"SOFTWARE\\UniScan"; #else std::wstring regName = L"SOFTWARE\\HuaGoScan"; #endif @@ -109,6 +111,9 @@ bool AppIsRun(const std::string& appName) #elif defined(OEM_ZHONGJING) cmd = "ps -wef | grep MicrotekScan"; appPath = "/opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan"; +#elif defined(OEM_ZIGUANG) + cmd = "ps -wef | grep UniScan"; + appPath = "/opt/apps/com.uniscanchina.uniscan/files/bin/UniScan"; #else cmd = "ps -wef | grep HuaGoScan"; appPath = "/opt/apps/com.huagaochina.huagoscan/files/bin/HuaGoScan"; @@ -128,6 +133,9 @@ bool AppIsRun(const std::string& appName) #elif defined(OEM_ZHONGJING) cmd = "ps -wef | grep MicrotekScan"; appPath = "/opt/apps/scanner-driver-microtek/bin/MicrotekScan"; +#elif defined(OEM_ZIGUANG) + cmd = "ps -wef | grep UniScan"; + appPath = "/opt/apps/scanner-driver-uniscan/bin/UniScan"; #else cmd = "ps -wef | grep HuaGoScan"; appPath = "/opt/apps/scanner-driver-huagao/bin/HuaGoScan"; @@ -175,6 +183,8 @@ void RunApp(const std::string& appName) std::wstring regName = L"SOFTWARE\\CumtennScan"; #elif defined(OEM_ZHONGJING) std::wstring regName = L"SOFTWARE\\MicrotekScan"; + #elif defined(OEM_ZIGUANG) + std::wstring regName = L"SOFTWARE\\UniScan"; #else std::wstring regName = L"SOFTWARE\\HuaGoScan"; #endif @@ -222,6 +232,8 @@ void RunApp(const std::string& appName) appPath = "sh /opt/apps/com.cumtennchina.cumtennscan/files/bin/CumtennScan.sh &"; #elif defined(OEM_ZHONGJING) appPath = "sh /opt/apps/com.microtekchina.microtekscan/files/bin/MicrotekScan.sh &"; +#elif defined(OEM_ZIGUANG) + appPath = "sh /opt/apps/com.uniscanchina.uniscan/files/bin/UniScan.sh &"; #else appPath = "sh /opt/apps/com.huagaochina.huagoscan/files/bin/HuaGoScan.sh &"; #endif @@ -236,6 +248,8 @@ void RunApp(const std::string& appName) appPath = "sh /opt/apps/scanner-driver-cumtenn/bin/CumtennScan.sh &"; #elif defined(OEM_ZHONGJING) appPath = "sh /opt/apps/scanner-driver-microtek/bin/MicrotekScan.sh &"; +#elif defined(OEM_ZIGUANG) + appPath = "sh /opt/apps/scanner-driver-uniscan/bin/UniScan.sh &"; #else appPath = "sh /opt/apps/scanner-driver-huagao/bin/HuaGoScan.sh &"; #endif diff --git a/app/upgrade/main.cpp b/app/upgrade/main.cpp index ad53d916..e3d2f0ad 100644 --- a/app/upgrade/main.cpp +++ b/app/upgrade/main.cpp @@ -48,6 +48,8 @@ int main(int argc, char *argv[]) oemName = HGVERSION_OEMNAME_CUMTENN; #elif defined(OEM_ZHONGJING) oemName = HGVERSION_OEMNAME_MICROTEK; +#elif defined(OEM_ZIGUANG) + oemName = HGVERSION_OEMNAME_UNISCAN; #else oemName = HGVERSION_OEMNAME_HUAGO; #endif diff --git a/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro b/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro index f0113ffc..b244f3f0 100644 --- a/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro +++ b/build-qt/HGSolution/HGFWUpgrade/HGFWUpgrade.pro @@ -19,7 +19,7 @@ DEFINES += OEM_HUAGAO # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) { +if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) { contains(DEFINES, OEM_HANWANG) { RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico } @@ -32,6 +32,9 @@ if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contai contains(DEFINES, OEM_ZHONGJING) { RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico } + contains(DEFINES, OEM_ZIGUANG) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/uniscan.ico + } } else { RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico } @@ -40,7 +43,7 @@ win32 { DEFINES += _CRT_SECURE_NO_WARNINGS LIBS += -ladvapi32 -lpsapi - if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) { + if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) { contains(DEFINES, OEM_HANWANG) { LIBS += -lHWBase -lHWVersion TARGET = HWFWUpgradeApp @@ -81,6 +84,16 @@ win32 { LIBS += -L../../../../sdk/lib/win/x64/OEM/microtek -lsane } } + contains(DEFINES, OEM_ZIGUANG) { + LIBS += -lZGBase -lZGVersion + TARGET = ZGFWUpgradeApp + contains(QT_ARCH, i386) { + LIBS += -L../../../../sdk/lib/win/x86/OEM/uniscan -lsane + } + contains(QT_ARCH, x86_64){ + LIBS += -L../../../../sdk/lib/win/x64/OEM/uniscan -lsane + } + } } else { LIBS += -lHGBase -lHGVersion TARGET = HGFWUpgradeApp @@ -121,7 +134,7 @@ unix { message($$ARCH) QMAKE_LFLAGS += -Wl,-rpath=. - if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) { + if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) { contains(DEFINES, OEM_HANWANG){ LIBS += -lHwBase -lHwVersion -lsane-hwsane -lhwdriver TARGET = HwFWUpgradeApp @@ -138,6 +151,10 @@ unix { LIBS += -lZjBase -lZjVersion -lsane-zjsane -lzjdriver TARGET = ZjFWUpgradeApp } + contains(DEFINES, OEM_ZIGUANG){ + LIBS += -lZgBase -lZgVersion -lsane-zgsane -lzgdriver + TARGET = ZgFWUpgradeApp + } } else { LIBS += -lHGBase -lHGVersion -lsane-hgsane -lhgdriver TARGET = HGFWUpgradeApp diff --git a/build-qt/HGSolution/HGScanner/HGScanner.pro b/build-qt/HGSolution/HGScanner/HGScanner.pro index 2789ccab..9f6c7fae 100644 --- a/build-qt/HGSolution/HGScanner/HGScanner.pro +++ b/build-qt/HGSolution/HGScanner/HGScanner.pro @@ -19,7 +19,7 @@ DEFINES += OEM_HUAGAO # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) { +if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) { contains(DEFINES, OEM_HANWANG) { RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico TARGET = HanvonScan @@ -36,6 +36,10 @@ if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contai RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico TARGET = MicrotekScan } + contains(DEFINES, OEM_ZIGUANG) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/uniscan.ico + TARGET = UniScan + } } else { RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico TARGET = HuaGoScan @@ -45,7 +49,7 @@ win32 { DEFINES += _CRT_SECURE_NO_WARNINGS LIBS += -ladvapi32 - if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) { + if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) { contains(DEFINES, OEM_HANWANG) { LIBS += -lHWBase -lHWImgFmt -lHWImgProc contains(QT_ARCH, i386) { @@ -82,6 +86,15 @@ win32 { LIBS += -L../../../../sdk/lib/win/x64/OEM/microtek -lsane -llang } } + contains(DEFINES, OEM_ZIGUANG) { + LIBS += -lZGBase -lZGImgFmt -lZGImgProc + contains(QT_ARCH, i386) { + LIBS += -L../../../../sdk/lib/win/x86/OEM/uniscan -lsane -llang + } + contains(QT_ARCH, x86_64){ + LIBS += -L../../../../sdk/lib/win/x64/OEM/uniscan -lsane -llang + } + } } else { LIBS += -lHGBase -lHGImgFmt -lHGImgProc contains(QT_ARCH, i386) { @@ -121,7 +134,7 @@ unix { message($$ARCH) QMAKE_LFLAGS += -Wl,-rpath=. - if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) { + if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) { contains(DEFINES, OEM_HANWANG){ LIBS += -lHwBase -lHwImgFmt -lHwImgProc -lsane-hwsane -lhwdriver } @@ -134,6 +147,9 @@ unix { contains(DEFINES, OEM_ZHONGJING){ LIBS += -lZjBase -lZjImgFmt -lZjImgProc -lsane-zjsane -lzjdriver } + contains(DEFINES, OEM_ZIGUANG){ + LIBS += -lZgBase -lZgImgFmt -lZgImgProc -lsane-zgsane -lzgdriver + } } else { LIBS += -lHGBase -lHGImgFmt -lHGImgProc -lsane-hgsane -lhgdriver } diff --git a/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro b/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro index 2fd507c2..40020b4c 100644 --- a/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro +++ b/build-qt/HGSolution/HGUpgrade/HGUpgrade.pro @@ -19,7 +19,7 @@ DEFINES += OEM_HUAGAO # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) { +if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) { contains(DEFINES, OEM_HANWANG) { RC_ICONS = ../../../app/scanner/image_rsc/logo/Hanvon_logo1.ico } @@ -32,6 +32,9 @@ if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contai contains(DEFINES, OEM_ZHONGJING) { RC_ICONS = ../../../app/scanner/image_rsc/logo/Microtek_logo.ico } + contains(DEFINES, OEM_ZIGUANG) { + RC_ICONS = ../../../app/scanner/image_rsc/logo/uniscan.ico + } } else { RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico } @@ -59,7 +62,7 @@ win32 { } } - if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) { + if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) { contains(DEFINES, OEM_HANWANG) { LIBS += -lHWBase -lHWVersion TARGET = HWUpgradeApp @@ -76,6 +79,10 @@ win32 { LIBS += -lZJBase -lZJVersion TARGET = ZJUpgradeApp } + contains(DEFINES, OEM_ZIGUANG) { + LIBS += -lZGBase -lZGVersion + TARGET = ZGUpgradeApp + } } else { LIBS += -lHGBase -lHGVersion TARGET = HGUpgradeApp @@ -90,7 +97,7 @@ unix { message($$ARCH) QMAKE_LFLAGS += -Wl,-rpath=. - if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING)) { + if (contains(DEFINES, OEM_HANWANG) || contains(DEFINES, OEM_LISICHENG) || contains(DEFINES, OEM_CANGTIAN) || contains(DEFINES, OEM_ZHONGJING) || contains(DEFINES, OEM_ZIGUANG)) { contains(DEFINES, OEM_HANWANG){ LIBS += -lHwBase -lHwVersion TARGET = HwUpgradeApp @@ -107,6 +114,10 @@ unix { LIBS += -lZjBase -lZjVersion TARGET = ZjUpgradeApp } + contains(DEFINES, OEM_ZIGUANG){ + LIBS += -lZgBase -lZgVersion + TARGET = ZgUpgradeApp + } } else { LIBS += -lHGBase -lHGVersion TARGET = HGUpgradeApp