From f044073f2012f346c91ab0f8fc88d5c95d2ce9f0 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Mon, 9 Jan 2023 09:41:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=83=A7=E5=BD=95=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/HGProductionTool/ProductionTool_zh_CN.qm | Bin 12355 -> 12295 bytes app/HGProductionTool/ProductionTool_zh_CN.ts | 30 +++++++++++-------- app/HGProductionTool/form_burnmode.cpp | 6 ++-- app/HGProductionTool/mainwindow.cpp | 4 +-- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm index d07b265d3e2ad93b12ee0fb6d1e15760ee314450..4135d577e4e2c6aba0e4d7f3cbf10d8f65d282a2 100644 GIT binary patch delta 1098 zcmY+CX-rgS6o%hBckaD&w~m+rhHV&@0Y(f;%GPS?R$6-#YmN^mI@LVF0m`s3b{@5?#wci!im z!NNm@wzcPr&Az`nj{O)B`c2`f{_%|fHv{NLfxuUmVn|!7Eh{kt$oUX3bOCP$17Q_F z{uzL$WX~WV{k9bS-T?mC1(=_=_NFpvtq)V}F6eI_0V15>Htz>Qi@?3No)mt7P)Z8c z8xW2U0dXT*IPW4f@NzCLzE)cy{3)5LLBCqJ? zk0b!GZnntM4k$TnllMAcnP6`XliA=o_I7m%m8Y}6Z>4*2QokaR?t{|wDc=w_W}3iS31(RaKkH;=*d2AM5b0^E^>Dz8^tLtlMVMs z{EK6x6g|!-pWjW~EBO-l6M~b-m-IZP*vZ!#9#BV>{JD{1G@D2KWjD>p*2CXfOGfnZ z0+Vf`PGf|ZN-q(B?ZWyU1R`i!NPoN!h@2Bj>Ifq)3WrPRKJ=*2-8@K`b;8x;8epUU zx5DVa7Me<$@audVppF@IpHjZP!?5msDu`$?bgn6&DOHN)x4Q^Mg{bYX1wt;19bR`+~PCJ#y5vXjZ)0jc=-u5?p*|M87tMh7GtXP z?p;z5Go()}|Im4UDK38^eYR|Z>^mjj1v_nDvh<5pq}Re^zlj56*DGi3?xy@QIrk>L zqutQ^*;C{*V+tX3*YTRUGS9&<{IKZN(Z;#hfOE$0{c}jtX&l+n1q39yh`_U>vdz1Wk2Gsdv4P%? zEe+ykbMxQXuf0>z+|@jgCpcH-#^g`$9m!L(G7Y2!p1!C}?h2=?s@z&%>ZmDoR9Wd~ zEq2toiX2u~wYADo?Woc2$C$=wY7W~W%{D%oxX|301f~<3WPnff{}wwwx`zT0rqzRbtjN#1RgjJ zJl8?Rb3kAK&|F)=;Ad7)+5`OgJP;Ar)RoD2nkF)(Rhd1ROCN409!n-QK z@-1oy9RMHA>`i?Yu%Vb zk0~xB*HQhHVk~<*y-z5nu7yxN6bpxwfw&r_!`uppcI9imm+3x(^2!jUkr0`ryjtm^ z!hrIR?esyIVH48mLxhK2ccBCbsb;HYoq+8wx(L_x?x=O>dU_(o0jcO>>hQ$ReA_GdX&|_$*hgHp254S zC}4cf*SYB2G{B##AD{uO0 zACcJ>&5oQ53ZY*vV6Q zgQs30OH=a4tVMEZJH|x{;+*!>?@BUUpdGBfMaJ%Fhr1`K>xy=`k8X@H%8P7Rz%L4; zC+PlSF|j9x)EmT{Intr;5_c6pNU8mnkJl*KmU+-+$|t4`$I4#2V!m zl@t^`)C>e)4{|P1v?fU&Q^kc&1bt($6V=;6BL$s6Xu5|sPLh*Fn=JCHdb2ovxREPt zw1+)?PfcC_|G+|}v%*unC)-~p|7Hs7%{Mm**=G0ovTgR%`u=>ranjMXES9F^#^$Ej zPnK<~A6vHE?~UD5;j|v``mL3IdhmIz4sUt6)8VuF+)it`bHBC3S>N gy!dHluO~^X3}Ig^-`RSfMtQ(lDep_v%f1x(UvU9EQUCw| diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts index ad44820..a467eb9 100644 --- a/app/HGProductionTool/ProductionTool_zh_CN.ts +++ b/app/HGProductionTool/ProductionTool_zh_CN.ts @@ -614,34 +614,33 @@ 关闭设备 - + ID 序号 - + selected 选择 - + device 设备 - serialNum - 序列号 + 序列号 - - + + tips 提示 - - + + Please check a devices at least 请至少勾选一台设备 @@ -1003,13 +1002,13 @@ - Are you sure to connect the new device - 检测到设备连接，是否启动测试？ + Confirm whether the device is reset + Are you sure to connect the new device + 请先确认设备是否已经复位 - yes - 确定 + 确定 @@ -1027,6 +1026,11 @@ The device has disconnected 设备已断开连接 + + + confirm + 已复位 + Open device failed diff --git a/app/HGProductionTool/form_burnmode.cpp b/app/HGProductionTool/form_burnmode.cpp index c549540..98be149 100644 --- a/app/HGProductionTool/form_burnmode.cpp +++ b/app/HGProductionTool/form_burnmode.cpp @@ -39,8 +39,6 @@ void Form_BurnMode::addDevice(DeviceManager *devManager) ui->tableWidget->item(m_curIndex, 1)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); ui->tableWidget->setItem(m_curIndex, 2, new QTableWidgetItem(devManager->getDevName())); ui->tableWidget->item(m_curIndex, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - ui->tableWidget->setItem(m_curIndex, 3, new QTableWidgetItem(devManager->getSn())); - ui->tableWidget->item(m_curIndex, 3)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); QTableWidgetItem *item = ui->tableWidget->item(m_curIndex, 1); QVariant var = QVariant::fromValue((void*)devManager); @@ -87,14 +85,14 @@ void Form_BurnMode::on_testResult(bool setStatus) void Form_BurnMode::initTableWidget() { ui->tableWidget->resizeRowsToContents(); - ui->tableWidget->setColumnCount(4); + ui->tableWidget->setColumnCount(3); ui->tableWidget->horizontalHeader()->setDefaultSectionSize(200); // ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); ui->tableWidget->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents); ui->tableWidget->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents); QStringList header; - header<< tr("ID") << tr("selected") << tr("device") << tr("serialNum"); + header<< tr("ID") << tr("selected") << tr("device"); ui->tableWidget->setHorizontalHeaderLabels(header); QFont font = ui->tableWidget->horizontalHeader()->font(); diff --git a/app/HGProductionTool/mainwindow.cpp b/app/HGProductionTool/mainwindow.cpp index 7915e95..b9f88ea 100644 --- a/app/HGProductionTool/mainwindow.cpp +++ b/app/HGProductionTool/mainwindow.cpp @@ -417,9 +417,9 @@ void MainWindow::on_sane_dev_arrive(QString devName) else { QMessageBox msg(QMessageBox::Question, tr("tips"), - tr("Are you sure to connect the new device"), + tr("Confirm whether the device is reset"), QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); + msg.setButtonText(QMessageBox::Yes, tr("confirm")); msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if (msg.clickedButton() == msg.button(QMessageBox::Yes))