From 2a91ce6a11190a5b5b0f346cc6c41814018f30ac Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Tue, 18 Jun 2024 15:49:27 +0800
Subject: [PATCH] =?UTF-8?q?scantool=E6=8C=89=E9=94=AE=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AC=AC=E4=BA=94=E4=B8=AA=E6=8C=89=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scantool/Scantool_zh_CN.qm | Bin 6973 -> 6942 bytes
 app/scantool/Scantool_zh_CN.ts |  51 ++++++++++++++++++---------------
 app/scantool/mainwindow.cpp    |   6 ++--
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/app/scantool/Scantool_zh_CN.qm b/app/scantool/Scantool_zh_CN.qm
index 1a2c33b96cbf850d642afa603d490f7b486fa130..bd6e62377c4c8dc32585f78a5c4bba0ddaf6905a 100644
GIT binary patch
delta 482
zcmdmMHqUHAiKQ3=L&YTq29dc84DSyxFo*)_k7pSe#PS#zK05*Vhk$fGkbcg<(zAqt
zfw`4|<va@mgOI_*wc?tY46O6h85o2QFtBbYW?*3a0HKASGqAnr1R9#hz;Wg)kbX7s
ztvsh1<KzBY3=HCdlSLWL87EKnWh@sAXLVhF6R6P~LJKuazRD<X$j`cA%47xx))v<L
zYmWf6pJe^VQOUr-`G(ExQ3L}6uMb<9Mlu5fcR1SwkC{Mu*U7p}@{AUfeVN21CvdRs
zjR(3jf+H&@gMmTtJ;#)iOrZPICf72FbMkQ7_e=$fHcy_*6lNqS&%Ni=N(Kh5Lhgev
z6M+^U=03Ih9?)}7co<5`fSRm%vbG*)U|^``Y2^t4im#lk%B)zwJ7p;YgTM!#PtTtM
zjoQll`T7C|2Bx`uM)QD1i}3M*^$7a&m6<+fU|^rc_h)`TFhI@uZL1yt)!pRJ$OYQL
z;mn^O2K1EJ5&nW>Ao?r+gY2I`@dlu4#cP;>wz8ydh?vI#WH7J+F|%Vz3OkVI+Ps(f
kzJRC#gDG5!!>P2SBtK8Vbh4wk=;rAn0*sr#ih8gD07H9%&j0`b

delta 510
zcmbPdw%2SziKQt6L&YTq29Z4s4DSyxFo*)_k7pSe#CjPRK05*V4}o+(kk7`z(zAqt
zfw`4|<va@mgOLBkwc?r`46O6h85o4`Gq7$bW?*3a0HH<L7}#EP0uAkD;5hRYXb9)T
zxAL5>jF0<oF))Z1OcrG{XWTT|m$6*1jMa7hO`t||2rV>!@>NE8MLpIHQzkPou(q(?
zUwZ^-%nR0k9F+_VoNw6lzA*yrW}M8+B+i&JS(QmXFr2+>5zs200QQ#&SAg!@#=*vW
z2I!>q9Bg~zf&2)Ltegx62EhXyQ%W*{PHE-XVek@YwhzayzcU#aIM#D=)LR1mr_E{K
zGZm;VWb#y|Fe8Bv+<Q)~WMJSb<UaT^5vcqy_o>zQfW|WOFqD)5jfvvP+IpOUfuWkG
zl_vz~q!W{6nH6I`J%0)`qK)_S^#u$JOmq2+<^hcq(d7fH6;$9WGkwg!z&?xb&-{L%
zm0|q0RS$sbZt`d30?p=d=FblUdQ<E%f59;zEiS_UAp0j!yaDKL@!6XfG5-?Sd|HH?
z(MrURH&s8GF)28np?hB>JA(p)DuW>h&@~KfKrHQ&uaK8tqEK8~P>^3#lA5AWlCO|o
Tkea8UYB+hJnCRx~qVB8!zm1Ma

diff --git a/app/scantool/Scantool_zh_CN.ts b/app/scantool/Scantool_zh_CN.ts
index 44ea71b7..2993f62e 100644
--- a/app/scantool/Scantool_zh_CN.ts
+++ b/app/scantool/Scantool_zh_CN.ts
@@ -74,32 +74,32 @@
         <translation>扫描</translation>
     </message>
     <message>
-        <location filename="dialog_scaninfo.ui" line="50"/>
+        <location filename="dialog_scaninfo.ui" line="56"/>
         <source>Scan info</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="dialog_scaninfo.ui" line="87"/>
+        <location filename="dialog_scaninfo.ui" line="93"/>
         <source>Scan count：0</source>
         <translation>扫描数量: 0</translation>
     </message>
     <message>
-        <location filename="dialog_scaninfo.ui" line="124"/>
+        <location filename="dialog_scaninfo.ui" line="130"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="dialog_scaninfo.ui" line="161"/>
+        <location filename="dialog_scaninfo.ui" line="167"/>
         <source>OK</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="dialog_scaninfo.cpp" line="36"/>
+        <location filename="dialog_scaninfo.cpp" line="38"/>
         <source>Scan count: 0</source>
         <translation>扫描数量: 0</translation>
     </message>
     <message>
-        <location filename="dialog_scaninfo.cpp" line="50"/>
+        <location filename="dialog_scaninfo.cpp" line="52"/>
         <source>Scan count: </source>
         <translation>扫描数量: </translation>
     </message>
@@ -459,53 +459,59 @@
     <message>
         <location filename="mainwindow.cpp" line="90"/>
         <location filename="mainwindow.cpp" line="1053"/>
-        <location filename="mainwindow.cpp" line="1497"/>
+        <location filename="mainwindow.cpp" line="1491"/>
         <source>Manual</source>
         <translation>手动</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="90"/>
         <location filename="mainwindow.cpp" line="1053"/>
-        <location filename="mainwindow.cpp" line="1497"/>
+        <location filename="mainwindow.cpp" line="1491"/>
         <source>Button 1</source>
         <translation>按键 1</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="90"/>
         <location filename="mainwindow.cpp" line="1053"/>
-        <location filename="mainwindow.cpp" line="1497"/>
+        <location filename="mainwindow.cpp" line="1491"/>
         <source>Button 2</source>
         <translation>按键 2</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="90"/>
         <location filename="mainwindow.cpp" line="1053"/>
-        <location filename="mainwindow.cpp" line="1497"/>
+        <location filename="mainwindow.cpp" line="1491"/>
         <source>Button 3</source>
         <translation>按键 3</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="90"/>
         <location filename="mainwindow.cpp" line="1053"/>
-        <location filename="mainwindow.cpp" line="1497"/>
+        <location filename="mainwindow.cpp" line="1491"/>
         <source>Button 4</source>
         <translation>按键 4</translation>
     </message>
+    <message>
+        <location filename="mainwindow.cpp" line="90"/>
+        <location filename="mainwindow.cpp" line="1053"/>
+        <location filename="mainwindow.cpp" line="1491"/>
+        <source>Button 5</source>
+        <translation>按键 5</translation>
+    </message>
     <message>
         <location filename="mainwindow.cpp" line="612"/>
         <location filename="mainwindow.cpp" line="1023"/>
-        <location filename="mainwindow.cpp" line="1392"/>
+        <location filename="mainwindow.cpp" line="1456"/>
         <location filename="mainwindow.cpp" line="1462"/>
-        <location filename="mainwindow.cpp" line="1468"/>
-        <location filename="mainwindow.cpp" line="1482"/>
-        <location filename="mainwindow.cpp" line="1514"/>
+        <location filename="mainwindow.cpp" line="1476"/>
+        <location filename="mainwindow.cpp" line="1508"/>
         <source>Tips</source>
         <translation>提示</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="612"/>
         <location filename="mainwindow.cpp" line="1023"/>
-        <location filename="mainwindow.cpp" line="1468"/>
+        <location filename="mainwindow.cpp" line="1462"/>
         <source>Device is offline</source>
         <translation>设备已断开</translation>
     </message>
@@ -525,18 +531,17 @@
         <translation>24位彩色</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1392"/>
         <source>Do not supported to open %1</source>
-        <translation>不支持打开设备 %1</translation>
+        <translation type="vanished">不支持打开设备 %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1462"/>
-        <location filename="mainwindow.cpp" line="1514"/>
+        <location filename="mainwindow.cpp" line="1456"/>
+        <location filename="mainwindow.cpp" line="1508"/>
         <source>No item selected</source>
         <translation>请选择配置项</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1482"/>
+        <location filename="mainwindow.cpp" line="1476"/>
         <source>Device type mismatch</source>
         <translation>设备类型不匹配</translation>
     </message>
@@ -545,12 +550,12 @@
         <translation type="vanished">手动扫描配置不可被删除</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1518"/>
+        <location filename="mainwindow.cpp" line="1512"/>
         <source>Question</source>
         <translation>询问</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1519"/>
+        <location filename="mainwindow.cpp" line="1513"/>
         <source>Are you sure you want to remove the item?</source>
         <translation>确认删除配置项？</translation>
     </message>
diff --git a/app/scantool/mainwindow.cpp b/app/scantool/mainwindow.cpp
index 50ffd434..0ddbb5a8 100644
--- a/app/scantool/mainwindow.cpp
+++ b/app/scantool/mainwindow.cpp
@@ -87,7 +87,7 @@ MainWindow::MainWindow(QWidget *parent)
         ui->tableWidget->item(index, 0)->setTextAlignment(Qt::AlignCenter);
         ui->tableWidget->item(index, 0)->setFlags(ui->tableWidget->item(index, 0)->flags() & ~Qt::ItemIsEditable);
 
-        QStringList btnTypeStr = {tr("Manual"), tr("Button 1"), tr("Button 2"), tr("Button 3"), tr("Button 4")};
+        QStringList btnTypeStr = {tr("Manual"), tr("Button 1"), tr("Button 2"), tr("Button 3"), tr("Button 4"), tr("Button 5")};
         ui->tableWidget->setItem(index, 1, new QTableWidgetItem(btnTypeStr[m_vScanParams[index].buttonId]));
         ui->tableWidget->item(index, 1)->setTextAlignment(Qt::AlignCenter);
         ui->tableWidget->item(index, 1)->setFlags(ui->tableWidget->item(index, 1)->flags() & ~Qt::ItemIsEditable);
@@ -1050,7 +1050,7 @@ void MainWindow::ShowAddDialog(unsigned int buttonId)
         ui->tableWidget->item(index, 0)->setTextAlignment(Qt::AlignCenter);
         ui->tableWidget->item(index, 0)->setFlags(ui->tableWidget->item(index, 0)->flags() & ~Qt::ItemIsEditable);
 
-        QStringList btnTypeStr = {tr("Manual"), tr("Button 1"), tr("Button 2"), tr("Button 3"), tr("Button 4")};
+        QStringList btnTypeStr = {tr("Manual"), tr("Button 1"), tr("Button 2"), tr("Button 3"), tr("Button 4"), tr("Button 5")};
         ui->tableWidget->setItem(index, 1, new QTableWidgetItem(btnTypeStr[m_vScanParams[index].buttonId]));
         ui->tableWidget->item(index, 1)->setTextAlignment(Qt::AlignCenter);
         ui->tableWidget->item(index, 1)->setFlags(ui->tableWidget->item(index, 1)->flags() & ~Qt::ItemIsEditable);
@@ -1488,7 +1488,7 @@ void MainWindow::on_pushButtonModify_clicked()
 
         ui->tableWidget->item(index, 0)->setText(QString::fromStdString(m_vScanParams[index].deviceType));
 
-        QStringList btnTypeStr = {tr("Manual"), tr("Button 1"), tr("Button 2"), tr("Button 3"), tr("Button 4")};
+        QStringList btnTypeStr = {tr("Manual"), tr("Button 1"), tr("Button 2"), tr("Button 3"), tr("Button 4"), tr("Button 5")};
         ui->tableWidget->item(index, 1)->setText(btnTypeStr[m_vScanParams[index].buttonId]);
 
         ui->tableWidget->item(index, 2)->setText(GetDesc(m_vScanParams[index].deviceConfigs));