From 50c639a78e89fb466b2d8918e2c386de37a44b8d Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Mon, 6 Jun 2022 10:28:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/Scanner_zh_CN.qm | Bin 29354 -> 30819 bytes app/scanner/Scanner_zh_CN.ts | 503 ++++++++++++++++++------------- app/scanner/dialog_log.cpp | 4 +- app/scanner/hg_settingdialog.cpp | 18 +- app/scanner/mainwindow.cpp | 12 +- app/scanner/qt_zh_CN.ts | 68 +++++ 6 files changed, 379 insertions(+), 226 deletions(-) diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index 0fbb7cbad96c489bafe6ebacbe227bb10b137ddf..344796201487affdb6b1f084e0fc44ac502bb2e0 100644 GIT binary patch delta 3438 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 diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index 42e14630..b2da750f 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -303,25 +303,25 @@ 所有页 - - - - + + + + e.g. '%1%2' 例如.“%1%2” - + ok 确定 - + cancel 取消 - + Browse directory 文件夹路径 @@ -375,7 +375,7 @@ 关闭 - + Question 询问 @@ -386,45 +386,45 @@ Continue to clear? 继续清除？ - + Main window contains temporary files, clear cache would remove all of them. Continue to clear? 主窗口中包含临时文件，清除缓存将会移除这些文件。 继续清除？ - + yes 确定 - + no 取消 - - + + Information 消息 - + No cached file is available 暂无缓存文件 - + Cache clear successfully. 缓存清除成功。 - + Warning 警告 - + Cache clear failed or incompletely clear. 缓存清除失败或者未清除干净。 @@ -1532,321 +1532,326 @@ Please make sure the two passwords are the same. 旋转 - + menu_user 用户 - + menu_info 信息 - + menu_device 设备 - + toolBar 工具栏 - + act_open 打开... - + act_insert 插入本地文件... - + act_save 保存 - + act_saveAs 另存为... - + act_Export 导出... - + act_closeFile 关闭选中项 - + act_closeAll 关闭所有项 - + act_imageInfo 图像信息 - + act_exit 退出 - + act_scannerSettings 扫描设置... - + act_acquire 扫描 - + act_acquireSingle 扫描单张 - + act_acquireInto 扫描至... - + act_fullscreen 全屏显示 - + act_fitWindowSize 适应视图框尺寸 - + act_fitWindowWidth 适应视图框宽度 - + act_realSize 真实大小 - + act_zoomIn 放大 - + act_zoomOut 缩小 - + act_toolBar 工具栏 - + act_statusBar 状态栏 - + act_thumbnailBar 缩略图栏 - + act_colorInfo 色彩信息 - + act_previous 上一张 - + act_next 下一张 - + act_first 第一张 - + act_last 最后一张 - + act_openPageNum 跳转至... - + act_previousPage 上一页 - + act_nextPage 下一页 - + act_firstPage 第一页 - + act_lastPage 最后一页 - + act_adjust 亮度/对比度/伽马... - + act_90Left 左旋转90度 - + act_90Right 右旋转90度 - + act_180 旋转180度 - + act_multiRotate 多页旋转... - + act_autoCrop 自动裁剪... - + act_signIn 登录... - + act_passwordChange 密码修改... - + act_signOut 登出 - + act_log 日志管理... - + act_clrCache 清除缓存... - + act_consume 耗材状态... - + act_help 帮助 - + act_about 关于... - + act_insertFromScanner 从扫描插入... - + act_clearRoller 清除滚轴计数 - + act_imageEdit 图像编辑... - + act_sortPages 书籍排序 - + + act_autoSave + 自动保存 + + + HuaGoScan 华高扫描软件 - + Grid 多列显示 - + Move To... 移动到... - + Insert files 插入文件 - - + + nodevice 没有发现扫描仪 - - - - - - + + + + + + Question 警告 - - + + modified, save it? 图像已被修改。 是否保存修改？ - + file lost, remove it? 文件已丢失，是否删除？ @@ -1855,7 +1860,7 @@ Please make sure the two passwords are the same. 已连接 - + disconnected 已断开连接 @@ -1872,179 +1877,179 @@ Please make sure the two passwords are the same. 扫描完成 - + Clear, then start scan 清空并启动扫描 - + Do NOT clear, then start scan 不清空并启动扫描 - + Already exist images in image list. Do you want to clear? 图像列表中已存在图像。 是否清空？ - + Information 消息 - + Insufficient disk space 磁盘空间不足，请删除不需要的文件，以保证有足够的空间 - + Open images 打开图片 - + Insert images 插入图片 - - - - - + + + + + info 信息 - - - + + + save failed 保存失败 - - + + find savePath in thumbnail 图片名在列表中已存在 - + File name 文件名 - + File path 文件路径 - + File size 文件大小 - + Creation date/time 创建时间 - + Modified date/time 修改时间 - + Accessed date/time 访问时间 - + Format 格式 - + Width 宽度 - + Height 高度 - + depth 深度 - + Color model 色彩模式 - + DPI 每英寸像素点 - + Print size 打印尺寸 - + Frame 帧 - + None 无 - + Mono 黑白 - + Gray 灰度 - + Color 彩色 - + Warning 警告 - + Device is Running! Please finish scanning first. 设备正在运行！ 请先结束扫描。 - + Are you sure to close 您确定要关闭 - + ? 吗? - - + + close 关闭 @@ -2055,228 +2060,258 @@ Continue to close? 是否继续关闭？ - + Sure to sign out administrator account? 是否确定登出管理员账户？ - + confirm the operation 确认操作 - + Are you sure to clear the rollor acount? 你确定要清除滚轴计数吗 - + Please re-enter the Abount screen to obtain the latest value 请重新进入关于界面以获取最新值 - + <p>%1: <a href='%2'>%3</a> - + <p>%1: %2 - + roller number 滚轴张数 - + open scanner 打开扫描仪 - - + + app name 华高扫描软件 - - + + success 成功 - + apply setting 应用配置 - + success 成功 - + failed 失败 - - + + failed 失败 - + warning 警告 - + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. 当前路径磁盘空间不足, 请重新选择路径或及时清理磁盘空间。 - + lost config 配置丢失 - + apply setting 应用配置 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + start failed 启动失败 - + HanvonScan 汉王扫描软件 - + LanxumScan 立思辰扫描软件 - - - - - - - - - - + + auto save + 自动保存 + + + + when switching pictures, save the edited pictures directly without reminding + 切换图片时，不提醒，直接保存编辑过的图片 + + + + enabling automatic saving + 启用自动保存 + + + + cancel auto save + 取消自动保存 + + + + Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save + 切换图片时，自动保存编辑过的图像。若想取消，请取消勾选菜单项：图像->自动保存 + + + + + + + + + + + + yes 确定 - - - - - - - - - + + save, do not remind again + 保存，不再提醒 + + + + + + + + + + + no 取消 - + found device 发现设备 - + reconnected 重新连接 - + already connected, but open faild 已经连接，但打开失败 - - + + %1%2%3.%4 %1%2%3.%4 - + There are pictures that have not been saved. Are you sure to close? 有图像未保存，确定关闭？ - + tips 提示 - + Are you sure to close? 确定关闭？ - + confirm operation 确认操作 - + are you sure to clear the roller count? 您确定要清除滚轴计数吗 - - - + + + hint 提示 - - + + Roller scanned count has been set to 0. 辊轴计数已置零 - - + + Roller scanned count reset failed. 重置辊轴计数失败 - + Error 错误 - + Document missing! It would be deleted or renamed. 文档丢失！文档可能已被删除或被重命名。 @@ -2309,28 +2344,28 @@ Are you sure to close? <br>导航地址: <a href='https://j.map.baidu.com/7e/1TO'>百度地图访问</a> - + About %1 关于 %1 - + <p>%1</p><p>Version: %2<br>CopyRight: &#169; %3</p><p>%4%5%6%7%8%9</p> <p>%1</p><p>版本: %2<br>版权: &#169; %3</p><p>%4%5%6%7%8%9</p> - + about %1 关于 %1 - + <p>Version: %1</p> <p>版本: %1</p> <p>版本： %1</p> - + <p>CopyRight: &#169; %1</p> <p>版权: &#169; %1</p> <p>版权： &#169; %1</p> @@ -2441,6 +2476,11 @@ Are you sure to close? auto scroll 自动滚动 + + + export images + 导出图片 + continue scan @@ -2451,6 +2491,11 @@ Are you sure to close? finish scan 完成扫描 + + + (epicycle scanning images %u picture) + （本轮共扫描 %u 幅） + fold 收起 @@ -2501,11 +2546,36 @@ Are you sure to close? delete configuration 删除配置 + + + existing configuration scheme + 现有配置方案： + + + + change name + 改名 + + + + delete + 删除 + + + + apply + 应用 + delete all configurations 删除所有配置 + + + confgiuration information: + 配置信息： + ok @@ -2516,6 +2586,16 @@ Are you sure to close? cancel 取消 + + + regional crop + 区域裁剪 + + + + custom tone curve + 自定义色调曲线 + save the configuration @@ -2579,6 +2659,11 @@ No: add new configuration </p> </p> + + + configuration scheme name change + 配置改名 + diff --git a/app/scanner/dialog_log.cpp b/app/scanner/dialog_log.cpp index cf49eb64..b9c372f4 100644 --- a/app/scanner/dialog_log.cpp +++ b/app/scanner/dialog_log.cpp @@ -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) diff --git a/app/scanner/hg_settingdialog.cpp b/app/scanner/hg_settingdialog.cpp index ad848f08..e6a31866 100644 --- a/app/scanner/hg_settingdialog.cpp +++ b/app/scanner/hg_settingdialog.cpp @@ -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(QString::fromStdString("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(); diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index efb3138d..108f973c 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -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)) diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts index 5d88299d..b3ae0588 100644 --- a/app/scanner/qt_zh_CN.ts +++ b/app/scanner/qt_zh_CN.ts @@ -1794,6 +1794,34 @@ Are you sure to close? close + + act_autoSave + + + + auto save + + + + when switching pictures, save the edited pictures directly without reminding + + + + enabling automatic saving + + + + cancel auto save + + + + Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save + + + + save, do not remind again + + Phonon:: @@ -7921,6 +7949,14 @@ Please choose a different file name. finish scan + + export images + + + + (epicycle scanning images %u picture) + + hg_settingdialog @@ -7998,6 +8034,38 @@ No: add new configuration Are you sure you want to delete the configuration? + + existing configuration scheme + + + + change name + + + + delete + + + + apply + + + + confgiuration information: + + + + regional crop + + + + custom tone curve + + + + configuration scheme name change + + setPicClrTool From 786a73bf33801a0f2eb543733bdf19f496fc2d99 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Mon, 6 Jun 2022 11:58:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fixed=20bug-167:=E5=A4=84=E7=90=86=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8D=95=E5=BC=A0=E5=9B=BE=E7=89=87=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/dialog_exportimagefile.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/scanner/dialog_exportimagefile.cpp b/app/scanner/dialog_exportimagefile.cpp index 1d8b6a6d..e5bead0c 100644 --- a/app/scanner/dialog_exportimagefile.cpp +++ b/app/scanner/dialog_exportimagefile.cpp @@ -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; From ca6526b069442925fbcf9043f7493ba95119bad8 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Mon, 6 Jun 2022 14:32:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/Scanner_zh_CN.qm | Bin 30819 -> 30907 bytes app/scanner/Scanner_zh_CN.ts | 5 +++++ app/scanner/hg_settingdialog.cpp | 2 +- app/scanner/qt_zh_CN.ts | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index 344796201487affdb6b1f084e0fc44ac502bb2e0..a5058f2f57f4260840b2eecff538fcdb55b25415 100644 GIT binary patch delta 169 zcmaF-fpPao#t9;fFE)y@Gcrz^EX(N5xO;LckW8MumQkLufAd+!<4lY{CQoHCWOw*n z!oZOJV)9XzddAktuB>`YSqhs=S=Tc$p4_a;QOC%XVX=8B=YM9#XOoxm`mtv^Wil{i z?cDr}_f5JP&qUw)ywsf;9@Ps=*f<~v U64QZ0@d4xT0gw~{;IS140Rcjj9RWuHYm;RGM*$O)tpOhaKeNpN#{vPUla&N9 zlgdI0Rm^}v#kmL0|Azktqo2GX!2 cancel 取消 + + + configuration scheme management + 配置方案管理 + regional crop diff --git a/app/scanner/hg_settingdialog.cpp b/app/scanner/hg_settingdialog.cpp index e6a31866..d25ba129 100644 --- a/app/scanner/hg_settingdialog.cpp +++ b/app/scanner/hg_settingdialog.cpp @@ -278,7 +278,7 @@ void hg_settingdialog::createUI() create_scheme_management_ui(v1); v2->addWidget(tabWidgetCreation); - QGroupBox *grp = new QGroupBox(QString::fromStdString("configuration scheme management"), this); + QGroupBox *grp = new QGroupBox(tr("configuration scheme management"), this); grp->setLayout(v1); grp->setFixedSize(195, 500); diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts index b3ae0588..1d28f400 100644 --- a/app/scanner/qt_zh_CN.ts +++ b/app/scanner/qt_zh_CN.ts @@ -8066,6 +8066,10 @@ No: add new configuration configuration scheme name change + + configuration scheme management + + setPicClrTool