This commit is contained in:
parent
b3eaba6fc4
commit
a8a4612416
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
@ -301,12 +301,9 @@ MainWindow::MainWindow(QWidget *parent)
|
|||
ui->act_autoSave->setToolTip(tr("when switching pictures, save the edited pictures directly without reminding"));
|
||||
#endif
|
||||
|
||||
|
||||
auto_save_info_.index = 0;
|
||||
ui->act_device_log->setEnabled(false);
|
||||
ui->act_driver_log->setEnabled(false);
|
||||
ui->act_device_log->setText(QString::fromStdString("\345\257\274\345\207\272\350\256\276\345\244\207\346\227\245\345\277\227")); // 导出设备日志
|
||||
ui->act_driver_log->setText(QString::fromStdString("\345\257\274\345\207\272\351\251\261\345\212\250\346\227\245\345\277\227")); // 导出驱动日志
|
||||
|
||||
SANE_Int v = 0;
|
||||
sane_init_ex(&v, sane_ex_callback, this);
|
||||
|
@ -3421,7 +3418,7 @@ void MainWindow::on_actionact_update_triggered()
|
|||
}
|
||||
else
|
||||
{
|
||||
QMessageBox::critical(this, tr("error"), tr("get versionlist failed"));
|
||||
QMessageBox::information(this, tr("tip"), tr("Other versions not available"));
|
||||
}
|
||||
m_versionDll->ReleaseVersionList(versionInfo, versionCount);
|
||||
}
|
||||
|
@ -3444,9 +3441,9 @@ void MainWindow::on_act_driver_log_triggered()
|
|||
}
|
||||
else {
|
||||
if(statu == SANE_STATUS_UNSUPPORTED) // 设备不支持该操作
|
||||
QMessageBox::information(this, windowTitle(), QString::fromStdString("\350\256\276\345\244\207\344\270\215\346\224\257\346\214\201\350\257\245\346\223\215\344\275\234"));
|
||||
QMessageBox::information(this, windowTitle(), tr("The device does not support this operation"));
|
||||
else
|
||||
QMessageBox::information(this, windowTitle(), QString::fromStdString("IO\351\224\231\350\257\257")); // IO错误
|
||||
QMessageBox::information(this, windowTitle(), tr("IO error")); // IO错误
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3462,9 +3459,9 @@ void MainWindow::on_act_device_log_triggered()
|
|||
}
|
||||
else {
|
||||
if(statu == SANE_STATUS_UNSUPPORTED) // 设备不支持该操作
|
||||
QMessageBox::information(this, windowTitle(), QString::fromStdString("\350\256\276\345\244\207\344\270\215\346\224\257\346\214\201\350\257\245\346\223\215\344\275\234"));
|
||||
QMessageBox::information(this, windowTitle(), tr("The device does not support this operation"));
|
||||
else
|
||||
QMessageBox::information(this, windowTitle(), QString::fromStdString("IO\351\224\231\350\257\257")); // IO错误
|
||||
QMessageBox::information(this, windowTitle(), tr("IO error")); // IO错误
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1273,6 +1273,13 @@ bug description:
|
|||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Dialog_wrong_img</name>
|
||||
<message>
|
||||
<source>Dialog</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>GraphicsScene</name>
|
||||
<message>
|
||||
|
@ -1983,10 +1990,6 @@ Are you sure to close?</source>
|
|||
<source>error</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>get versionlist failed</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>act_feedback</source>
|
||||
<translation type="unfinished"></translation>
|
||||
|
@ -1995,6 +1998,30 @@ Are you sure to close?</source>
|
|||
<source>start failed!</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>act_device_log</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>act_driver_log</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>tip</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Other versions not available</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>The device does not support this operation</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>IO error</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Phonon::</name>
|
||||
|
|
Loading…
Reference in New Issue