diff --git a/app/scanner2/Scanner_zh_CN.qm b/app/scanner2/Scanner_zh_CN.qm
index fb603370..688a08ec 100644
Binary files a/app/scanner2/Scanner_zh_CN.qm and b/app/scanner2/Scanner_zh_CN.qm differ
diff --git a/app/scanner2/Scanner_zh_CN.ts b/app/scanner2/Scanner_zh_CN.ts
index 94599301..f933c84b 100644
--- a/app/scanner2/Scanner_zh_CN.ts
+++ b/app/scanner2/Scanner_zh_CN.ts
@@ -11,30 +11,30 @@
DeviceUser
-
-
-
-
+
+
+
+
选择日志保存路径
-
-
-
-
+
+
+
+
文本文件(*.txt)
-
-
+
+
提示
-
-
+
+
没有找到扫描仪!
@@ -627,38 +627,43 @@ Page range will be "Chosen Pages".
多页保存(TIFF/PDF/OFD/GIF/RTF)
-
-
-
+
+
+
输入无效。
页码范围将是“被选页码”
-
+
+
+ 询问
+
+
+
+
+ 文件已存在,是否替换?
+
+
- 英语
+ 英语
-
- 中文(简体)
+ 中文(简体)
-
- 中文(繁体)
+ 中文(繁体)
-
- 日文
+ 日文
-
- 韩文
+ 韩文
@@ -674,17 +679,17 @@ Page range will be 'Chosen Pages'.
停止导出
-
+
导出失败:
-
+
提示
-
+
导出完成
@@ -1303,12 +1308,12 @@ Page range will be 'Chosen Pages'.
配置改名
-
+
提示
-
+
内容不能为空
@@ -1576,17 +1581,17 @@ This operation will NOT rotate the files that may contain multiple pages, such a
停止多页旋转
-
+
操作成功
-
+
多页旋转操作失败:
-
+
提示
@@ -1727,34 +1732,39 @@ Please make sure the two passwords are the same.
OCR类型:
-
+
保存
-
+
+
+ 询问
+
+
+
+
+ 文件已存在,是否替换?
+
+
- 英语
+ 英语
-
- 中文(简体)
+ 中文(简体)
-
- 中文(繁体)
+ 中文(繁体)
-
- 日文
+ 日文
-
- 韩文
+ 韩文
@@ -2219,7 +2229,7 @@ bug description:
-
+
扫描至...
@@ -2449,22 +2459,22 @@ bug description:
选择设备源...
-
+
华高扫描软件
-
+
多列显示
-
+
移动到...
-
+
插入文件
@@ -2473,22 +2483,22 @@ bug description:
没有发现扫描仪
-
-
-
-
-
+
+
+
+
+
询问
-
+
图像已被修改。
是否保存修改?
-
+
文件已丢失,是否删除?
@@ -2513,17 +2523,17 @@ bug description:
扫描完成
-
+
清空并启动扫描
-
+
不清空并启动扫描
-
+
图像列表中已存在图像。
@@ -2538,12 +2548,12 @@ Do you want to clear?
磁盘空间不足,请删除不需要的文件,以保证有足够的空间
-
+
打开图片
-
+
插入图片
@@ -2556,17 +2566,17 @@ Do you want to clear?
保存失败
-
+
黑白
-
+
256级灰度
-
+
24位彩色
@@ -2575,24 +2585,24 @@ Do you want to clear?
请手动唤醒设备
-
+
紫光扫描软件
-
+
扫描软件
-
+
得力扫描软件
-
-
-
+
+
+
请前往菜单栏“扫描->选择设备源...”选择设备
@@ -2601,229 +2611,234 @@ Do you want to clear?
未找到设备源!
-
-
+
+
默认配置方案
-
+
本次扫描完成,是否继续扫描?
-
+
显示缩略图栏
-
+
隐藏缩略图栏
-
+
取消
-
-
-
+
+
+
保存成功
-
-
+
+
+
图片名在列表中已存在
-
+
请至少选中一张图片再进行导出
-
+
文件名
-
+
文件路径
-
+
文件大小
-
+
创建时间
-
+
修改时间
-
+
访问时间
-
+
格式
-
+
宽度
-
+
高度
-
+
深度
-
+
色彩模式
-
+
每英寸像素点
-
+
打印尺寸
-
+
帧
-
+
无
-
+
黑白
-
+
灰度
-
+
彩色
-
+
不支持
-
+
警告
-
+
设备正在运行!
请先结束扫描。
-
+
<p>售后电话: %1</p>
-
+
<p>公司地图定位: <a href="%1">%2</a></p>
-
+
+
+
设备已断开
-
+
打开失败
-
-
-
-
+
+
+
+
+
+
提示
-
+
<p>版本号: %1</p>
-
-
-
+
+
+
<p>制造商: %1</p>
-
-
-
+
+
+
<p>版权信息: %1</p>
-
-
-
+
+
+
<p>Company website: <a href=%1>%1</p>
<p>公司网址: <a href="%1">%1</p>
-
-
-
+
+
+
<p>公司地址: %1</p>
-
-
-
+
+
+
<p>公司电话: %1</p>
-
+
百度地图访问
@@ -2844,8 +2859,8 @@ Please finish scanning first.
扫描张数: %1
-
-
+
+
设备 %1 已打开
@@ -2854,76 +2869,76 @@ Please finish scanning first.
关于
-
+
无法访问当前缓存路径:%1
请尝试在【用户】菜单登录管理员账户,前往【缓存设置】更改缓存路径。
-
+
无法访问当前缓存路径:%1
请尝试在【扫描到】更改缓存路径。
-
+
图像处理失败
-
+
OCR初始化错误
-
+
OCR错误
-
+
文件不存在
-
+
加载动态库失败
-
+
文件数据错误
-
+
图像格式处理错误
-
+
内存不足
-
+
错误
-
+
纸轮搓纸次数已超过设计使用范围,扫描过程中搓纸失败、歪斜、搓多张等异常频次可能会明显增多,
请注意及时清洁、并联系设备供应商购买替换纸轮!
-
-
+
+
语言切换成功,下次启动软件时生效!
-
+
您确定彻底删除选中项文件?
@@ -2941,7 +2956,7 @@ Please finish scanning first.
请尝试在【用户】菜单登录管理员账户,前往【缓存设置】更改缓存路径
-
+
文件访问权限不足
@@ -2966,18 +2981,18 @@ Please finish scanning first.
关闭
-
+
提示
-
+
未获取到其他版本
-
-
+
+
操作失败
@@ -2986,8 +3001,8 @@ Please finish scanning first.
IO错误
-
-
+
+
错误
@@ -3002,7 +3017,7 @@ Continue to close?
是否继续关闭?
-
+
是否确定登出管理员账户?
@@ -3072,92 +3087,92 @@ Continue to close?
启动失败
-
+
汉王扫描软件
-
+
立思辰扫描软件
-
+
沧田扫描软件
-
+
Microtek DocWizard EX 扫描软件
-
+
语言
-
+
简体中文
-
+
English
-
+
自动保存
-
+
切换图片时,不提醒,直接保存编辑过的图片
-
+
显示状态栏
-
+
隐藏状态栏
-
+
显示工具栏
-
+
隐藏工具栏
-
+
启用图像信息
-
+
关闭图像信息
-
+
启用自动保存
-
+
取消自动保存
-
+
切换图片时,自动保存编辑过的图像。若想取消,请取消勾选菜单项:图像->自动保存
@@ -3202,12 +3217,12 @@ Continue to close?
创建图片文件失败:
-
-
-
-
-
-
+
+
+
+
+
+
保存图片文件失败:
@@ -3246,17 +3261,17 @@ Continue to close?
滚轴张数: %1
-
+
检测到磁盘空间已不足1GB,是否继续?
-
+
启动安装程序失败!
-
+
有图像未保存,确定关闭?
@@ -3266,39 +3281,40 @@ Are you sure to close?
发现设备 : %1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
提示
-
+
确定关闭应用软件?
-
+
确认操作
-
+
您确定要清除滚轴计数吗
@@ -3307,22 +3323,22 @@ Are you sure to close?
提示
-
+
辊轴计数已置零
-
+
重置滚轴计数失败
-
+
错误
-
+
文档丢失!文档可能已被删除或被重命名。
@@ -3363,7 +3379,7 @@ Are you sure to close?
<p>%1</p><p>版本: %2<br>版权: © %3</p><p>%4%5%6%7%8%9</p>
-
+
关于 %1
@@ -3390,7 +3406,7 @@ Are you sure to close?
QObject
- 错误
+ 错误
@@ -3405,7 +3421,7 @@ Are you sure to close?
Widget
- 坐标轴
+ 坐标轴
diff --git a/app/scanner2/Scanner_zh_EN.qm b/app/scanner2/Scanner_zh_EN.qm
index 67c49ebb..27a83c03 100644
Binary files a/app/scanner2/Scanner_zh_EN.qm and b/app/scanner2/Scanner_zh_EN.qm differ
diff --git a/app/scanner2/Scanner_zh_EN.ts b/app/scanner2/Scanner_zh_EN.ts
index ea8e412d..bd20cdf9 100644
--- a/app/scanner2/Scanner_zh_EN.ts
+++ b/app/scanner2/Scanner_zh_EN.ts
@@ -39,30 +39,30 @@
DeviceUser
-
-
-
-
+
+
+
+
Select log file path
-
-
-
-
+
+
+
+
Text(*.txt)
-
-
+
+
Prompt
-
-
+
+
Scanner not found!
@@ -629,38 +629,43 @@ The page range will be “selected pages”
Cancel
-
-
-
+
+
+
Input invalid.
The page range will be “selected pages”
-
+
+
+ Ask
+
+
+
+
+ The file already exists. Do you want to overwrite it?
+
+
- English
+ English
-
- Simplified Chinese
+ Simplified Chinese
-
- Traditional Chinese
+ Traditional Chinese
-
- Japanese
+ Japanese
-
- Korean
+ Korean
@@ -676,17 +681,17 @@ The page range will be “selected pages”
Stop exporting
-
+
Export completed
-
+
Export failed:
-
+
Prompt
@@ -1249,12 +1254,12 @@ The page range will be “selected pages”
Rename configuration
-
+
Prompt
-
+
The content can not be empty
@@ -1514,17 +1519,17 @@ This operation will not rotate files that may include multiple pages.Stop batch rotate
-
+
Operation successful
-
+
Multi-stream rotation operation failed:
-
+
Prompt
@@ -1664,34 +1669,39 @@ Please make sure the two passwords are the same.
OCR type:
-
+
Save
-
+
+
+ Ask
+
+
+
+
+ The file already exists. Do you want to overwrite it?
+
+
- English
+ English
-
- Simplified Chinese
+ Simplified Chinese
-
- Traditional Chinese
+ Traditional Chinese
-
- Japanese
+ Japanese
-
- Korean
+ Korean
@@ -2075,7 +2085,7 @@ Please make sure the two passwords are the same.
-
+
Scan to...
@@ -2305,62 +2315,62 @@ Please make sure the two passwords are the same.
Select device source...
-
+
Hanvon scanning software
-
+
LANXUM scanning software
-
+
CUMTENN scanning software
-
+
Microtek DocWizard EX V1.0
-
+
Deli scanning software
-
+
HUAGOSCAN scanning software
-
+
Language
-
+
简体中文
-
+
English
-
+
Multi-column display
-
+
Move to...
-
+
Insert file
@@ -2369,76 +2379,76 @@ Please make sure the two passwords are the same.
No scanner detected
-
+
Auto save
-
+
Do not show prompt and save the edited images directly when switching images.
-
+
Show status bar
-
+
Hide status bar
-
+
Show toolbar
-
+
Hide toolbar
-
+
Enable image information
-
+
Disable image information
-
+
Enable auto save
-
+
Cancel auto save
-
+
Save edited images automatically when switching images. If you want to cancel, please deselect the menu item: Auto save images.
-
-
-
-
-
+
+
+
+
+
Ask
-
+
This scan is complete. Do you want to continue scanning?
-
+
Image modified, save changes?
@@ -2455,7 +2465,7 @@ Please make sure the two passwords are the same.
No
-
+
File lost; delete?
@@ -2501,34 +2511,34 @@ Please reselect a path or clear disk space immediately.
Failed to create image file:
-
-
-
-
-
-
+
+
+
+
+
+
Failed to save image:
-
+
Black and white
-
-
-
+
+
+
Please go to the menu bar 'Scan ->Select device source...' to select a device
-
+
Grayscale
-
+
Color
@@ -2537,13 +2547,13 @@ Please reselect a path or clear disk space immediately.
Failed to start
-
+
UNI scanning software
-
-
+
+
Default scheme
@@ -2552,7 +2562,7 @@ Please reselect a path or clear disk space immediately.
Please wake up the device manually
-
+
Scanning software
@@ -2561,267 +2571,273 @@ Please reselect a path or clear disk space immediately.
Device is awake
-
+
Show thumbnail bar
-
+
Hide thumbnail bar
-
+
Clear and start scan
-
+
Do not clear and start scan
-
+
Cancel
-
+
Image already exists in the list of images.
Clear?
-
+
Open image
-
+
Insert image
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
prompt
-
-
-
+
+
+
Saved successfully
-
-
+
+
+
Image name already exists in the list
-
+
Please select at least one image and then export
-
+
File name
-
+
File path
-
+
File size
-
+
Creation time
-
+
Modification time
-
+
Access time
-
+
Format
-
+
Width
-
+
Height
-
+
Depth
-
+
Color mode
-
+
Pixels per inch
-
+
Print size
-
+
Frame
-
+
None
-
+
Black and white
-
+
Gray scale
-
+
Color
-
+
Not supported
-
+
Warning
-
+
Device is currently running!
Please stop scanning first.
-
+
There are unsaved images; are you sure you want to close?
-
+
Are you sure you want to close?
-
+
Are you sure you want to log out of the administrator account?
-
+
<p>After-sale telephone: %1</p>
-
+
<p>Company Location: <a href="%1">%2</a></p>
-
+
+
+
Device is offline
-
+
Open failed
-
+
The paper roller has reached its service life, and the frequency of abnormalities during the scanning process may increase.
Please contact the equipment supplier promptly to purchase a replacement paper roller!
-
-
-
-
+
+
+
+
+
+
Prompt
-
+
<p>Version: %1</p>
-
-
-
+
+
+
<p>Manufacturer: %1</p>
-
-
-
+
+
+
<p>Copyright: %1</p>
-
-
-
+
+
+
<p>Company website: <a href=%1>%1</p>
<p>Website: <a href="%1">%1</p>
@@ -2831,21 +2847,21 @@ Please contact the equipment supplier promptly to purchase a replacement paper r
Device source not found!
-
-
-
+
+
+
<p>Address: %1</p>
-
-
-
+
+
+
<p>Phone Number: %1</p>
-
+
Baidu map access
@@ -2900,23 +2916,23 @@ Please contact the equipment supplier promptly to purchase a replacement paper r
Total count: %1
-
+
Detected that there is less than 1GB of disk space. Do you want to continue?
-
-
+
+
Device %1 is open
-
+
Confirm operation
-
+
Are you sure you want to clear the roller count?
@@ -2925,22 +2941,22 @@ Please contact the equipment supplier promptly to purchase a replacement paper r
Prompt
-
+
Roller count reset to zero.
-
+
Failed to reset roller count.
-
+
Error
-
+
File lost! File may be deleted or renamed.
@@ -2957,13 +2973,13 @@ Please contact the equipment supplier promptly to purchase a replacement paper r
About
-
+
Unable to access the current path:%1
Please try to log in to the administrator account in the [User] menu and go to the [Cache settings] to change the cache path.
-
+
Unable to access the current path:%1
Please try to change the cache path in [Scan to].
@@ -2977,7 +2993,7 @@ Please try to change the cache path in [Scan to].
<p>%1</p><p>Version: %2<br>Copyright: © %3</p><p>%4%5%6%7%8%9</p>
-
+
About %1
@@ -3022,13 +3038,13 @@ Please try to change the cache path in [Scan to].
failed
-
-
+
+
Error
-
+
Failed to start!
@@ -3038,52 +3054,52 @@ Please try to change the cache path in [Scan to].
Please go to “Scan to” and change the accessible scan folder and then perform the scan.
-
+
Insufficient file access permissions
-
+
Image processing failed
-
+
OCR initialization error
-
+
OCR failed
-
+
File does not exist
-
+
Failed to load dynamic library
-
+
File data error
-
+
Image format processing error
-
+
Insufficient memory
-
+
Failed
@@ -3104,18 +3120,18 @@ Please go to “Scan to” and change the accessible scan folder and then perfor
Close
-
+
Prompt
-
+
No other versions obtained
-
-
+
+
Operation failed
@@ -3124,13 +3140,13 @@ Please go to “Scan to” and change the accessible scan folder and then perfor
IO error
-
-
+
+
The language switch is successful and takes effect the next time the software is started!
-
+
Are you sure to delete the selected file completely?
@@ -3150,7 +3166,7 @@ Please go to “Scan to” and change the accessible scan folder and then perfor
Widget
- Coordinate axis
+ Coordinate axis
diff --git a/app/scanner2/dialog_export.cpp b/app/scanner2/dialog_export.cpp
index a7209202..ee9c56b3 100644
--- a/app/scanner2/dialog_export.cpp
+++ b/app/scanner2/dialog_export.cpp
@@ -190,18 +190,20 @@ void Dialog_Export::on_dialog_accepted()
assert(!extName.isEmpty());
- bool warning = true;
QString selectedFile = ui->fileDialog->selectedFiles()[0];
int pos = selectedFile.lastIndexOf('/');
if (-1 != pos)
{
QString path = selectedFile.left(pos + 1);
QString name = selectedFile.right(selectedFile.count() - pos - 1);
- pos = name.lastIndexOf('.');
- if (-1 != pos
- && is_support_file_type(name.right(name.length() - pos)))
+
+#if defined (HG_CMP_MSC)
+ if (name.endsWith(extName, Qt::CaseInsensitive))
+#else
+ if (name.endsWith(extName, Qt::CaseSensitive))
+#endif
{
- warning = false; // 带扩展名,系统已经警告同名文件
+ pos = name.lastIndexOf('.');
name = name.left(pos);
}
@@ -215,8 +217,11 @@ void Dialog_Export::on_dialog_accepted()
QFile file(m_savePath + m_saveName + m_saveExt);
if (file.exists())
{
- int ret = QMessageBox::question(this, tr("Question"), tr("The file already exists. Do you want to overwrite it?"));
- if (ret != QMessageBox::Yes)
+ QMessageBox msg(QMessageBox::Question, tr("Question"),
+ tr("The file already exists. Do you want to overwrite it?"),
+ QMessageBox::Yes | QMessageBox::No, this);
+ msg.exec();
+ if (msg.clickedButton() != msg.button(QMessageBox::Yes))
{
return;
}
diff --git a/app/scanner2/dialog_saveas.cpp b/app/scanner2/dialog_saveas.cpp
index 0b82577f..5c3f8839 100644
--- a/app/scanner2/dialog_saveas.cpp
+++ b/app/scanner2/dialog_saveas.cpp
@@ -198,7 +198,7 @@ void Dialog_SaveAs::on_dialog_accepted()
if(checked)
{
QString dirName = NULL;
- dirName = path + QDateTime::currentDateTime().toString("yy-MM-dd hh.mm.ss");
+ dirName = path + QDateTime::currentDateTime().toString("yy-MM-dd hh.mm.ss") + "/";
QDir dir(dirName);
if(!dir.exists())
{
@@ -207,7 +207,11 @@ void Dialog_SaveAs::on_dialog_accepted()
path = dirName;
}
- if(name.endsWith(extName))
+#if defined (HG_CMP_MSC)
+ if (name.endsWith(extName, Qt::CaseInsensitive))
+#else
+ if (name.endsWith(extName, Qt::CaseSensitive))
+#endif
m_savePath = getStdFileName(path + name);
else
m_savePath = getStdFileName(path + name + extName);
@@ -216,8 +220,11 @@ void Dialog_SaveAs::on_dialog_accepted()
QFile file(m_savePath);
if (file.exists())
{
- int ret = QMessageBox::question(this, tr("Question"), tr("The file already exists. Do you want to overwrite it?"));
- if (ret != QMessageBox::Yes)
+ QMessageBox msg(QMessageBox::Question, tr("Question"),
+ tr("The file already exists. Do you want to overwrite it?"),
+ QMessageBox::Yes | QMessageBox::No, this);
+ msg.exec();
+ if (msg.clickedButton() != msg.button(QMessageBox::Yes))
{
return;
}