From 894a47c94a31c87a1b025a17e320d926293abaa9 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Thu, 3 Aug 2023 10:13:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86app=E5=85=B3=E4=BA=8E=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BB=8E=E9=A9=B1=E5=8A=A8=E5=B1=82=E5=88=86=E7=A6=BB?= =?UTF-8?q?=E5=88=B0=E4=B8=8A=E5=B1=82=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner2/Scanner_zh_EN.qm | Bin 49221 -> 49237 bytes app/scanner2/Scanner_zh_EN.ts | 10 ++-- app/scanner2/mainwindow.cpp | 79 ++++++++++++++++++---------- build2/qt/HGScanner2/HGScanner2.pro | 4 +- 4 files changed, 59 insertions(+), 34 deletions(-) diff --git a/app/scanner2/Scanner_zh_EN.qm b/app/scanner2/Scanner_zh_EN.qm index dc42040070370ec5330de276dd1c75c74592af03..f66bc22bcb2a406719ade82f344b3297e68e6fd5 100644 GIT binary patch delta 2212 zcmXw42~<;O7XDt6_d;Is5^%$4@yTWsD=6RsZlEBA3Kfx}Vib{0MUlN00jtunY{mW{ zqSU$&swlW1w50__MP-hy6-2Fin7WPQSg^Hv#vTAY)U^S$N2_kQ=g%WK=H?AoX- zsp8_cSt7Vm+g_Tue=uimGIx}jIhk{0*__GV2db+@z~Ni{ShoPGe|-Y1&m??GSjXBp z**F&b`~HCEtA1Rr?Z=#h>?L`UnVrJcz5?p;bjJNC)bU+FT@Ta+Re*;B)O&g0$Osm$ zh_DHT`s@*U`WdW-nCWRGYgUYKU@DB=(FWAa!P_VA0Iua2fAL2k@HpH%2y36PmkL|X zpAA+9*j&WiifACC7r|R662(BaMrqk$Ah2WeC8O71D+)g~^I zjZ-h<-eN^+IdrJ%w%syHqf>Ra#TD?mse1JCDe&QZRc~lGU^u0EGS>o>b?^f{3W4HB z{J>lOB7{d zL+HoDLBfhY6R^#WP1MMmRl>Hq6I9a%X4V84U4)9SDNe-y(6$=A#2vi zq0fY-6TeesUkIlLQ`{ ztr5W77sBI}e*o`XRS%jQo*~=YUx7Csrn}- zX(N0WX%gmP?-Wg8S|_kLM6;{1 ziZsY%7Ol*su{Nz+uD$4Y;b$PELyY(>hT<2COWq?M2Iqc^oFba-d}+EfMDtn|@R^Tj z?zjsCH;Y+2Hc_38h;Q=6GDL1bHqyX>xNN^mi9ENO`~Y(^`VVY zBUZa!q3lP9)j_1rfbHYO>L_Y}?UiEn?glE%7?!7V^Qspwt)n?Xr1+x)VL*h~d0r1B zmWo|l+W}3y*d0WLDSR$I)D!)p$71hvf0~9RtVd^SKVCa~-yJIFA#G>?l}G$VyGZ+* zOtCi3>IsegM&>M;Y!bCwpA^#?(`pMXl-idW%q#_H{;U0cIPv-NdsZvSUYm8p4~!#r zmvv)z(jqAwu5BgNi1A%;yz~CdQ!K)X&}_+VYYwp;Bl)eO#kQkN3OpM_4ILo`^E@!cPYO*S z21VXde6lNj1^$o{))0TYN&Uzi4My%En{F^IFOZJ;QHvcel1@29Qo-&^ZTX~~JWjgN z^B>@#uk>pUXAou0Ia2k0B4>M73z{kgnB6m6Zpvz2(31?#VUr>E9EuYc%6Z1xz~ zIBQ!Q2SdmW^5Gn9nCIs~OJphwx0dbK8%~@r1s2XRG(`|bJTRO;MmcV1HFO3OqoiC` zW^EE~ucYs1Vf|@q^Qy7)Fb(T410h(B46H;vVH#l))?y@G$IveYu}DQKo0b);ae8y! zmo;TAaCCojH~X*iX>@)CS&t;!bgV%%*`=`DY$KbuVFHu0hVtQj-A=i=P~Pz kbuihzwupOUpZ-_G6u7~UJY>*6k^Hawzqk6H?1i)b2OJ=wL;wH) delta 2210 zcmZ`)X;c(v7QNNoRoz|P)eUOIjzbDirVWHe#RVp)D5M1uC5Wil%8n!`GJr((s7z46 zfFHPkE7C+!K?KnlF>XXT$I&Q3=Sae2T*ep;8Z~D!iQv3BY0reCP$%~QP2WLXS`SQgfqEYg zG#gl?BFa7h>Wj_vb_+Bkt@L&d>rlMqvgHNbw|4@Klkv`%cL2|A@V@dj5PS?1ZV(>1 z!v+)%+$8pf(qexap*!M$HGP;{GKnbqvXx3R*UYMwe|FpZ8&dzjXkIde`-cb!1NB-7PnHmPne_1A%NjbX#w!J0X+Cs z1%w~ulzqE_tjpY+1?Pe6c24%$4ET-WCT^uDpN{3GD@nU-e{R;5HlQ||WvOItB&$|= zaW$-y?yJ~+mF!#14Mqe5MOzfYRN`j;xx()Iu|UB^#qfp`z~pv?>GDgUPEa`d?f`V2 zig8co0juUSe_rOAn3b0UmMF4a4*(xkDYE-X-H)y+DvqxQLTrj7>nQhudc}zcnLwdM zan?T#*swrxA)KB|mnm*tKL*si&pLRE)=!yI5CP;KVv-=6b}75w@d3(aDSOky0N*c_ zy&1`*j>v)pFVl~zkULGl`YP3&Ac~YUTeY-@Sbuz#l?zG34h^Vkzt94jBGsOHS1Rrv zv-ndXQ4Kr`aC~; zVi~ZxmmmIZ5XriRHwFAk7PjzXCZ7Qk=kQ~nk{lUvY(Om+p5!erw^8TB@>chUfL_DL zL>vTE$N0G4NSJl`eCoYU;xmR{(|i@M2JveXi2k}$e0~y{TAss~a>c;@CwxOFeV6!% zKU&3r*aH6eHY2@n;g5IRCk*4;N4x>lXYuW)6ofr|`)M_qZ{zv)ABk4IjlZU&fG!*O zTfxf!H#h#?O-h)P!4GQIk}wkl<-bYYs(3*kN8M5p&w4a6H;VnDk)4&olDym0wRS>u z8O3OPI)sP)g!n--P${uVT3Ne9sBCH@Pi@SqwV2)%cATU3S&fXvyYPyBA$)JAHZ|dAVAFTn)LasK*m7;!+r%z2QJY>!&-=z{%QCxxC1Kjy zo%N(aGPCJqE`fFGybA5bz{}qQVK>C6pA#s5fw*)Y@i4j$Vf0kd>KFigk|bJJsemos zqV>jIU~Y$)yL}z`)F!S!R}E~PCstPdLeqFgtXdHUd^lU&X{Cm#doJ3#GRd0;(bhkM zPLvw4!Sfrc-XJ!FkUGP*I*AQ2)Bsz{#D?9+$ruwW)_eJWAzoWebAo8`YZpRGl-PaA z0HoH7JtbX$Hd*WoA!EvZ5FZ+de)&Jee*YkvhEVpC-oe>PH>>Ur*;%U#w~#&JW8GpM zk=b9MOVT`}v0u$xCA0lfUCFb}bg2KXE3;8)pCvJ?WYIp-Js(YcKI>pdB-uAZKl*?N zu{)=Cuc3paOsDtU)kjlh)K65COrG}$sq6_e_0yxMtkPD!Wm5)_=goM7Z11iQ_o7w% z@k6+`g-tTZ+;SFaFmr2IzQJ5*C+RC(0B)l+Dq%X1>?)165YuhnN=`?!0J|*7dFe$m z-cuTvPzaP%NN$gsfb`{(=i(S@(3O%`Ndd7nNr4~G!M43v3ci>?4Q-L;@;op#Pzql` z49eZ4*Hh^Knb&&W&iaAlOuUQLn1)$M!%Dh~#VV|Y6D*jI2o{o?X!3c@j#zdwcfs3J zU$dHtM5NNS8Y?LBDkL(myb#xr*X+)wopH!O3g|n^>d0F22JKz`*u9WeS0Mpu%p-4f K>p=dZng0W6dzxne diff --git a/app/scanner2/Scanner_zh_EN.ts b/app/scanner2/Scanner_zh_EN.ts index 8d63f07f..c91fe974 100644 --- a/app/scanner2/Scanner_zh_EN.ts +++ b/app/scanner2/Scanner_zh_EN.ts @@ -2738,7 +2738,7 @@ Please contact the equipment supplier promptly to purchase a replacement paper r <p>Vendor: %1</p> - <p>Vendor: %1</p> + <p>Manufacturer/Developer: %1</p> @@ -2750,24 +2750,24 @@ Please contact the equipment supplier promptly to purchase a replacement paper r <p>Company website: <a href=%1>%1</p> - <p>Company website: <a href=%1>%1</p> + <p>Company URL: <a href=%1>%1</p> <p>Company address: %1</p> - <p>Company address: %1</p> + <p>Address: %1</p> <p>Company telephone: %1</p> - <p>Company telephone: %1</p> + <p>Contact number: %1</p> <p>Company GPS: <a href=%1>%2</p> - <p>Company GPS: <a href=%1>%2</p> + <p>Navigation address: <a href=%1>%2</p> diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index a775b37a..1fe074a7 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -45,9 +45,9 @@ #include "HGUIGlobal.h" #include "HGString.h" #include "app_cfg.h" +#include "app_about_info/appAboutInfo.h" #include #include "dialog_wrong_img.h" -#include "../../code_device/hgdriver/hgdev/char_const.h" #include "lang/app_language.h" #define PASSWORD_KEY 4 @@ -2900,39 +2900,65 @@ void MainWindow::on_act_help_triggered() void MainWindow::on_act_about_triggered() { - if (m_devUser == nullptr) - { - QMessageBox::information(this, tr("Prompt"), tr("Please go to 'Menu Bar ->Scan' to select a device")); - return; - } + const char* oem = HGVERSION_OEMNAME_HUAGO; -#if defined(HG_CMP_MSC) - HGTwainDeviceCustomInfo info = {0}; - m_devUser->GetDeviceCustomInfo(&info); -#else - HGSaneDeviceCustomInfo info = {0}; - m_devUser->GetDeviceCustomInfo(&info); +#if defined(OEM_HANWANG) + oem = HGVERSION_OEMNAME_HANVON; +#elif defined(OEM_LISICHENG) + oem = HGVERSION_OEMNAME_LANXUM; +#elif defined(OEM_CANGTIAN) + oem = HGVERSION_OEMNAME_CUMTENN; +#elif defined(OEM_ZHONGJING) + oem = HGVERSION_OEMNAME_MICROTEK; +#elif defined(OEM_ZIGUANG) + oem = HGVERSION_OEMNAME_UNIS; +#elif defined(OEM_NEUTRAL) + oem = HGVERSION_OEMNAME_NEUTRAL; +#elif defined(OEM_DELI) + oem = HGVERSION_OEMNAME_DELI; #endif + HGChar version[32] = { 0 }; + HGVersion_GetCurrVersion(HGVERSION_APPNAME_SCANNER, oem, version, 32); + QString title = tr("about %1").arg(windowTitle()); QString content; - content += tr("

DriverVer: %1

").arg(QString(info.driverVer)); - content += tr("

Vendor: %1

").arg(QString::fromLocal8Bit(info.vendor)); + content += tr("

DriverVer: %1

").arg(QString::fromLocal8Bit(version)); -#if defined(OEM_ZHONGJING) - content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(info.comAddr)); - content += tr("

Company telephone: %1

").arg(QString(info.comTel)); - content += tr("

Company website: %1

").arg(QString(info.comUrl)); - content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(info.copyright)); +#if defined(OEM_NEUTRAL) + QMessageBox::about(this, title, content); #else - content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(info.copyright)); - content += tr("

Company website: %1

").arg(QString(info.comUrl)); - content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(info.comAddr)); - content += tr("

Company telephone: %1

").arg(QString(info.comTel)); - content += tr("

Company GPS: %2

").arg(QString(info.comGps)).arg(tr("Baidu map access")); -#endif + + #if defined(OEM_ZHONGJING) + QString appLang = getCfgValue("global", "language", QString("chinese")); + if (appLang == "chinese") + { + content += tr("

Vendor: %1

").arg(QString::fromLocal8Bit(COMPANY_NAME)); + content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS)); + content += tr("

Company telephone: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL)); + content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); + content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT)); + } + else if(appLang == "english") + { + content += tr("

Vendor: %1

").arg(QString::fromLocal8Bit(COMPANY_NAME_EN)); + content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS_EN)); + content += tr("

Company telephone: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL)); + content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); + content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT_EN)); + } + #else + content += tr("

Vendor: %1

").arg(QString::fromLocal8Bit(COMPANY_NAME)); + content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT)); + content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); + content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS)); + content += tr("

Company telephone: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL)); + content += tr("

Company GPS: %2

").arg(QString::fromLocal8Bit(BRAND_URL_GPS)).arg(tr("Baidu map access")); + #endif QMessageBox::about(this, title, content); + +#endif } void MainWindow::on_act_scannerSettings_triggered() @@ -2957,6 +2983,7 @@ void MainWindow::on_act_scannerSettings_triggered() deviceIsOnline = false; else if (HGSANE_ERR_FAIL == ret) openSucceed = false; +#endif if (!deviceIsOnline) { @@ -2968,8 +2995,6 @@ void MainWindow::on_act_scannerSettings_triggered() QMessageBox::information(this, tr("Prompt"), tr("Open failed")); deleteDevUser(); } -#endif - } void MainWindow::on_act_acquire_triggered() diff --git a/build2/qt/HGScanner2/HGScanner2.pro b/build2/qt/HGScanner2/HGScanner2.pro index eaccaf30..98d3a585 100644 --- a/build2/qt/HGScanner2/HGScanner2.pro +++ b/build2/qt/HGScanner2/HGScanner2.pro @@ -85,7 +85,7 @@ win32 { LIBS += -lgdi32 -lgdiplus -ldbghelp -luser32 -ladvapi32 LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX}Base -l$${OEM_PREFIX}ImgFmt -l$${OEM_PREFIX}ImgProc\ - -l$${OEM_PREFIX}TwainUser + -l$${OEM_PREFIX}TwainUser -l$${OEM_PREFIX}Version LIBS += -L$$PWD/../../../../sdk/lib/win/$${MY_ARCH}/OEM/$${OEM_NAME} -llang # sane.dll @@ -130,7 +130,7 @@ unix { LIBS += -lpthread -ldl LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX2}Base -l$${OEM_PREFIX2}ImgFmt -l$${OEM_PREFIX2}ImgProc\ - -l$${OEM_PREFIX2}SaneUI -l$${OEM_PREFIX2}SaneUser + -l$${OEM_PREFIX2}SaneUI -l$${OEM_PREFIX2}SaneUser -l$${OEM_PREFIX2}Version LIBS += -L$$PWD/../../../../release/$${MY_OS}/$${MY_ARCH2} -llang }