lmh188
/
code_production
mirror of http://192.168.10.5:8099/sane/code_production.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

去除烧录模式序号

This commit is contained in:
yangjiaxuan 2023-01-09 09:41:24 +08:00
parent fc660c7a7e
commit f044073f20
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/HGProductionTool/ProductionTool_zh_CN.qm
View File

Binary file not shown.

30
app/HGProductionTool/ProductionTool_zh_CN.ts
View File

@ -614,34 +614,33 @@
<translation>关闭设备</translation>
</message>
<message>
<location filename="form_burnmode.cpp" line="97"/>
<location filename="form_burnmode.cpp" line="95"/>
<source>ID</source>
<translation>序号</translation>
</message>
<message>
<location filename="form_burnmode.cpp" line="97"/>
<location filename="form_burnmode.cpp" line="95"/>
<source>selected</source>
<translation>选择</translation>
</message>
<message>
<location filename="form_burnmode.cpp" line="97"/>
<location filename="form_burnmode.cpp" line="95"/>
<source>device</source>
<translation>设备</translation>
</message>
<message>
<location filename="form_burnmode.cpp" line="97"/>
<source>serialNum</source>
<translation>序列号</translation>
<translation type="vanished">序列号</translation>
</message>
<message>
<location filename="form_burnmode.cpp" line="155"/>
<location filename="form_burnmode.cpp" line="341"/>
<location filename="form_burnmode.cpp" line="153"/>
<location filename="form_burnmode.cpp" line="339"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="form_burnmode.cpp" line="155"/>
<location filename="form_burnmode.cpp" line="341"/>
<location filename="form_burnmode.cpp" line="153"/>
<location filename="form_burnmode.cpp" line="339"/>
<source>Please check a devices at least</source>
<translation>请至少勾选一台设备</translation>
</message>
@ -1003,13 +1002,13 @@
</message>
<message>
<location filename="mainwindow.cpp" line="420"/>
<source>Are you sure to connect the new device</source>
<translation>检测到设备连接，是否启动测试？</translation>
<source>Confirm whether the device is reset</source>
<oldsource>Are you sure to connect the new device</oldsource>
<translation>请先确认设备是否已经复位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="422"/>
<source>yes</source>
<translation>确定</translation>
<translation type="vanished">确定</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="423"/>
@ -1027,6 +1026,11 @@
<source>The device has disconnected</source>
<translation type="vanished">设备已断开连接</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="422"/>
<source>confirm</source>
<translation>已复位</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="455"/>
<source>Open device failed</source>

6
app/HGProductionTool/form_burnmode.cpp
View File

@ -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();

4
app/HGProductionTool/mainwindow.cpp
View File

@ -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))