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

Merge branch 'master' of http://192.168.100.140:8099/sane/code_app

This commit is contained in:
luoliangyi 2022-06-06 18:51:45 +08:00
parent d94c216286 ca6526b069
commit be94164549
7 changed files with 394 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/scanner/Scanner_zh_CN.qm
View File

Binary file not shown.

508
app/scanner/Scanner_zh_CN.ts
View File

File diff suppressed because it is too large Load Diff

7
app/scanner/dialog_exportimagefile.cpp
View File

@ -149,7 +149,12 @@ void Dialog_ExportImageFile::ThreadFunc(HGThread thread, HGPointer param)
if (nullptr != img)
{
char fileName[512];
sprintf(fileName, "%s%03d", getStdString(p->m_destName).c_str(), index);
if(p->m_srcFiles.size() > 1)
{
sprintf(fileName, "%s%03d", getStdString(p->m_destName).c_str(), index);
}else
sprintf(fileName, "%s", getStdString(p->m_destName).c_str());
++index;
QString saveFileName = p->m_destPath + QString(StdStringToUtf8(fileName).c_str()) + p->m_destExt;

4
app/scanner/dialog_log.cpp
View File

@ -24,7 +24,7 @@ dialog_log::dialog_log(QWidget *parent)
pbtn_stop->setText(tr("cancel scan"));
cBox_autoScroll->setText(tr("auto scroll"));
pbtn_clear->setText(tr("clear"));
pbtn_export->setText(QString::fromStdString("\345\257\274\345\207\272\345\233\276\347\211\207")); // 导出图片
pbtn_export->setText(tr("export images"));
pbtn_continueScan->setText(tr("continue scan"));
pbtn_finishScan->setText(tr("finish scan"));
@ -78,7 +78,7 @@ void dialog_log::addLog(const QString &log, bool err, int log_event)
else if(log_event == LOG_EVENT_SCAN_STOPPED)
{
char utf8[128] = {0};
sprintf(utf8, "\357\274\210\346\234\254\350\275\256\345\205\261\346\211\253\346\217\217\345\233\276\347\211\207 %u \345\271\205\357\274\211", img_received_);
sprintf(utf8, tr("(epicycle scanning images %u picture)").toStdString().c_str(), img_received_);
if(ind_scanning_ >= 0 && ind_scanning_ < idx)
ui->listWidget->item(ind_scanning_)->setText(QString::fromStdString(msg_fixed_scanning_));
if (idx >= 0)

18
app/scanner/hg_settingdialog.cpp
View File

@ -204,26 +204,26 @@ void hg_settingdialog::create_scheme_management_ui(QVBoxLayout* layout)
title->setFixedWidth(width);
comb_->setFixedWidth(width);
title->setText(QString::fromStdString("\347\216\260\346\234\211\351\205\215\347\275\256\346\226\271\346\241\210\357\274\232"));
title->setText(tr("existing configuration scheme"));
layout->addWidget(title);
layout->addWidget(comb_);
rename_ = new QPushButton(this);
rename_->setText(QString::fromStdString("\346\224\271\345\220\215"));
rename_->setText(tr("change name"));
rename_->setEnabled(enabled);
rename_->setFixedWidth(width/3);
hbox->addWidget(rename_);
connect(rename_, SIGNAL(clicked(bool)), this, SLOT(slot_pushButton_scheme_management()));
del_this_ = new QPushButton(this);
del_this_->setText(QString::fromStdString("\345\210\240\351\231\244"));
del_this_->setText(tr("delete"));
del_this_->setEnabled(enabled);
del_this_->setFixedWidth(width / 3);
hbox->addWidget(del_this_);
connect(del_this_, SIGNAL(clicked(bool)), this, SLOT(slot_pushButton_scheme_management()));
apply_ = new QPushButton(this);
apply_->setText(QString::fromStdString("\345\272\224\347\224\250"));
apply_->setText(tr("apply"));
apply_->setEnabled(enabled);
apply_->setFixedWidth(width / 3);
hbox->addWidget(apply_);
@ -243,7 +243,7 @@ void hg_settingdialog::create_scheme_management_ui(QVBoxLayout* layout)
layout->addStretch();
title = new QLabel(this);
title->setText(QString::fromStdString("\351\205\215\347\275\256\344\277\241\346\201\257\357\274\232"));
title->setText(tr("confgiuration information:"));
layout->addWidget(title);
sketch_ = new QTextEdit(this);
@ -278,7 +278,7 @@ void hg_settingdialog::createUI()
create_scheme_management_ui(v1);
v2->addWidget(tabWidgetCreation);
QGroupBox *grp = new QGroupBox(QString::fromStdString("\351\205\215\347\275\256\346\226\271\346\241\210\347\256\241\347\220\206"), this);
QGroupBox *grp = new QGroupBox(tr("configuration scheme management"), this);
grp->setLayout(v1);
grp->setFixedSize(195, 500);
@ -326,7 +326,7 @@ void hg_settingdialog::createUI()
h->addWidget(checkBoxCreation);
btn_cut_area_ = new QPushButton(this);
btn_cut_area_->setText(StdStringToUtf8("区域裁剪").c_str());
btn_cut_area_->setText(tr("regional crop"));
btn_cut_area_->setFixedWidth(120);
h->addWidget(btn_cut_area_);
@ -343,7 +343,7 @@ void hg_settingdialog::createUI()
h->addWidget(checkBoxCreation);
btn_gamma_ = new QPushButton(this);
btn_gamma_->setText(StdStringToUtf8("自定义色调曲线").c_str());
btn_gamma_->setText(tr("custom tone curve"));
btn_gamma_->setFixedWidth(120);
h->addWidget(btn_gamma_);
@ -2147,7 +2147,7 @@ void hg_settingdialog::slot_pushButton_scheme_management(void)
Dialog_Input dlg;
dlg.init_value(text);
dlg.setWindowTitle(QString::fromStdString("\351\205\215\347\275\256\346\226\271\346\241\210\346\224\271\345\220\215"));
dlg.setWindowTitle(tr("configuration scheme name change"));
if(dlg.exec())
{
text = dlg.get_inputting_value();

12
app/scanner/mainwindow.cpp
View File

@ -261,8 +261,8 @@ MainWindow::MainWindow(QWidget *parent)
m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning);
updateActionStatus();
ui->act_autoSave->setChecked(auto_save_changes_);
ui->act_autoSave->setText(QString::fromStdString("\350\207\252\345\212\250\344\277\235\345\255\230")); // 自动保存
ui->act_autoSave->setToolTip(QString::fromStdString("\345\210\207\346\215\242\345\233\276\347\211\207\346\227\266\357\274\214\344\270\215\346\217\220\351\206\222\357\274\214\347\233\264\346\216\245\344\277\235\345\255\230\347\274\226\350\276\221\350\277\207\347\232\204\345\233\276\347\211\207")); // 切换图片时，不提醒，直接保存编辑过的图片
ui->act_autoSave->setText(tr("auto save"));
ui->act_autoSave->setToolTip(tr("when switching pictures, save the edited pictures directly without reminding"));
auto_save_info_.index = 0;
@ -411,11 +411,11 @@ void MainWindow::on_act_autoSave_triggered()
auto_save_changes_ = ui->act_autoSave->isChecked();
if(auto_save_changes_)
{
m_wndStatusBar->setDeviceStatusInfo(QString::fromStdString("\345\220\257\347\224\250\350\207\252\345\212\250\344\277\235\345\255\230"), false); // 启用自动保存
m_wndStatusBar->setDeviceStatusInfo(tr("enabling automatic saving"), false);
}
else
{
m_wndStatusBar->setDeviceStatusInfo(QString::fromStdString("\345\217\226\346\266\210\350\207\252\345\212\250\344\277\235\345\255\230"), false); // 取消自动保存
m_wndStatusBar->setDeviceStatusInfo(tr("cancel auto save"), false);
}
}
@ -448,7 +448,7 @@ void MainWindow::on_currItemChanged(int index)
if(auto_save_changes_)
{
// 切换图片时，自动保存编辑过的图像。若想取消，请取消勾选菜单项：图像->自动保存
QString info("\345\210\207\346\215\242\345\233\276\347\211\207\346\227\266\357\274\214\350\207\252\345\212\250\344\277\235\345\255\230\347\274\226\350\276\221\350\277\207\347\232\204\345\233\276\345\203\217\343\200\202\350\213\245\346\203\263\345\217\226\346\266\210\357\274\214\350\257\267\345\217\226\346\266\210\345\213\276\351\200\211\350\217\234\345\215\225\351\241\271\357\274\232\345\233\276\345\203\217->\350\207\252\345\212\250\344\277\235\345\255\230");
QString info(tr("Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save"));
m_wndStatusBar->setDeviceStatusInfo(info, false);
save = true;
}
@ -457,7 +457,7 @@ void MainWindow::on_currItemChanged(int index)
tr("modified, save it?"),
QMessageBox::Yes | QMessageBox::No | QMessageBox::YesToAll, this);
msg.setButtonText(QMessageBox::Yes, tr("yes"));
msg.setButtonText(QMessageBox::YesToAll, QString::fromStdString("\344\277\235\345\255\230\357\274\214\344\270\215\345\206\215\346\217\220\351\206\222")); // 保存，不再提醒
msg.setButtonText(QMessageBox::YesToAll, tr("save, do not remind again"));
msg.setButtonText(QMessageBox::No, tr("no"));
msg.exec();
if (msg.clickedButton() == msg.button(QMessageBox::No))

72
app/scanner/qt_zh_CN.ts
View File

@ -1794,6 +1794,34 @@ Are you sure to close?</source>
<source>close </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>act_autoSave</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>auto save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>when switching pictures, save the edited pictures directly without reminding</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>enabling automatic saving</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>cancel auto save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-&gt; automatically save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>save, do not remind again</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Phonon::</name>
@ -7921,6 +7949,14 @@ Please choose a different file name.</source>
<source>finish scan</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>export images</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>(epicycle scanning images %u picture)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>hg_settingdialog</name>
@ -7998,6 +8034,42 @@ No: add new configuration</source>
<source>Are you sure you want to delete the configuration?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>existing configuration scheme</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>change name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>delete</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>apply</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>confgiuration information:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>regional crop</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>custom tone curve</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>configuration scheme name change</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>configuration scheme management</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>setPicClrTool</name>