From 147b45e94ff864bad4e259e34745d924c1afa7e9 Mon Sep 17 00:00:00 2001 From: jxder <1907979632@qq.com> Date: Fri, 10 Oct 2025 21:40:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=AE=A1=E7=90=86=E5=99=A8?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=20=E8=87=AA=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=B0=83=E7=94=A8=E7=AA=97=E5=8F=A3=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- product/src/sys/sys_startup/AutoStart.cpp | 20 +++- product/src/sys/sys_startup/AutoStart.h | 1 + product/src/sys/sys_startup/AutoStart.ui | 106 +++++++++++++++++---- product/src/sys/sys_startup/ButtonForm.cpp | 61 +++++++++++- resource/en/sys_startup/translate/en.qm | Bin 19968 -> 20153 bytes resource/en/sys_startup/translate/en.ts | 19 +++- 6 files changed, 181 insertions(+), 26 deletions(-) diff --git a/product/src/sys/sys_startup/AutoStart.cpp b/product/src/sys/sys_startup/AutoStart.cpp index f9535540..55031749 100644 --- a/product/src/sys/sys_startup/AutoStart.cpp +++ b/product/src/sys/sys_startup/AutoStart.cpp @@ -1,6 +1,6 @@ #include "AutoStart.h" #include "ui_AutoStart.h" - +#include "pub_utility_api/I18N.h" AutoStart::AutoStart(bool hmiAuto, bool sysAuto, QWidget *parent) : QDialog(parent), ui(new Ui::AutoStart) @@ -18,7 +18,19 @@ AutoStart::AutoStart(bool hmiAuto, bool sysAuto, QWidget *parent) : { ui->hmiCheckBox->setEnabled(false); } - setWindowTitle(tr("自启动设置")); + QButtonGroup *buttonGroup = new QButtonGroup(this); + buttonGroup->setExclusive(true); // 设置为互斥模式 + + // 将复选框添加到按钮组 + buttonGroup->addButton(ui->checkBox); + buttonGroup->addButton(ui->checkBox_2); + const std::string strLanguage = std::move( iot_public::getCurLanguage()); + if(strLanguage =="zh") + { + ui->checkBox->setChecked(true); + }else + ui->checkBox_2->setChecked(true); + setWindowTitle(tr("系统设置")); } AutoStart::~AutoStart() @@ -41,6 +53,10 @@ bool AutoStart::isSysAutoStart() return ui->sysCheckBox->isChecked(); } +bool AutoStart::isZh() +{ + return ui->checkBox->isChecked(); +} void AutoStart::showEvent(QShowEvent *) { ui->sysCheckBox->setChecked(m_sysAuto); diff --git a/product/src/sys/sys_startup/AutoStart.h b/product/src/sys/sys_startup/AutoStart.h index 4ac77706..a32ca6e1 100644 --- a/product/src/sys/sys_startup/AutoStart.h +++ b/product/src/sys/sys_startup/AutoStart.h @@ -17,6 +17,7 @@ public: void init(); bool isHmiAutoStart(); bool isSysAutoStart(); + bool isZh(); protected: void showEvent(QShowEvent *) override; diff --git a/product/src/sys/sys_startup/AutoStart.ui b/product/src/sys/sys_startup/AutoStart.ui index c7c5d94d..f8617003 100644 --- a/product/src/sys/sys_startup/AutoStart.ui +++ b/product/src/sys/sys_startup/AutoStart.ui @@ -7,26 +7,26 @@ 0 0 234 - 166 + 217 234 - 166 + 217 234 - 166 + 217 Dialog - + :/auto_start.ico:/auto_start.ico @@ -54,28 +54,94 @@ - - - - Qt::LeftToRight - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - true - - + + + + + + + 系统语言 + + + + + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + 中文 + + + + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + 英文 + + + + + + + Qt::Horizontal + + + + 70 + 20 + + + + + + + + + Qt::LeftToRight + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + true + + + - + + + buttonBox diff --git a/product/src/sys/sys_startup/ButtonForm.cpp b/product/src/sys/sys_startup/ButtonForm.cpp index 9915505d..152af152 100644 --- a/product/src/sys/sys_startup/ButtonForm.cpp +++ b/product/src/sys/sys_startup/ButtonForm.cpp @@ -19,7 +19,8 @@ #include #include "pub_utility_api/FileUtil.h" #include "../include/sys/sys_login_api/CLoginDlg.h" - +#include +#include using namespace sys_startup; ButtonForm::ButtonForm(int mode,bool isZh, QWidget *parent): @@ -28,6 +29,7 @@ ButtonForm::ButtonForm(int mode,bool isZh, QWidget *parent): m_mode(mode), m_bIsZh(isZh) { + ui->setupUi(this); } @@ -74,7 +76,7 @@ void ButtonForm::addToolButtons(QVector &buttonVec) //toolBtn->setIcon(icon); toolBtn->setText(m_bIsZh?buttonInfo.m_zh:buttonInfo.m_en); #ifdef Q_PROCESSOR_ARM_64 - toolBtn->setEnabled(buttonInfo.m_enable); + toolBtn->setEnabled(buttonInfo.m_enable); #endif connect(toolBtn,&QToolButton::clicked,[=](){ executeTask(buttonInfo.m_cmd,buttonInfo.m_param); @@ -228,6 +230,61 @@ void ButtonForm::autoStartDlg() { setHmiAuto(!isHmi,text); } + QString language ="en"; + if(dlg->isZh()) + { + language ="zh"; + } + const std::string strCurDir = iot_public::CFileUtil::getCurModuleDir(); + + std::string objFullPath = strCurDir; + objFullPath = objFullPath+"/../../" + "platform" + "/common/sysconfig/language.xml"; + + qDebug()<qk-=H!3^jW0&Y$w#85X30zr$Sa{C5eS3G89M84a+>ZxpS!<%&hMPx_nhqUA?Iz%}Se~>$gH*CG@;@_Lk21!m$djwm0PWlI&7)g^nV#}%k`ajS zkq?~nCuNsQ@;_aCXyKrIyo)vpH*s!0=>X4hZkw!Bii=#>fDBl0i;LaX00e)|Ns6y2 z!62@9iG!!P`YIc(_iWzHu0v7z8`+0? zDo*Wq6X2xF?8PfZF(#Fg5>K4o_=y}sEKbsUmw~uZr$_Bu0JmaB_iClEGM1FNt`zp( zp}xpfx^+;3hM7vQd{@AuRv9+52yhuvhP%=UU5k_%{jZVajmj0xPQZ*Y<)L!2kMURD z)O`R*PT{<|?kWWsW%O|8llI$z2wy&Pq=2N3=CgAufPg`MeLZD9H;!-pYZovzmG4nd z0=_r+o~$|4VPh&&qYITVQx#G|2Z*gvCBzj1uS}{AxMu*yX4T1O0VMea)!B6$s3Z?m zkM0&jg0WCF5L`(aN2;Et`2nVG)pITNmYZG8@2A8T`ltodN$Ps7+7zpzS~sY7{@MlD zR;u?jQHfOd)uV@LB4!P$CrW1%_i8-uQmuVUG^TYkscFw@OobFMd5*@W`yGfrqKRm} z3?!H}8KzVT&^T*qHWUN%0yIaD)5g;(G>r~AFVLJXh#*#Lepp13dTrHoW}1MgX9BmB zn$PPS!8x5qb5^`y%*vx$4hy~x1yZ7f*f!eNFHcBHp_8lT2o*i+XrDHr=6gH&FB6X0 zhXM5l;k#IAE{*zx@Sw;BgvAP@(PS|Dj5cz{I5l6M_I9y>nn|f`JD3ebsV+!hU{00b6e;t=2kHV2a4gTRU~nhn9x*6>y?b6fiXCTF)>JdOKhNK^cxc^3+M!K zv&7>|v*|=-;)RJWnucTIP{b~(W%pVdfts=ot#{dHyjYfE^K42}KI6RfNI)Leq5!!l zLM{yk`{Pjdo~wIYv9rmh$&!b7U@1PN&zs3;J-i);^uGCp+nSdy+P&tAKsiB_#^UFsz1zLkG#5Mm3_OIuuy8aW}9iEg{(hJLcicy5Tmob$6yBjDihfPzr H*3BGPJUs^S)_Qozez;utVF=tiNwxWIyRHjo`V%c|;*$dso`T@W%U3ceb2p#Z;Zm@4TFzJ|n)UG06 zRDxcee*=(%^!BJLfO=f--jhx$MR1DKI2{H~SB*ZoGL6=s({FnAB`{`-{-PED%$cL_ zYn)8VHfj2Qd?x^|A^o6-4vNh;#P;ccS$2c-n|dI!&!8EP1HL7Of<;6>W~i-<0;VJz zJoPjmTyN;U=mG-jjE4Ikl50DSv4u8(tu)5n^pH}sj1_;;`e|E?bz7GJhE~pTHO3cO zDOsky=e772ZHV6CrEO>hW@mVHc65Db#ZPM~@~CR@^2=h1^rYBjqyR!DiCtNfsG{0T>SJh!RMAV@jI65qM{rY5(YSQY6rH;&~V;G0JpieJ)^`Zt83=po`m0eN!p`p97{R zX%nGAb(vmSsFwT>o5ej8SxSLfR!;zPH<(qYiM*{h7e4TiH@%=D^=%GAXB$V zKh$_M^7OfMx`r-bRnpm#Vhi$-y%)})3y;VFS)Y)X z19Hf)0?C!K^A4R8dP#PtQ08Kxysv9LSrj8z|Lg*0oRN>Y1}N}r@=wlas*z0j_UBPR z%pv(%f<_BM{VX#A2LU0*a<#xl(yg)FIk*CdUu)^b} z_bA<37CjuepmYzDUF8fPtNfWY{E)oh3{O}3?#-heAG((b3kt~6d``y_rirEHbnp=SpFX!ZBd#-ZqDl(1 zG0VU2Qn4&#wr)~J5}2PYj@Gwv+A29Cf;s2LumF|j{j)jM5u9!v3wTV$7`B^@KVL`I zP2r4OqOr-!8uG%y!ahDpk-g${c$i~rHEn2S(Jl1U8dh;eZf9`|Dyf}bvZRKMG+x1} z HMI 开机自启动 HMI auto start + + + + 系统语言 + System language + + + + 中文 + Chinese + + + + 英文 + English @@ -148,8 +163,8 @@ - 自启动设置 - Auto start setting + 系统设置 + System setting