From e545199cf960a6b55bee0c6519eb5351ac13ae7d Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Fri, 22 Jul 2022 11:51:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=89=88=E6=9C=AC=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E4=BF=A1=E6=81=AF=E7=9A=84=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=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.ts | 326 +++++++++++++++++---------------- app/scanner/dialog_upgrade.cpp | 15 +- app/scanner/qt_zh_CN.ts | 24 ++- app/upgrade/Upgrade_zh_CN.qm | Bin 180 -> 434 bytes app/upgrade/Upgrade_zh_CN.ts | 32 +++- app/upgrade/main.cpp | 12 +- app/upgrade/mainwindow.cpp | 2 +- app/upgrade/mainwindow.h | 3 +- 8 files changed, 244 insertions(+), 170 deletions(-) diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index dea37f62..74fa3e88 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -1544,42 +1544,60 @@ Please make sure the two passwords are the same. 取消 - + upgrade online 检查更新 - upgrade contents: - 升级内容： + 升级内容： - bug description: - 错误描述： + 错误描述： - + + bug description: + + + + + + + upgrade contents: + + + + + + +bug description: + + + + + The current version is the latest! The current version number is : 当前为最新版本！版本号为： - + Discover the new version : 发现新版本： - + ,the current version is : ，当前版本为： - + tip 提示 - + Already in current version 当前版本已安装！ @@ -2003,46 +2021,46 @@ Please make sure the two passwords are the same. 华高扫描软件 - + Grid 多列显示 - + Move To... 移动到... - + Insert files 插入文件 - - - + + + nodevice 没有发现扫描仪 - - - - - - + + + + + + Question 警告 - - + + modified, save it? 图像已被修改。 是否保存修改？ - + file lost, remove it? 文件已丢失，是否删除？ @@ -2051,7 +2069,7 @@ Please make sure the two passwords are the same. 已连接 - + disconnected 已断开连接 @@ -2068,189 +2086,189 @@ 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 关闭 - + error 错误 - + get versionlist failed 获取版本列表错误 @@ -2261,115 +2279,115 @@ 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 启动失败 @@ -2384,135 +2402,135 @@ Continue to close? 立思辰扫描软件 - + 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. 文档丢失！文档可能已被删除或被重命名。 @@ -2545,28 +2563,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> diff --git a/app/scanner/dialog_upgrade.cpp b/app/scanner/dialog_upgrade.cpp index 4ec53d3c..0a7c15e9 100644 --- a/app/scanner/dialog_upgrade.cpp +++ b/app/scanner/dialog_upgrade.cpp @@ -28,7 +28,20 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers { QListWidgetItem *listwidgetItem = new QListWidgetItem; listwidgetItem->setText(QString(m_versionInfo[i].version)); - listwidgetItem->setToolTip(tr("upgrade contents: ") + m_versionInfo[i].desc + tr(" bug description: ") + m_versionInfo[i].bugInfo); + + if(m_versionInfo[i].desc[0] == '\0' && m_versionInfo[i].bugInfo[0] != '\0') + { + listwidgetItem->setToolTip(tr("bug description: \n") + m_versionInfo[i].bugInfo); + } + if(m_versionInfo[i].bugInfo[0] == '\0' && m_versionInfo[i].desc[0] != '\0') + { + listwidgetItem->setToolTip(tr("upgrade contents: \n") + m_versionInfo[i].desc); + } + if(m_versionInfo[i].desc[0] != '\0' && m_versionInfo[i].bugInfo[0] != '\0') + { + listwidgetItem->setToolTip(tr("upgrade contents: \n") + m_versionInfo[i].desc + tr("\nbug description: \n") + m_versionInfo[i].bugInfo); + } + ui->listWidget->addItem(listwidgetItem); } diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts index 23122570..63f7a329 100644 --- a/app/scanner/qt_zh_CN.ts +++ b/app/scanner/qt_zh_CN.ts @@ -1236,14 +1236,6 @@ Please make sure the two passwords are the same. upgrade online - - upgrade contents: - - - - bug description: - - The current version is the latest! The current version number is : @@ -1264,6 +1256,22 @@ Please make sure the two passwords are the same. Already in current version + + bug description: + + + + + upgrade contents: + + + + + +bug description: + + + GraphicsScene diff --git a/app/upgrade/Upgrade_zh_CN.qm b/app/upgrade/Upgrade_zh_CN.qm index 32376ae9259f33a9aae3715f60909c7988abc3e3..68920b6cf7067f2f70cbfb69b1e66779e2abe69b 100644 GIT binary patch literal 434 zcmcE7ks@*G{hX<16=n7(EZlq7iGhK^f`OqLNHIz=Fw`Fg(zXmaGn0S7LnLxz}%s>W9bZ5s=4v-KV5c7EE6_+ID?FyNB3I#>^=|!o<#X1TF zIjM=osS4$ZnI(F9df1F+nJU@+9&QwCYEe;s5l9_-pnp - + Installation 安装 - + Installation in progress, please wait... 安装中，请稍候... + + QObject + + + tip + 提示 + + + + install succeed! + 安装成功！ + + + + yes + 确定 + + + + error + 错误 + + + + install failed! + 安装失败！ + + diff --git a/app/upgrade/main.cpp b/app/upgrade/main.cpp index cc64de99..8990ad3b 100644 --- a/app/upgrade/main.cpp +++ b/app/upgrade/main.cpp @@ -68,14 +68,22 @@ int main(int argc, char *argv[]) if (w.isInstallSuccess()) { - QMessageBox::information(nullptr, QObject::tr("tip"), QObject::tr("install succeed!")); + 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)) RunApp(appName); } else { - QMessageBox::critical(nullptr, QObject::tr("error"), QObject::tr("install failed!")); + QMessageBox msg(QMessageBox::Critical, QObject::tr("error"), + QObject::tr("install failed!"), + QMessageBox::Ok); + msg.setButtonText(QMessageBox::Ok, QObject::tr("yes")); + msg.exec(); } } diff --git a/app/upgrade/mainwindow.cpp b/app/upgrade/mainwindow.cpp index 4ea91308..d13d7057 100644 --- a/app/upgrade/mainwindow.cpp +++ b/app/upgrade/mainwindow.cpp @@ -86,7 +86,7 @@ void MainWindow::ThreadFunc(HGThread thread, HGPointer param) { (void)thread; MainWindow* p = (MainWindow*)param; - p->m_success = p->Upgrade(p->m_pkgPath); + p->m_success = Upgrade(p->m_pkgPath); emit p->closeWnd(); } diff --git a/app/upgrade/mainwindow.h b/app/upgrade/mainwindow.h index 8c06f406..7468d40b 100644 --- a/app/upgrade/mainwindow.h +++ b/app/upgrade/mainwindow.h @@ -20,10 +20,9 @@ public: signals: void closeWnd(); - void upgradeResult(); private: - bool Upgrade(const std::string& pkgPath); + static bool Upgrade(const std::string& pkgPath); static void ThreadFunc(HGThread thread, HGPointer param); private: