diff --git a/app/scantool/Scantool_zh_CN.qm b/app/scantool/Scantool_zh_CN.qm index 1a2c33b9..bd6e6237 100644 Binary files a/app/scantool/Scantool_zh_CN.qm and b/app/scantool/Scantool_zh_CN.qm differ 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 @@ 扫描 - + Scan info - + Scan count:0 扫描数量: 0 - + Cancel 取消 - + OK 确定 - + Scan count: 0 扫描数量: 0 - + Scan count: 扫描数量: @@ -459,53 +459,59 @@ - + Manual 手动 - + Button 1 按键 1 - + Button 2 按键 2 - + Button 3 按键 3 - + Button 4 按键 4 + + + + + Button 5 + 按键 5 + - + - - - + + Tips 提示 - + Device is offline 设备已断开 @@ -525,18 +531,17 @@ 24位彩色 - Do not supported to open %1 - 不支持打开设备 %1 + 不支持打开设备 %1 - - + + No item selected 请选择配置项 - + Device type mismatch 设备类型不匹配 @@ -545,12 +550,12 @@ 手动扫描配置不可被删除 - + Question 询问 - + Are you sure you want to remove the item? 确认删除配置项? 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));