diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm
index cca5fcf8..d139276b 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 9ac22ef9..04ed4b01 100644
--- a/app/scanner/Scanner_zh_CN.ts
+++ b/app/scanner/Scanner_zh_CN.ts
@@ -2179,51 +2179,51 @@ bug description:
导出驱动日志
-
+
华高扫描软件
-
+
多列显示
-
+
移动到...
-
+
插入文件
+
+
-
-
没有发现扫描仪
-
-
-
-
-
-
+
+
+
+
+
+
询问
-
-
+
+
图像已被修改。
是否保存修改?
-
+
文件已丢失,是否删除?
@@ -2232,7 +2232,7 @@ bug description:
已连接
-
+
已断开连接
@@ -2249,17 +2249,17 @@ bug description:
扫描完成
-
+
清空并启动扫描
-
+
不清空并启动扫描
-
+
图像列表中已存在图像。
@@ -2274,12 +2274,12 @@ Do you want to clear?
磁盘空间不足,请删除不需要的文件,以保证有足够的空间
-
+
打开图片
-
+
插入图片
@@ -2292,234 +2292,240 @@ Do you want to clear?
保存失败
-
+
黑白
-
+
256级灰度
-
+
24位彩色
-
+
显示缩略图栏
-
+
隐藏缩略图栏
-
+
取消
-
-
-
+
+
+
保存成功
-
-
+
+
图片名在列表中已存在
-
+
请至少选中一张图片再进行导出
-
+
文件名
-
+
文件路径
-
+
文件大小
-
+
创建时间
-
+
修改时间
-
+
访问时间
-
+
格式
-
+
宽度
-
+
高度
-
+
深度
-
+
色彩模式
-
+
每英寸像素点
-
+
打印尺寸
-
+
帧
-
+
无
-
+
黑白
-
+
灰度
-
+
彩色
-
+
警告
-
+
设备正在运行!
请先结束扫描。
-
+
图像处理失败
-
+
OCR初始化错误
-
+
OCR错误
-
+
文件不存在
-
+
加载动态库失败
-
+
文件数据错误
-
+
图像格式处理错误
-
+
内存不足
-
+
错误
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 语言切换成功,下次启动软件时生效!
+
+
+
+
+
+
+
+
+
+
+
+
已唤醒设备
-
+
就绪
-
-
-
-
-
-
+
+
+
+
+
+
无法访问“我的文档”,
请前往“扫描至”更换可访问的扫描目录再进行扫描。
-
+
文件访问权限不足
@@ -2532,47 +2538,47 @@ Please finish scanning first.
图像处理失败
-
+
您确定要断开设备:
-
+
吗?
-
-
+
+
关闭
-
+
提示
-
+
未获取到其他版本
-
-
+
+
设备不支持该操作
-
-
+
+
IO错误
-
-
-
+
+
+
错误
@@ -2587,17 +2593,17 @@ Continue to close?
是否继续关闭?
-
+
是否确定登出管理员账户?
-
+
确认操作
-
+
你确定要清除滚轴计数吗
@@ -2606,34 +2612,34 @@ Continue to close?
请重新进入关于界面以获取最新值
-
+
-
+
-
+
滚轴张数
-
+
打开扫描仪
-
-
+
+
华高扫描软件
-
-
+
+
成功
@@ -2650,22 +2656,22 @@ Continue to close?
失败
-
-
+
+
失败
-
-
-
+
+
+
警告
-
-
-
+
+
+
当前路径磁盘空间不足,
请重新选择路径或及时清理磁盘空间。
@@ -2675,143 +2681,145 @@ Continue to close?
配置丢失
-
+
应用配置
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
启动失败
-
+
汉王扫描软件
-
+
立思辰扫描软件
-
+
沧田扫描软件
-
+
语言
-
+
简体中文
-
+
- English
+ English
-
+
自动保存
-
+
切换图片时,不提醒,直接保存编辑过的图片
-
+
显示状态栏
-
+
隐藏状态栏
-
+
显示工具栏
-
+
隐藏工具栏
-
+
启用图像信息
-
+
关闭图像信息
-
+
启用自动保存
-
+
取消自动保存
-
+
切换图片时,自动保存编辑过的图像。若想取消,请取消勾选菜单项:图像->自动保存
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
确定
-
+
保存,不再提醒
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
取消
@@ -2820,26 +2828,26 @@ Continue to close?
发现设备
-
+
重新连接
-
+
已经连接,但打开失败
-
-
+
+
存图失败:
-
-
-
-
+
+
+
+
创建文件夹失败:
@@ -2848,99 +2856,101 @@ Continue to close?
%1%2%3.%4
-
-
+
+
创建图片文件失败:
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
保存图片文件失败:
-
+
启动安装程序失败!
-
+
有图像未保存,确定关闭?
-
+
发现设备 : %1
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
提示
-
+
确定关闭应用软件?
-
+
确认操作
-
+
您确定要清除滚轴计数吗
-
-
-
+
+
+
提示
-
-
+
+
辊轴计数已置零
-
-
+
+
重置滚轴计数失败
-
+
错误
-
+
文档丢失!文档可能已被删除或被重命名。
@@ -2973,28 +2983,28 @@ Are you sure to close?
<br>导航地址: <a href='https://j.map.baidu.com/7e/1TO'>百度地图访问</a>
-
+
关于 %1
-
+
<p>%1</p><p>版本: %2<br>版权: © %3</p><p>%4%5%6%7%8%9</p>
-
+
关于 %1
-
+
<p>版本: %1</p>
<p>版本: %1</p>
-
+
<p>版权: © %1</p>
<p>版权: © %1</p>
@@ -3015,7 +3025,7 @@ Are you sure to close?
错误
-
+
默认设置
diff --git a/app/scanner/Scanner_zh_EN.qm b/app/scanner/Scanner_zh_EN.qm
index c2e24c6f..d6c516dd 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 efefe0ad..cc805e07 100644
--- a/app/scanner/Scanner_zh_EN.ts
+++ b/app/scanner/Scanner_zh_EN.ts
@@ -2022,167 +2022,169 @@ Please make sure the two passwords are the same.
Export drive log...
-
+
Hanvon scanning software
-
+
LANXUM scanning software
-
+
CUMTENN scanning software
-
+
HUAGOSCAN scanning software
-
+
Language
-
+
简体中文
-
+
English
-
+
Multi-column display
-
+
Move to...
-
+
Insert file
+
+
-
-
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
-
-
+
+
Image modified, save changes?
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
Yes
-
+
Save, do not prompt again
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
No
-
+
File lost; delete?
@@ -2191,555 +2193,563 @@ Please make sure the two passwords are the same.
Device discovered
-
+
Device discovered: %1
-
+
reconnect
-
+
connected, but failed to open
-
+
disconnected
-
-
-
+
+
+
Insufficient disk space for the current path.
Please reselect a path or clear disk space immediately.
-
-
-
+
+
+
Warning
-
-
+
+
Failed to save image:
-
-
-
-
+
+
+
+
Failed to create folder:
-
-
+
+
Failed to create image file:
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
Failed to save image:
-
+
Black and white
-
+
Grayscale
-
+
Color
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Failed to start
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
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
-
+
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?
-
+
Confirm operation
-
+
Are you sure you want to clear the roller count?
-
-
-
+
+
+
Prompt
-
-
+
+
Roller count reset to zero.
-
-
+
+
Failed to reset roller count.
-
+
Error
-
+
File lost! File may be deleted or renamed.
-
+
Confirm operation
-
+
Are you sure you want to clear the roller count?
-
+
About %1
-
+
<p>%1</p><p>Version: %2<br>Copyright: © %3</p><p>%4%5%6%7%8%9</p>
-
+
About %1
-
+
<p>Version: %1</p>
-
+
<p>Copyright: © %1</p>
-
+
p>%1: <a href='%2'>%3</a>
-
+
<p>%1: %2
-
+
Number of rollers
-
+
Open scanner
-
-
+
+
HUAGOSCAN scanning software
-
-
+
+
successfully
-
+
Ready
-
-
+
+
failed
-
-
-
+
+
+
Error
-
+
Failed to start!
-
-
-
-
-
-
+
+
+
+
+
+
Cannot access “My Documents”.
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
-
+
Apply configuration
-
+
Are you sure you want to disconnect device:
-
+
?
-
-
+
+
Close
-
+
Prompt
-
+
No other versions obtained
-
-
+
+
Device does not support this operation
-
-
+
+
IO error
+
+
+
+
+ The language switch is successful and takes effect the next time the software is started!
+
QObject
-
+
Default setting
diff --git a/app/scanner/main.cpp b/app/scanner/main.cpp
index 99416486..ebaf8ff1 100644
--- a/app/scanner/main.cpp
+++ b/app/scanner/main.cpp
@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
lang_initialize(nullptr);
- QString appLang = getCfgValue("global", "language", QString("Chinese"));
+ QString appLang = getCfgValue("global", "language", QString("chinese"));
for (int i = 1; i < argc; i++)
{
char* z = argv[i];
@@ -26,39 +26,28 @@ int main(int argc, char *argv[])
appLang = "chinese";
}
- while (1)
+ QString translator_qt_name = ":translation/qt_zh_CN.qm";
+ QString translator_scanner_name = ":translation/Scanner_zh_CN.qm";
+ int cp = 936;
+ if (appLang == "english")
{
- QString translator_qt_name = ":translation/qt_zh_CN.qm";
- QString translator_scanner_name = ":translation/Scanner_zh_CN.qm";
- int cp = 936;
- if (appLang == "english")
- {
- translator_qt_name = ":translation/qt_zh_CN.qm";
- translator_scanner_name = ":translation/Scanner_zh_EN.qm";
- cp = 20127;
- }
-
- QTranslator translator_qt;
- if (translator_qt.load(translator_qt_name))
- a.installTranslator(&translator_qt);
- QTranslator translator_scanner;
- if (translator_scanner.load(translator_scanner_name))
- a.installTranslator(&translator_scanner);
-
- lang_set_code_page(cp);
-
- MainWindow w(appLang);
- QScreen *screen = QGuiApplication::primaryScreen();
- w.move((screen->size().width() - w.width()) / 2, (screen->size().height() - w.height()) / 2);
- w.show();
- a.exec();
-
- saveCfgValue("global", "language", appLang);
- if (!w.isContinue())
- {
- break;
- }
+ translator_qt_name = ":translation/qt_zh_CN.qm";
+ translator_scanner_name = ":translation/Scanner_zh_EN.qm";
+ cp = 20127;
}
- return 0;
+ QTranslator translator_qt;
+ if (translator_qt.load(translator_qt_name))
+ a.installTranslator(&translator_qt);
+ QTranslator translator_scanner;
+ if (translator_scanner.load(translator_scanner_name))
+ a.installTranslator(&translator_scanner);
+
+ lang_set_code_page(cp);
+
+ MainWindow w(appLang);
+ QScreen *screen = QGuiApplication::primaryScreen();
+ w.move((screen->size().width() - w.width()) / 2, (screen->size().height() - w.height()) / 2);
+ w.show();
+ return a.exec();
}
diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp
index 269f29c8..2eac0b0e 100644
--- a/app/scanner/mainwindow.cpp
+++ b/app/scanner/mainwindow.cpp
@@ -51,12 +51,10 @@
#define PASSWORD_KEY 4
#define MY_URL_SCHEME "inscanner"
-MainWindow::MainWindow(QString& appLang, QWidget *parent)
+MainWindow::MainWindow(const QString& appLang, QWidget *parent)
: QMainWindow(parent)
, ui(new Ui::MainWindow)
- , m_appLang(appLang)
, m_currLang(appLang)
- , m_isContinue(false)
, m_versionDll(nullptr)
, m_admin_loggedIn(false)
, m_dpi(200)
@@ -401,11 +399,6 @@ MainWindow::~MainWindow()
delete ui;
}
-bool MainWindow::isContinue()
-{
- return m_isContinue;
-}
-
void MainWindow::exitFullScreen()
{
assert(nullptr != m_dlgFullScreen);
@@ -4227,48 +4220,40 @@ void MainWindow::on_act_device_log_triggered()
void MainWindow::on_act_simpCN_triggered()
{
- if (m_currLang == "english")
- {
- m_act_simpCN->setChecked(false);
- m_act_English->setChecked(true);
- }
- else
- {
- m_act_simpCN->setChecked(true);
- m_act_English->setChecked(false);
- }
+ m_act_simpCN->setChecked(true);
+ m_act_English->setChecked(false);
if (m_currLang == "chinese")
{
return;
}
- m_appLang = "chinese";
- m_closeTip = false;
- m_isContinue = true;
- close();
+ m_currLang = "chinese";
+ saveCfgValue("global", "language", m_currLang);
+
+ QMessageBox msg(QMessageBox::Critical, 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();
}
void MainWindow::on_act_English_triggered()
{
- if (m_currLang == "english")
- {
- m_act_simpCN->setChecked(false);
- m_act_English->setChecked(true);
- }
- else
- {
- m_act_simpCN->setChecked(true);
- m_act_English->setChecked(false);
- }
+ m_act_simpCN->setChecked(false);
+ m_act_English->setChecked(true);
if (m_currLang == "english")
{
return;
}
- m_appLang = "english";
- m_closeTip = false;
- m_isContinue = true;
- close();
+ m_currLang = "english";
+ saveCfgValue("global", "language", m_currLang);
+
+ QMessageBox msg(QMessageBox::Critical, 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();
}
diff --git a/app/scanner/mainwindow.h b/app/scanner/mainwindow.h
index 2746753f..29a59591 100644
--- a/app/scanner/mainwindow.h
+++ b/app/scanner/mainwindow.h
@@ -79,10 +79,9 @@ class MainWindow : public QMainWindow
std::vector wrong_imgs_;
public:
- MainWindow(QString& appLang, QWidget *parent = nullptr);
+ MainWindow(const QString& appLang, QWidget *parent = nullptr);
virtual ~MainWindow() override;
- bool isContinue();
void exitFullScreen();
static HGResult saveImage(HGImage image, const HGImgFmtSaveInfo* info, bool ocr, const HGChar *fileName);
static QString getLogInfo(HGResult ret);
@@ -275,9 +274,7 @@ private:
private:
Ui::MainWindow *ui;
- QString &m_appLang;
QString m_currLang;
- bool m_isContinue;
VersionDll *m_versionDll;
QString m_password;
bool m_admin_loggedIn;
diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts
index 9898b37b..3a13abf2 100644
--- a/app/scanner/qt_zh_CN.ts
+++ b/app/scanner/qt_zh_CN.ts
@@ -2158,6 +2158,10 @@ Are you sure to close?
+
+
+
+
Phonon::
@@ -4808,7 +4812,7 @@ Please verify the correct file name was given.
- 默认设置
+ 默认设置