diff --git a/modules/saneui/HGSaneUI.cpp b/modules/saneui/HGSaneUI.cpp index a1565682..3c032e8a 100644 --- a/modules/saneui/HGSaneUI.cpp +++ b/modules/saneui/HGSaneUI.cpp @@ -132,16 +132,28 @@ int show_setting_ui(const SANEAPI* saneApi, SANE_Handle handle, const char *devN #endif QTranslator translator; + QTranslator translator2; int cp = lang_get_cur_code_page(); if (20127 == cp) + { translator.load(":translation/SaneUI_zh_EN.qm"); + } else + { translator.load(":translation/SaneUI_zh_CN.qm"); + translator2.load(":translation/qt_zh_CN.qm"); + } + QCoreApplication::installTranslator(&translator); + if (20127 != cp) + QCoreApplication::installTranslator(&translator2); hg_settingdialog dlg(saneApi, handle, devName, callback, callbackParam, qParent); dlg.exec(); + QCoreApplication::removeTranslator(&translator); + if (20127 != cp) + QCoreApplication::removeTranslator(&translator2); return 0; } diff --git a/modules/saneui/setpicclrtool.cpp b/modules/saneui/setpicclrtool.cpp index 78597d89..3ebedd56 100644 --- a/modules/saneui/setpicclrtool.cpp +++ b/modules/saneui/setpicclrtool.cpp @@ -9,6 +9,7 @@ setPicClrTool::setPicClrTool(QWidget *parent) : ui(new Ui::setPicClrTool) { ui->setupUi(this); + setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); setMouseTracking(true); ui->inputEdt->setEnabled(false); ui->outputEdt->setEnabled(false); diff --git a/modules/twainui/setpicclrtool.cpp b/modules/twainui/setpicclrtool.cpp index 78597d89..3ebedd56 100644 --- a/modules/twainui/setpicclrtool.cpp +++ b/modules/twainui/setpicclrtool.cpp @@ -9,6 +9,7 @@ setPicClrTool::setPicClrTool(QWidget *parent) : ui(new Ui::setPicClrTool) { ui->setupUi(this); + setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); setMouseTracking(true); ui->inputEdt->setEnabled(false); ui->outputEdt->setEnabled(false); diff --git a/modules/twainui/twainui.cpp b/modules/twainui/twainui.cpp index 37a9a415..9281a22c 100644 --- a/modules/twainui/twainui.cpp +++ b/modules/twainui/twainui.cpp @@ -104,16 +104,28 @@ int show_setting_ui(SANE_Handle device, HWND parent, LPSANEAPI api, const char * #endif QTranslator translator; + QTranslator translator2; int cp = lang_get_cur_code_page(); if (20127 == cp) + { translator.load(":translation/TwainUI_zh_EN.qm"); + } else + { translator.load(":translation/TwainUI_zh_CN.qm"); + translator2.load(":translation/qt_zh_CN.qm"); + } + QCoreApplication::installTranslator(&translator); + if (20127 != cp) + QCoreApplication::installTranslator(&translator2); hg_settingdialog dlg(device, api, with_scan, devName, qParent); dlg.exec(); + QCoreApplication::removeTranslator(&translator); + if (20127 != cp) + QCoreApplication::removeTranslator(&translator2); int ret = dlg.getCloseButtonCliked(); if (ret == dlg.closeButtonScan)