diff --git a/app/fwupgrade/logindialog.cpp b/app/fwupgrade/logindialog.cpp index 9936b484..9651066a 100644 --- a/app/fwupgrade/logindialog.cpp +++ b/app/fwupgrade/logindialog.cpp @@ -26,8 +26,7 @@ void LoginDialog::on_btnLogin_clicked() { if (ui->editAccount->text() != m_account || ui->editPassword->text() != m_password) { - QMessageBox msg(QMessageBox::Information, tr("tips"), tr("wrong account or password"), QMessageBox::Yes, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("wrong account or password"), QMessageBox::Ok, this); msg.exec(); return; } diff --git a/app/fwupgrade/mainwindow.cpp b/app/fwupgrade/mainwindow.cpp index 3166d137..0bc6294b 100644 --- a/app/fwupgrade/mainwindow.cpp +++ b/app/fwupgrade/mainwindow.cpp @@ -364,8 +364,7 @@ void MainWindow::on_btnGetVersionList_clicked() if (m_vVersion.empty()) { - QMessageBox msg(QMessageBox::Information, tr("tips"), tr("no version available"), QMessageBox::Yes, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("no version available"), QMessageBox::Ok, this); msg.exec(); } } @@ -410,8 +409,7 @@ void MainWindow::on_btnOpenFilePath_clicked() { if (m_curFwVersion >= fileVersion) { - QMessageBox msg(QMessageBox::Information, tr("tips"), tr("the selected firmware is not newer than the current version"), QMessageBox::Yes, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("the selected firmware is not newer than the current version"), QMessageBox::Ok, this); msg.exec(); } else @@ -424,8 +422,6 @@ void MainWindow::on_btnOpenFilePath_clicked() QMessageBox msg(QMessageBox::Question, tr("tips"), tr("firmware file mismatch, continue?"), QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if (msg.clickedButton() == msg.button(QMessageBox::Yes)) { @@ -446,8 +442,7 @@ void MainWindow::on_btnDownloadUpgrade_clicked() if (m_curFwVersion >= versionNum) { - QMessageBox msg(QMessageBox::Information, tr("tips"), tr("the selected firmware is not newer than the current version"), QMessageBox::Yes, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("the selected firmware is not newer than the current version"), QMessageBox::Ok, this); msg.exec(); return; } @@ -497,8 +492,7 @@ void MainWindow::on_btnDownloadUpgrade_clicked() } else { - QMessageBox msg(QMessageBox::Information, tr("tips"), tr("download firmware fail"), QMessageBox::Yes, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("download firmware fail"), QMessageBox::Ok, this); msg.exec(); } } @@ -558,8 +552,7 @@ void MainWindow::on_btnClearRollCount_clicked() else info = tr("Roller scanned count reset failed."); - QMessageBox msg(QMessageBox::Information, tr("tips"), info, QMessageBox::Yes, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); + QMessageBox msg(QMessageBox::Information, tr("tips"), info, QMessageBox::Ok, this); msg.exec(); } @@ -575,32 +568,28 @@ void MainWindow::on_btnModifyPassword_clicked() if (password != ui->editOldPassword->text()) { - QMessageBox msg(QMessageBox::Information, tr("tips"), tr("old password is wrong"), QMessageBox::Yes, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("old password is wrong"), QMessageBox::Ok, this); msg.exec(); return; } if (ui->editNewPassword->text().isEmpty()) { - QMessageBox msg(QMessageBox::Information, tr("tips"), tr("new password can not be empty"), QMessageBox::Yes, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("new password can not be empty"), QMessageBox::Ok, this); msg.exec(); return; } if (ui->editNewPassword->text() != ui->editNewPassword_2->text()) { - QMessageBox msg(QMessageBox::Information, tr("tips"), tr("new password is inconsistent"), QMessageBox::Yes, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("new password is inconsistent"), QMessageBox::Ok, this); msg.exec(); return; } if (HGBASE_ERR_OK != HGBase_SetProfileString(cfgPath, "login", "password", passwordEncrypt(ui->editNewPassword->text()).toStdString().c_str())) { - QMessageBox msg(QMessageBox::Information, tr("tips"), tr("modify password fail"), QMessageBox::Yes, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("modify password fail"), QMessageBox::Ok, this); msg.exec(); return; } @@ -609,7 +598,6 @@ void MainWindow::on_btnModifyPassword_clicked() ui->editNewPassword->setText(""); ui->editNewPassword_2->setText(""); - QMessageBox msg(QMessageBox::Information, tr("tips"), tr("modify password success"), QMessageBox::Yes, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); + QMessageBox msg(QMessageBox::Information, tr("tips"), tr("modify password success"), QMessageBox::Ok, this); msg.exec(); } diff --git a/app/scanner/HGImgThumb.cpp b/app/scanner/HGImgThumb.cpp index 3fe5a983..62517f6b 100644 --- a/app/scanner/HGImgThumb.cpp +++ b/app/scanner/HGImgThumb.cpp @@ -1236,8 +1236,6 @@ HGResult HGImgThumb::insertItems(const QStringList &fileNames, int pos, bool app QMessageBox msg(QMessageBox::Question, tr("Question"), info, QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if (msg.clickedButton() == msg.button(QMessageBox::Yes)) { @@ -1252,8 +1250,6 @@ HGResult HGImgThumb::insertItems(const QStringList &fileNames, int pos, bool app QMessageBox msg(QMessageBox::Question, tr("Question"), info, QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if (msg.clickedButton() == msg.button(QMessageBox::Yes)) { diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index d7c67a19..c298758b 100644 Binary files a/app/scanner/Scanner_zh_CN.qm and b/app/scanner/Scanner_zh_CN.qm differ diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index 5c474b9a..121e3e3e 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -425,18 +425,16 @@ Continue to clear? 继续清除？ - yes - 确定 + 确定 - no - 取消 + 取消 - + Information 消息 @@ -446,49 +444,51 @@ Continue to clear? 暂无缓存文件 - + Cache clear successfully. 缓存清除成功。 - + Warning 警告 - + Cache clear failed or incompletely clear. 缓存清除失败或者未清除干净。 - + Browse directory 文件夹路径 - - + + tips 提示 - + directory can not be empty 文件目录不能为空 - + create cachePath failed: 创建缓存路径失败： Dialog_Export - + + ok 确定 - + + cancel 取消 @@ -543,9 +543,9 @@ Page range will be "Chosen Pages". 多页保存(TIFF/PDF/OFD/GIF) - - - + + + Input is not valid. Page range will be 'Chosen Pages'. 输入无效。 @@ -588,9 +588,8 @@ Page range will be 'Chosen Pages'. OCR功能处理失败 - ok - 确定 + 确定 @@ -1424,9 +1423,8 @@ This operation will NOT rotate the files that may contain multiple pages, such a 提示 - ok - 确定 + 确定 @@ -1556,6 +1554,44 @@ Please make sure the two passwords are the same. 使用当前日期建立子文件夹 + + Dialog_SaveMessageBox + + + Dialog + 询问 + + + + TextLabel + + + + + Yes + 是 + + + + Yes to All + + + + + No + 否 + + + + save, do not remind again + 保存并不再提醒 + + + + modified, save it? + 图像已被修改,是否保存修改？ + + Dialog_SaveQuality @@ -1806,17 +1842,17 @@ bug description: - + Question 提示 - + some files have been loaded, do you want to move to end? 有文件已经加载，是否将其移动到末尾？ - + some files have been loaded, do you want to move to specified location? 有文件已经加载，是否将其移动到指定位置？ @@ -1825,16 +1861,12 @@ bug description: 有图片已经被打开，是否移动这些图片的位置？ - - yes - 是 + 是 - - no - 否 + 否 @@ -1851,397 +1883,395 @@ bug description: MainWindow - + MainWindow 华高扫描软件 - + menu_file 文件 - + menu_scan 扫描 - + menu_view 视图 - + menu_Auto_Image_Size menuAuto_Image_Size 自动图片尺寸 - + menu_page 页面 - + menu_multiPages 多页 - + menu_image 图像 - + menuRotate 旋转 - + 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 自动保存 - + act_update 检查更新... - + act_feedback 意见反馈... - + act_device_log 导出设备日志 - + act_driver_log 导出驱动日志 - + act_deleteFile 删除选中项 - + HuaGoScan 华高扫描软件 - + Grid 多列显示 - + Move To... 移动到... - + Insert files 插入文件 - + nodevice 没有发现扫描仪 - - - - - - + + + + + Question 询问 - - + modified, save it? 图像已被修改。 是否保存修改？ - + file lost, remove it? 文件已丢失，是否删除？ @@ -2250,7 +2280,7 @@ bug description: 已连接 - + disconnected 已断开连接 @@ -2267,17 +2297,17 @@ bug description: 扫描完成 - + Clear, then start scan 清空并启动扫描 - + Do NOT clear, then start scan 不清空并启动扫描 - + Already exist images in image list. Do you want to clear? 图像列表中已存在图像。 @@ -2292,12 +2322,12 @@ Do you want to clear? 磁盘空间不足，请删除不需要的文件，以保证有足够的空间 - + Open images 打开图片 - + Insert images 插入图片 @@ -2310,238 +2340,238 @@ Do you want to clear? 保存失败 - + binary 黑白 - + gray 256级灰度 - + rgb 24位彩色 - - - - - - - - - - + + + + + + + + + + Please wake up the device manually 请手动唤醒设备 - + thumbnailBar enabled 显示缩略图栏 - + thumbnailBar hidden 隐藏缩略图栏 - + cancel 取消 - - - + + + save succeed 保存成功 - - + + find savePath in thumbnail 图片名在列表中已存在 - + Please select at least one picture before export 请至少选中一张图片再进行导出 - + 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. 设备正在运行！ 请先结束扫描。 - + Image processing failed 图像处理失败 - + Ocr init failed OCR初始化错误 - + Ocr failed OCR错误 - + File does not exist 文件不存在 - + Failed to load dynamic library 加载动态库失败 - + File data error 文件数据错误 - + Image format processing error 图像格式处理错误 - + Out of memory 内存不足 - + Failed 错误 - - + + The language switch is successful and takes effect the next time the software is started! 语言切换成功，下次启动软件时生效! - + Are you sure to delete selected file? 您确定彻底删除选中项文件？ + - - - - - - - - - + + + + + + + + already waked up device 已唤醒设备 @@ -2551,18 +2581,18 @@ Please finish scanning first. 就绪 + - + - folder limit 无法访问“我的文档”， 请前往“扫描至”更换可访问的扫描目录再进行扫描。 - + Insufficient access rights 文件访问权限不足 @@ -2575,47 +2605,47 @@ Please finish scanning first. 图像处理失败 - + Are you sure to close 您确定要断开设备： - + ? 吗? - - + + close 关闭 - + tip 提示 - + Other versions not available 未获取到其他版本 - - + + The device does not support this operation 设备不支持该操作 - - + + IO error IO错误 - - + + error 错误 @@ -2630,17 +2660,17 @@ Continue to close? 是否继续关闭？ - + Sure to sign out administrator account? 是否确定登出管理员账户？ - + confirm the operation 确认操作 - + Are you sure to clear the rollor acount? 你确定要清除滚轴计数吗 @@ -2649,19 +2679,19 @@ Continue to close? 请重新进入关于界面以获取最新值 - - + + <p>%1: <a href='%2'>%3</a> - - + + <p>%1: %2 - + roller number 滚轴张数 @@ -2672,13 +2702,13 @@ Continue to close? - + app name 华高扫描软件 - + success 成功 @@ -2696,20 +2726,20 @@ Continue to close? - + failed 失败 - - + + warning 警告 - - + + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. 当前路径磁盘空间不足, @@ -2720,111 +2750,111 @@ Continue to close? 配置丢失 - + apply setting 应用配置 - - - - - - - - - - + + + + + + + + + + + + - - start failed 启动失败 - + HanvonScan 汉王扫描软件 - + LanxumScan 立思辰扫描软件 - + CumtennScan 沧田扫描软件 - + MicrotekScan - Microtek DocWizard EX 扫描软件 + Microtek DocWizard EX 扫描软件 - + menu_language 语言 - + act_simpCN 简体中文 - + act_English English - + auto save 自动保存 - + when switching pictures, save the edited pictures directly without reminding 切换图片时，不提醒，直接保存编辑过的图片 - + statusBar displayed 显示状态栏 - + statusBar hidden 隐藏状态栏 - + toolBar displayed 显示工具栏 - + toolBar hidden 隐藏工具栏 - + colorInfo enabled 启用图像信息 - + colorInfo disenabled 关闭图像信息 - + enabling automatic saving 启用自动保存 - + cancel auto save 取消自动保存 @@ -2834,66 +2864,42 @@ Continue to close? 切换图片时，自动保存编辑过的图像。若想取消，请取消勾选菜单项：图像->自动保存 - - - - - - - - - - - - - yes - 确定 + 确定 - save, do not remind again - 保存，不再提醒 + 保存，不再提醒 - - - - - - - - - - no - 取消 + 取消 found device 发现设备 - + reconnected 重新连接 - + already connected, but open faild 已经连接，但打开失败 - + save image failed: 存图失败： - - + + create savepath failed: 创建文件夹失败： @@ -2902,25 +2908,25 @@ Continue to close? %1%2%3.%4 - + create image doc failed: 创建图片文件失败： - - + - + - + - + + save image doc failed: 保存图片文件失败： @@ -2930,74 +2936,74 @@ Continue to close? 启动安装程序失败！ - + There are pictures that have not been saved. Are you sure to close? 有图像未保存，确定关闭？ - + found device : %1 发现设备 : %1 - - - - - - - - - - - - - + + + + + + + + + + + + + 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. 文档丢失！文档可能已被删除或被重命名。 @@ -3038,21 +3044,21 @@ Are you sure to close? <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> @@ -3270,73 +3276,73 @@ Are you sure to close? 删除配置 - + existing configuration scheme 现有配置方案： - + change name 改名 - + delete 删除 - + apply 应用 - + delete all configurations 删除所有配置 - + confgiuration information: 配置信息： - - + + ok 确定 - + cancel 取消 - + configuration scheme management 配置方案管理 - + regional crop 区域裁剪 - + custom tone curve 自定义色调曲线 - + Please select to overwrite the original configuration: 请选择覆盖原来的配置： - + ,or add a new configuration ，或者新增配置 - + save the configuration 保存配置 @@ -3362,94 +3368,90 @@ No: add new configuration 否: 增加新的配置： - - yes - 是 + 是 - - no - 否 + 否 - + <h6><b> <h6><b> - + cover original configuration: 覆盖原来配置： - + add new configuration 新增配置 - + rename: 更名： - - - + + + tips 提示 - + scheme name cannot be empty 配置名不能为空 - - + + scheme name: 配置名： - - + + already exists 已存在 - + :</b></h6> :</b></h6> - + <p> <p> - + </p> </p> - + configuration scheme name change 配置改名 - - + + be sure to delete the configuration 确认删除配置 - + Are you sure you want to delete the configuration " 您确认要删除配置 - + " ? ？ @@ -3462,7 +3464,7 @@ No: add new configuration ’ 吗？ - + Are you sure you want to delete the configuration? 您确认要删除所有配置吗？ diff --git a/app/scanner/Scanner_zh_EN.qm b/app/scanner/Scanner_zh_EN.qm index 45fe692e..9fd1b1ac 100644 Binary files a/app/scanner/Scanner_zh_EN.qm and b/app/scanner/Scanner_zh_EN.qm differ diff --git a/app/scanner/Scanner_zh_EN.ts b/app/scanner/Scanner_zh_EN.ts index 876f8609..672ea0d4 100644 --- a/app/scanner/Scanner_zh_EN.ts +++ b/app/scanner/Scanner_zh_EN.ts @@ -396,7 +396,7 @@ - + Information Information @@ -418,48 +418,46 @@ Continue clearing? - yes - OK + OK - no - Cancel + Cancel - + Cache clear successfully. Cache cleared successfully. - + Warning Warning - + Cache clear failed or incompletely clear. Failed to clear cache or not cleared. - + Browse directory Folder path - - + + tips Prompt - + directory can not be empty File directory cannot be empty - + create cachePath failed: Failed to create cache path: @@ -516,9 +514,19 @@ The page range will be “selected pages” Compression options - - - + + ok + OK + + + + cancel + Cancel + + + + + Input is not valid. Page range will be 'Chosen Pages'. Input invalid. @@ -553,9 +561,8 @@ The page range will be “selected pages” Prompt - ok - OK + OK @@ -1337,9 +1344,8 @@ This operation will not rotate files that may include multiple pages.Prompt - ok - OK + OK @@ -1468,6 +1474,44 @@ Please make sure the two passwords are the same. Create a subfolder using the current date + + Dialog_SaveMessageBox + + + Dialog + Ask + + + + TextLabel + + + + + Yes + Yes + + + + Yes to All + + + + + No + No + + + + save, do not remind again + Save and do not prompt again + + + + modified, save it? + Image modified, save changes? + + Dialog_WriteSettings @@ -1657,29 +1701,25 @@ Please make sure the two passwords are the same. - + Question Ask - - yes - Yes + Yes - - no - No + No - + some files have been loaded, do you want to move to end? A file is loaded; move it to the end? - + some files have been loaded, do you want to move to specified location? A file is loaded; move it to the specified location? @@ -1687,459 +1727,459 @@ Please make sure the two passwords are the same. MainWindow - + MainWindow HUAGOSCAN scanning software - + menu_file File - + menu_scan Scan - + menu_view View - + menu_Auto_Image_Size Automatic image size - + menu_page Page - + menu_multiPages Multiple pages - + menu_image Image - + menuRotate Rotate - + menu_user User - + menu_info Information - + menu_device Device - + toolBar Toolbar - + act_open Open... - + act_insert Insert local file... - + act_save Save - + act_saveAs Save as... - + act_Export Export... - + act_closeFile Close selected item - + act_closeAll Close all items - + act_imageInfo Image information... - + act_exit Exit - + act_scannerSettings Scan settings - + act_acquire Scan - + act_acquireSingle Scan single page - + act_acquireInto Scan to... - + act_fullscreen Fullscreen display - + act_fitWindowSize Fit view box size - + act_fitWindowWidth Fit view box width - + act_realSize Real size - + act_zoomIn Zoom in - + act_zoomOut Zoom out - + act_toolBar ToolBar - + act_statusBar Status bar - + act_thumbnailBar Thumbnail bar - + act_colorInfo Color information - + act_previous Previous - + act_next Next - + act_first First - + act_last Last - + act_openPageNum Jump to... - + act_previousPage Previous page - + act_nextPage Next page - + act_firstPage First page - + act_lastPage Last page - + act_adjust Brightness/ contrast/ gamma... - + act_90Left Rotate 90 degrees left - + act_90Right Rotate 90 degrees right - + act_180 Rotate 180 degrees - + act_multiRotate Rotate multiple pages... - + act_autoCrop Auto crop... - + act_signIn Login... - + act_passwordChange Change password... - + act_signOut Logout - + act_log Log management... - + act_clrCache Cache settings... - + act_consume Consumable status... - + act_help Help - + act_about About... - + act_insertFromScanner Insert from scan... - + act_clearRoller Clear roller count - + act_imageEdit Image edit... - + act_sortPages Book sorting - + act_autoSave Auto save - + act_update Check for updates... - + act_feedback Opinions and feedback... - + act_device_log Export device log... - + act_driver_log Export drive log... - + act_deleteFile Delete selected item - + HanvonScan Hanvon scanning software - + LanxumScan LANXUM scanning software - + CumtennScan CUMTENN scanning software - + MicrotekScan Microtek DocWizard EX V1.0 - + HuaGoScan HUAGOSCAN scanning software - + menu_language Language - + act_simpCN 简体中文 - + act_English English - + Grid Multi-column display - + Move To... Move to... - + Insert files Insert file - + nodevice No scanner detected - + auto save Auto save - + when switching pictures, save the edited pictures directly without reminding Do not show prompt and save the edited images directly when switching images. - + statusBar displayed Show status bar - + statusBar hidden Hide status bar - + toolBar displayed Show toolbar - + toolBar hidden Hide toolbar - + colorInfo enabled Enable image information - + colorInfo disenabled Disable image information - + enabling automatic saving Enable auto save - + cancel auto save Cancel auto save @@ -2149,59 +2189,33 @@ Please make sure the two passwords are the same. Save edited images automatically when switching images. If you want to cancel, please deselect the menu item: Auto save images. - - - - - - + + + + + Question Ask - - + modified, save it? Image modified, save changes? - - - - - - - - - - - - - yes - Yes + Yes - save, do not remind again - Save, do not prompt again + Save, do not prompt again - - - - - - - - - - no - No + No - + file lost, remove it? File lost; delete? @@ -2210,380 +2224,380 @@ Please make sure the two passwords are the same. Device discovered - + found device : %1 Device discovered: %1 - + reconnected reconnect - + already connected, but open faild connected, but failed to open - + disconnected disconnected - - + + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. Insufficient disk space for the current path. Please reselect a path or clear disk space immediately. - - + + warning Warning - + save image failed: Failed to save image: - - + + create savepath failed: Failed to create folder: - + create image doc failed: Failed to create image file: - - + - + - + - + + save image doc failed: Failed to save image: - + binary Black and white - + gray Grayscale - + rgb Color - - - - - - - - - - + + + + + + + + + + + + - - start failed Failed to start - - - - - - - - - - + + + + + + + + + + Please wake up the device manually Please wake up the device manually + - - - - - - - - - + + + + + + + + already waked up device Device is awake - + thumbnailBar enabled Show thumbnail bar - + thumbnailBar hidden Hide thumbnail bar - + Clear, then start scan Clear and start scan - + Do NOT clear, then start scan Do not clear and start scan - + cancel Cancel - + Already exist images in image list. Do you want to clear? Image already exists in the list of images. Clear? - + Open images Open image - + Insert images Insert image - - - - - - - - - - - - - + + + + + + + + + + + + + tips prompt - - - + + + save succeed Saved successfully - - + + find savePath in thumbnail Image name already exists in the list - + Please select at least one picture before export Please select at least one image and then export - + File name File name - + File path File path - + File size File size - + Creation date/time Creation time - + Modified date/time Modification time - + Accessed date/time Access time - + Format Format - + Width Width - + Height Height - + depth Depth - + Color model Color mode - + DPI Pixels per inch - + Print size Print size - + Frame Frame - + None None - + Mono Black and white - + Gray Gray scale - + Color Color - + Warning Warning - + Device is Running! Please finish scanning first. Device is currently running! Please stop scanning first. - + There are pictures that have not been saved. Are you sure to close? There are unsaved images; are you sure you want to close? - + Are you sure to close? Are you sure you want to close? - + Sure to sign out administrator account? Are you sure you want to log out of the administrator account? - + confirm operation Confirm operation - + are you sure to clear the roller count? Are you sure you want to clear the roller count? - - - + + + hint Prompt - - + + Roller scanned count has been set to 0. Roller count reset to zero. - - + + Roller scanned count reset failed. Failed to reset roller count. - + Error Error - + Document missing! It would be deleted or renamed. File lost! File may be deleted or renamed. - + confirm the operation Confirm operation - + Are you sure to clear the rollor acount? Are you sure you want to clear the roller count? @@ -2596,37 +2610,37 @@ Are you sure to close? <p>%1</p><p>Version: %2<br>Copyright: &#169; %3</p><p>%4%5%6%7%8%9</p> - - + + about %1 About %1 - - + + <p>Version: %1</p> <p>Version: %1</p> - - + + <p>CopyRight: &#169; %1</p> <p>Copyright: &#169; %1</p> - - + + <p>%1: <a href='%2'>%3</a> <p>%1: <a href='%2'>%3</a> - - + + <p>%1: %2 <p>%1: %2 - + roller number Number of rollers @@ -2637,13 +2651,13 @@ Are you sure to close? - + app name HUAGOSCAN scanning software - + success successfully @@ -2654,14 +2668,14 @@ Are you sure to close? - + failed failed - - + + error Error @@ -2671,117 +2685,117 @@ Are you sure to close? Failed to start! + - + - folder limit Cannot access “My Documents”. Please go to “Scan to” and change the accessible scan folder and then perform the scan. - + Insufficient access rights Insufficient file access permissions - + Image processing failed Image processing failed - + Ocr init failed OCR initialization error - + Ocr failed OCR failed - + File does not exist File does not exist - + Failed to load dynamic library Failed to load dynamic library - + File data error File data error - + Image format processing error Image format processing error - + Out of memory Insufficient memory - + Failed Failed - + apply setting Apply configuration - + Are you sure to close Are you sure you want to disconnect device: - + ? ? - - + + close Close - + tip Prompt - + Other versions not available No other versions obtained - - + + The device does not support this operation Device does not support this operation - - + + IO error IO error - - + + The language switch is successful and takes effect the next time the software is started! The language switch is successful and takes effect the next time the software is started! - + Are you sure to delete selected file? Are you sure to delete the selected file completely? @@ -2945,170 +2959,166 @@ Please go to “Scan to” and change the accessible scan folder and then perfor hg_settingdialog - + existing configuration scheme Existing configuration plan: - + change name Rename - + delete Delete - + apply Apply - + delete all configurations Delete all configurations - + confgiuration information: Configuration information: - - + + ok OK - + cancel Cancel - + configuration scheme management Configuration plan management - + regional crop Regional crop - + custom tone curve Custom tone curve - + Please select to overwrite the original configuration: Please select overwrite original configuration: - + ,or add a new configuration , or add new configuration - + save the configuration Save configuration - + cover original configuration: Overwrite original configuration: - + add new configuration Add new configuration - + rename: Rename: - - - + + + tips Prompt - + scheme name cannot be empty Configuration name cannot be blank - - + + scheme name: Configuration name: - - + + already exists already exists - + <h6><b> <h6><b> - + :</b></h6> :</b></h6> - + <p> <p> - + </p> </p> - + configuration scheme name change Rename configuration - - + + be sure to delete the configuration Delete configuration - + Are you sure you want to delete the configuration " Are you sure you want to delete configuration - + " ? ? - - yes - Yes + Yes - - no - No + No - + Are you sure you want to delete the configuration? Are you sure you want to delete all configurations? diff --git a/app/scanner/dialog_clrcache.cpp b/app/scanner/dialog_clrcache.cpp index a66f9f6a..e9b2dc8c 100644 --- a/app/scanner/dialog_clrcache.cpp +++ b/app/scanner/dialog_clrcache.cpp @@ -54,8 +54,6 @@ void Dialog_ClrCache::on_btn_clr_clicked() QMessageBox msg(QMessageBox::Question, tr("Question"), tr("Main window contains temporary files, clear cache would remove all of them.\n Continue to clear?"), QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if (msg.clickedButton() != msg.button(QMessageBox::Yes)) { diff --git a/app/scanner/dialog_exportimagefile.cpp b/app/scanner/dialog_exportimagefile.cpp index 5a73d79f..342aba9f 100644 --- a/app/scanner/dialog_exportimagefile.cpp +++ b/app/scanner/dialog_exportimagefile.cpp @@ -282,7 +282,6 @@ void Dialog_ExportImageFile::on_finish(int ret) { QString str = (ret == HGBASE_ERR_OK) ? tr("export succeed") : tr("export failed: ") + MainWindow::getLogInfo(ret); QMessageBox msg(QMessageBox::Information, tr("tip"), str, QMessageBox::Ok, this); - msg.setButtonText(QMessageBox::Ok, tr("ok")); close(); msg.exec(); } diff --git a/app/scanner/dialog_multirotateimagefile.cpp b/app/scanner/dialog_multirotateimagefile.cpp index c5350a17..a30569dd 100644 --- a/app/scanner/dialog_multirotateimagefile.cpp +++ b/app/scanner/dialog_multirotateimagefile.cpp @@ -138,7 +138,6 @@ void Dialog_MultiRotateImageFile::on_finish(int ret) { QString str = (ret == HGBASE_ERR_OK) ? tr("operation success") : tr("multirotate operation failed: ") + MainWindow::getLogInfo(ret); QMessageBox msg(QMessageBox::Information, tr("tip"), str, QMessageBox::Ok, this); - msg.setButtonText(QMessageBox::Ok, tr("ok")); close(); msg.exec(); } diff --git a/app/scanner/dialog_savemessagebox.cpp b/app/scanner/dialog_savemessagebox.cpp new file mode 100644 index 00000000..08ff20fb --- /dev/null +++ b/app/scanner/dialog_savemessagebox.cpp @@ -0,0 +1,36 @@ +#include "dialog_savemessagebox.h" +#include "ui_dialog_savemessagebox.h" + +Dialog_SaveMessageBox::Dialog_SaveMessageBox(QWidget *parent) : + QDialog(parent), + ui(new Ui::Dialog_SaveMessageBox) +{ + ui->setupUi(this); + + setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); + ui->pbtn_yesToAll->setText(tr("save, do not remind again")); + ui->label->setText(tr("modified, save it?")); +} + +Dialog_SaveMessageBox::~Dialog_SaveMessageBox() +{ + delete ui; +} + +void Dialog_SaveMessageBox::on_pbtn_yes_clicked() +{ + m_result = result_Yes; + accept(); +} + +void Dialog_SaveMessageBox::on_pbtn_yesToAll_clicked() +{ + m_result = result_YesToAll; + accept(); +} + +void Dialog_SaveMessageBox::on_pbtn_No_clicked() +{ + m_result = result_No; + reject(); +} diff --git a/app/scanner/dialog_savemessagebox.h b/app/scanner/dialog_savemessagebox.h new file mode 100644 index 00000000..94e7ce75 --- /dev/null +++ b/app/scanner/dialog_savemessagebox.h @@ -0,0 +1,39 @@ +#ifndef DIALOG_SAVEMESSAGEBOX_H +#define DIALOG_SAVEMESSAGEBOX_H + +#include + +namespace Ui { +class Dialog_SaveMessageBox; +} + +class Dialog_SaveMessageBox : public QDialog +{ + Q_OBJECT + +public: + explicit Dialog_SaveMessageBox(QWidget *parent = nullptr); + ~Dialog_SaveMessageBox(); + +enum Result +{ + result_Yes = 0, + result_YesToAll, + result_No +}; + + Result m_result; + + +private slots: + void on_pbtn_yes_clicked(); + + void on_pbtn_yesToAll_clicked(); + + void on_pbtn_No_clicked(); + +private: + Ui::Dialog_SaveMessageBox *ui; +}; + +#endif // DIALOG_SAVEMESSAGEBOX_H diff --git a/app/scanner/dialog_savemessagebox.ui b/app/scanner/dialog_savemessagebox.ui new file mode 100644 index 00000000..56f5502f --- /dev/null +++ b/app/scanner/dialog_savemessagebox.ui @@ -0,0 +1,109 @@ + + + Dialog_SaveMessageBox + + + + 0 + 0 + 387 + 104 + + + + Dialog + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + TextLabel + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Yes + + + + + + + Yes to All + + + + + + + No + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + diff --git a/app/scanner/hg_settingdialog.cpp b/app/scanner/hg_settingdialog.cpp index 05755e47..94a8e18f 100644 --- a/app/scanner/hg_settingdialog.cpp +++ b/app/scanner/hg_settingdialog.cpp @@ -1914,8 +1914,6 @@ void hg_settingdialog::slot_pushButton_scheme_management(void) QMessageBox msg(QMessageBox::Question, tr("be sure to delete the configuration"), tr("Are you sure you want to delete the configuration \"") + text + tr("\" ?"), QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if (msg.clickedButton() != msg.button(QMessageBox::Yes)) return; @@ -1938,8 +1936,6 @@ void hg_settingdialog::slot_pushButton_scheme_management(void) { QMessageBox msg(QMessageBox::Question, tr("be sure to delete the configuration"), tr("Are you sure you want to delete the configuration?"), QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if (msg.clickedButton() != msg.button(QMessageBox::Yes)) return; diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index ed1df0ef..e0941cd9 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -32,6 +32,7 @@ #include "dialog_upgrade.h" #include "dialog_feedback.h" #include "dialog_upgradefirmware.h" +#include "dialog_savemessagebox.h" #include "hg_settingdialog.h" #include "base/HGInfo.h" #include "huagao/hgscanner_error.h" @@ -613,30 +614,32 @@ void MainWindow::on_currItemChanged(int index) bool save = false; if(auto_save_changes_) { - // 閸掑洦宕查崶鍓у閺冭绱濋懛顏勫З娣囨繂鐡ㄧ紓鏍帆鏉╁洨娈戦崶鎯у剼閵嗗倽瀚㈤幆鍐插絿濞戝牞绱濈拠宄板絿濞戝牆瀣€闁褰嶉崡鏇€嶉敍姘禈閸?>閼奉亜濮╂穱婵嗙摠 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; } - else { - QMessageBox msg(QMessageBox::Question, tr("Question"), - tr("modified, save it?"), - QMessageBox::Yes | QMessageBox::No | QMessageBox::YesToAll, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - 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)) + else + { + Dialog_SaveMessageBox dlg(this); + if (dlg.exec()) { - m_modify = false; - } - else { - save = true; - auto_save_changes_ = msg.clickedButton() == msg.button(QMessageBox::YesToAll); - if(auto_save_changes_) + if (dlg.m_result == dlg.result_Yes) + { + save = true; + } + else if (dlg.m_result == dlg.result_YesToAll) + { + save = true; + auto_save_changes_ = true; ui->act_autoSave->setChecked(true); + } + else if (dlg.m_result == dlg.result_No) + { + m_modify = false; + } } } + if(save) { save_from_changed_ = true; @@ -677,8 +680,6 @@ void MainWindow::on_currItemChanged(int index) QMessageBox msg(QMessageBox::Question, tr("Question"), tr("file lost, remove it?"), QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if (msg.clickedButton() == msg.button(QMessageBox::Yes)) { @@ -1698,8 +1699,6 @@ void MainWindow::startSaveMessageBox(QWidget* parent) QMessageBox msg(QMessageBox::Question, tr("Question"), tr("modified, save it?"), QMessageBox::Yes | QMessageBox::No, parent); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if (msg.clickedButton() != msg.button(QMessageBox::Yes)) { @@ -2493,8 +2492,6 @@ void MainWindow::closeEvent(QCloseEvent *e) QMessageBox msg(QMessageBox::Question, tr("Question"), tr("There are pictures that have not been saved.\nAre you sure to close?"), QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if (msg.clickedButton() != msg.button(QMessageBox::Yes)) { @@ -2507,8 +2504,6 @@ void MainWindow::closeEvent(QCloseEvent *e) QMessageBox msg(QMessageBox::Question, tr("tips"), tr("Are you sure to close?"), QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if (msg.clickedButton() != msg.button(QMessageBox::Yes)) { @@ -2942,8 +2937,6 @@ void MainWindow::on_act_signOut_triggered() QMessageBox msg(QMessageBox::Question, tr("Question"), tr("Sure to sign out administrator account?"), QMessageBox::Yes | QMessageBox::No); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if(msg.clickedButton() == msg.button(QMessageBox::Yes)) { @@ -2997,8 +2990,6 @@ void MainWindow::on_act_clearRoller_triggered() QMessageBox msg(QMessageBox::Question, tr("confirm operation"), tr("are you sure to clear the roller count?"), QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if(msg.clickedButton() != msg.button(QMessageBox::Yes)) return; @@ -3085,8 +3076,6 @@ void MainWindow::my_url_handler(const QUrl& url) QMessageBox msg(QMessageBox::Question, tr("confirm the operation"), tr("Are you sure to clear the rollor acount?"), QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if(msg.clickedButton() == msg.button(QMessageBox::Yes)) { @@ -3136,6 +3125,7 @@ void MainWindow::on_act_about_triggered() info.push_back(tr("

CopyRight: © %1

").arg(QString::fromStdString(about->copyright))); const char* cmp[] = { + BRAND_TITLE_DEVICE_MODEL, about->version, BRAND_TITLE_FIRM_VERSION, BRAND_TITLE_SERIAL_NUM, @@ -3874,7 +3864,6 @@ void MainWindow::upgradeApp(QString pkgPath) QMessageBox msg(QMessageBox::Critical, tr("error"), tr("start failed!"), QMessageBox::Ok, this); - msg.setButtonText(QMessageBox::Ok, tr("yes")); msg.exec(); } } @@ -4215,8 +4204,6 @@ void MainWindow::on_scanOptions_changed(const QString &device, const QString &op QMessageBox msg(QMessageBox::Question, title, tr("Are you sure to close ") + device + tr(" ?"), QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if(msg.clickedButton() == msg.button(QMessageBox::Yes)) { @@ -4383,7 +4370,6 @@ void MainWindow::on_act_simpCN_triggered() QMessageBox msg(QMessageBox::Information, tr("tips"), tr("The language switch is successful and takes effect the next time the software is started!"), QMessageBox::Ok, this); - msg.setButtonText(QMessageBox::Ok, tr("yes")); msg.exec(); } @@ -4403,7 +4389,6 @@ void MainWindow::on_act_English_triggered() QMessageBox msg(QMessageBox::Information, tr("tips"), tr("The language switch is successful and takes effect the next time the software is started!"), QMessageBox::Ok, this); - msg.setButtonText(QMessageBox::Ok, tr("yes")); msg.exec(); } @@ -4442,8 +4427,6 @@ void MainWindow::on_act_deleteFile_triggered() QMessageBox msg(QMessageBox::Question, tr("tips"), tr("Are you sure to delete selected file?"), QMessageBox::Yes | QMessageBox::No, this); - msg.setButtonText(QMessageBox::Yes, tr("yes")); - msg.setButtonText(QMessageBox::No, tr("no")); msg.exec(); if (msg.clickedButton() == msg.button(QMessageBox::Yes)) { diff --git a/app/upgrade/main.cpp b/app/upgrade/main.cpp index ce11f08c..ad53d916 100644 --- a/app/upgrade/main.cpp +++ b/app/upgrade/main.cpp @@ -101,7 +101,6 @@ int main(int argc, char *argv[]) QMessageBox msg(QMessageBox::Information, QObject::tr("tip"), QObject::tr("install succeed!"), QMessageBox::Ok); - msg.setButtonText(QMessageBox::Ok, QObject::tr("yes")); msg.exec(); if (!AppIsRun(appName)) @@ -112,7 +111,6 @@ int main(int argc, char *argv[]) QMessageBox msg(QMessageBox::Critical, QObject::tr("error"), QObject::tr("install failed!") + "\n" + w.getUpgradeFailInfo(), QMessageBox::Ok); - msg.setButtonText(QMessageBox::Ok, QObject::tr("yes")); msg.exec(); } }