diff --git a/app/scanner2/Scanner_zh_CN.qm b/app/scanner2/Scanner_zh_CN.qm
index 59f64eb5..49ab2fe2 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 d5088eee..2311be11 100644
--- a/app/scanner2/Scanner_zh_CN.ts
+++ b/app/scanner2/Scanner_zh_CN.ts
@@ -11,34 +11,43 @@
DeviceUser
-
-
-
+
+
+
选择日志保存路径
-
-
-
+
+
+
文本文件(*.txt)
+
+
+
+
+ 提示
+
+
+
+
+
+ 没有找到扫描仪!
+
DeviceUserMgr
-
-
- 提示
+ 提示
-
- 没有发现扫描仪
+ 没有发现扫描仪
@@ -1988,7 +1997,7 @@ bug description:
GraphicsScene
-
+
宋体
@@ -2190,7 +2199,7 @@ bug description:
-
+
扫描至...
@@ -2420,22 +2429,22 @@ bug description:
选择设备源...
-
+
华高扫描软件
-
+
多列显示
-
+
移动到...
-
+
插入文件
@@ -2444,22 +2453,22 @@ bug description:
没有发现扫描仪
-
-
-
-
-
+
+
+
+
+
询问
-
+
图像已被修改。
是否保存修改?
-
+
文件已丢失,是否删除?
@@ -2484,17 +2493,17 @@ bug description:
扫描完成
-
+
清空并启动扫描
-
+
不清空并启动扫描
-
+
图像列表中已存在图像。
@@ -2509,12 +2518,12 @@ Do you want to clear?
磁盘空间不足,请删除不需要的文件,以保证有足够的空间
-
+
打开图片
-
+
插入图片
@@ -2527,17 +2536,17 @@ Do you want to clear?
保存失败
-
+
黑白
-
+
256级灰度
-
+
24位彩色
@@ -2546,245 +2555,245 @@ Do you want to clear?
请手动唤醒设备
-
+
紫光扫描软件
-
+
扫描软件
-
+
得力扫描软件
-
-
-
+
+
+
请前往菜单栏“扫描->选择设备源...”选择设备
-
-
+
+
默认配置方案
-
+
本次扫描完成,是否继续扫描?
-
+
显示缩略图栏
-
+
隐藏缩略图栏
-
+
取消
-
-
-
+
+
+
保存成功
-
-
+
+
图片名在列表中已存在
-
+
请至少选中一张图片再进行导出
-
+
文件名
-
+
文件路径
-
+
文件大小
-
+
创建时间
-
+
修改时间
-
+
访问时间
-
+
格式
-
+
宽度
-
+
高度
-
+
深度
-
+
色彩模式
-
+
每英寸像素点
-
+
打印尺寸
-
+
帧
-
+
无
-
+
黑白
-
+
灰度
-
+
彩色
-
+
不支持
-
+
警告
-
+
设备正在运行!
请先结束扫描。
-
+
设备已断开
-
+
打开失败
-
-
-
-
+
+
+
+
提示
-
+
<p>版本号: %1</p>
-
-
-
+
+
+
<p>制造商: %1</p>
-
-
-
+
+
+
<p>版权信息: %1</p>
-
-
-
+
+
+
<p>公司网址: <a href=%1>%1</p>
-
-
-
+
+
+
<p>公司地址: %1</p>
-
-
-
+
+
+
<p>公司电话: %1</p>
-
+
<p>公司地图定位: <a href=%1>%2</p>
-
+
百度地图访问
@@ -2805,8 +2814,8 @@ Please finish scanning first.
扫描张数: %1
-
-
+
+
设备 %1 已打开
@@ -2815,76 +2824,76 @@ Please finish scanning first.
关于
-
+
无法访问当前缓存路径:%1
请尝试在【用户】菜单登录管理员账户,前往【缓存设置】更改缓存路径。
-
+
无法访问当前缓存路径:%1
请尝试在【扫描到】更改缓存路径。
-
+
图像处理失败
-
+
OCR初始化错误
-
+
OCR错误
-
+
文件不存在
-
+
加载动态库失败
-
+
文件数据错误
-
+
图像格式处理错误
-
+
内存不足
-
+
错误
-
+
纸轮搓纸次数已超过设计使用范围,扫描过程中搓纸失败、歪斜、搓多张等异常频次可能会明显增多,
请注意及时清洁、并联系设备供应商购买替换纸轮!
-
-
+
+
语言切换成功,下次启动软件时生效!
-
+
您确定彻底删除选中项文件?
@@ -2902,7 +2911,7 @@ Please finish scanning first.
请尝试在【用户】菜单登录管理员账户,前往【缓存设置】更改缓存路径
-
+
文件访问权限不足
@@ -2927,18 +2936,18 @@ Please finish scanning first.
关闭
-
+
提示
-
+
未获取到其他版本
-
-
+
+
操作失败
@@ -2947,8 +2956,8 @@ Please finish scanning first.
IO错误
-
-
+
+
错误
@@ -2963,7 +2972,7 @@ Continue to close?
是否继续关闭?
-
+
是否确定登出管理员账户?
@@ -3033,92 +3042,92 @@ Continue to close?
启动失败
-
+
汉王扫描软件
-
+
立思辰扫描软件
-
+
沧田扫描软件
-
+
Microtek DocWizard EX 扫描软件
-
+
语言
-
+
简体中文
-
+
English
-
+
自动保存
-
+
切换图片时,不提醒,直接保存编辑过的图片
-
+
显示状态栏
-
+
隐藏状态栏
-
+
显示工具栏
-
+
隐藏工具栏
-
+
启用图像信息
-
+
关闭图像信息
-
+
启用自动保存
-
+
取消自动保存
-
+
切换图片时,自动保存编辑过的图像。若想取消,请取消勾选菜单项:图像->自动保存
@@ -3163,12 +3172,12 @@ Continue to close?
创建图片文件失败:
-
-
-
-
-
-
+
+
+
+
+
+
保存图片文件失败:
@@ -3207,17 +3216,17 @@ Continue to close?
滚轴张数: %1
-
+
检测到磁盘空间已不足1GB,是否继续?
-
+
启动安装程序失败!
-
+
有图像未保存,确定关闭?
@@ -3227,39 +3236,39 @@ Are you sure to close?
发现设备 : %1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
提示
-
+
确定关闭应用软件?
-
+
确认操作
-
+
您确定要清除滚轴计数吗
@@ -3268,22 +3277,22 @@ Are you sure to close?
提示
-
+
辊轴计数已置零
-
+
重置滚轴计数失败
-
+
错误
-
+
文档丢失!文档可能已被删除或被重命名。
@@ -3324,7 +3333,7 @@ Are you sure to close?
<p>%1</p><p>版本: %2<br>版权: © %3</p><p>%4%5%6%7%8%9</p>
-
+
关于 %1
@@ -3351,7 +3360,7 @@ Are you sure to close?
QObject
- 错误
+ 错误
@@ -3366,7 +3375,7 @@ Are you sure to close?
Widget
- 坐标轴
+ 坐标轴
diff --git a/app/scanner2/Scanner_zh_EN.qm b/app/scanner2/Scanner_zh_EN.qm
index a8fe7dff..bbe7167b 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 08d9ad7a..861c3bf1 100644
--- a/app/scanner2/Scanner_zh_EN.ts
+++ b/app/scanner2/Scanner_zh_EN.ts
@@ -39,34 +39,39 @@
DeviceUser
-
-
-
+
+
+
Select log file path
-
-
-
+
+
+
Text(*.txt)
+
+
+
+
+ Prompt
+
+
+
+
+
+ Scanner not found!
+
DeviceUserMgr
-
-
-
-
-
-
-
- No scanner detected
+ No scanner detected
@@ -1864,7 +1869,7 @@ Please make sure the two passwords are the same.
GraphicsScene
-
+
Song
@@ -2050,7 +2055,7 @@ Please make sure the two passwords are the same.
-
+
Scan to...
@@ -2280,62 +2285,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
@@ -2344,76 +2349,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?
@@ -2430,7 +2435,7 @@ Please make sure the two passwords are the same.
No
-
+
File lost; delete?
@@ -2476,34 +2481,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
@@ -2512,13 +2517,13 @@ Please reselect a path or clear disk space immediately.
Failed to start
-
+
UNI scanning software
-
-
+
+
Default scheme
@@ -2527,7 +2532,7 @@ Please reselect a path or clear disk space immediately.
Please wake up the device manually
-
+
Scanning software
@@ -2536,281 +2541,281 @@ 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?
-
+
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/Developer: %1</p>
-
-
-
+
+
+
<p>Copyright: %1</p>
-
-
-
+
+
+
<p>Company URL: <a href=%1>%1</p>
-
-
-
+
+
+
<p>Address: %1</p>
-
-
-
+
+
+
<p>Contact number: %1</p>
-
+
<p>Navigation address: <a href=%1>%2</p>
-
+
Baidu map access
@@ -2865,23 +2870,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?
@@ -2890,22 +2895,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.
@@ -2922,13 +2927,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].
@@ -2942,7 +2947,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
@@ -2987,13 +2992,13 @@ Please try to change the cache path in [Scan to].
failed
-
-
+
+
Error
-
+
Failed to start!
@@ -3003,52 +3008,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
@@ -3069,18 +3074,18 @@ Please go to “Scan to” and change the accessible scan folder and then perfor
Close
-
+
Prompt
-
+
No other versions obtained
-
-
+
+
Operation failed
@@ -3089,13 +3094,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?
@@ -3115,7 +3120,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/device_user.cpp b/app/scanner2/device_user.cpp
index 6352fee6..8e8a07ea 100644
--- a/app/scanner2/device_user.cpp
+++ b/app/scanner2/device_user.cpp
@@ -220,7 +220,17 @@ HGResult DeviceUser::Open()
return HGSANE_ERR_FAIL;
}
- return HGSane_OpenSelectedDevice(m_source, m_wnd, &m_saneDev);
+ HGUInt count = 0;
+ HGSane_GetDeviceCount(m_source, &count);
+ if (0 == count)
+ {
+ QMessageBox::information(m_wnd, tr("Prompt"), tr("Scanner not found!"));
+ return HGSANE_ERR_FAIL;
+ }
+ else
+ {
+ return HGSane_OpenSelectedDevice(m_source, m_wnd, &m_saneDev);
+ }
}
HGResult DeviceUser::OpenDefault()
@@ -230,8 +240,18 @@ HGResult DeviceUser::OpenDefault()
return HGSANE_ERR_FAIL;
}
- HGChar errInfo[256];
- return HGSane_OpenDevice(m_source, 0, &m_saneDev, errInfo, 256);
+ HGUInt count = 0;
+ HGSane_GetDeviceCount(m_source, &count);
+ if (0 == count)
+ {
+ QMessageBox::information(m_wnd, tr("Prompt"), tr("Scanner not found!"));
+ return HGSANE_ERR_FAIL;
+ }
+ else
+ {
+ HGChar errInfo[256];
+ return HGSane_OpenDevice(m_source, 0, &m_saneDev, errInfo, 256);
+ }
}
HGResult DeviceUser::Close()