lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

中性版本宏改为OEM_NEUTRAL

This commit is contained in:
luoliangyi 2023-04-20 16:13:29 +08:00
parent bc0eece62d
commit 7d92512f9f
18 changed files with 716 additions and 686 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/scanner/Scanner_zh_CN.qm
View File

Binary file not shown.

661
app/scanner/Scanner_zh_CN.ts
View File

File diff suppressed because it is too large Load Diff

BIN
app/scanner/Scanner_zh_EN.qm
View File

Binary file not shown.

661
app/scanner/Scanner_zh_EN.ts
View File

File diff suppressed because it is too large Load Diff

8
app/scanner/VersionDll.cpp
View File

@ -63,8 +63,8 @@ HGResult VersionDll::Load()
strcat(dllPath, "ZJVersion.dll");
#elif defined(OEM_ZIGUANG)
strcat(dllPath, "ZGVersion.dll");
#elif defined(OEM_HUAGAO_NEU)
strcat(dllPath, "HGNeuVersion.dll");
#elif defined(OEM_NEUTRAL)
strcat(dllPath, "NEUVersion.dll");
#else
strcat(dllPath, "HGVersion.dll");
#endif
@ -79,8 +79,8 @@ HGResult VersionDll::Load()
strcpy(dllPath, "libZjVersion.so");
#elif defined(OEM_ZIGUANG)
strcpy(dllPath, "libZgVersion.so");
#elif defined(OEM_HUAGAO_NEU)
strcat(dllPath, "libHGNeuVersion.so");
#elif defined(OEM_NEUTRAL)
strcat(dllPath, "libNeuVersion.so");
#else
strcpy(dllPath, "libHGVersion.so");
#endif

2
app/scanner/dialog_aquireinto.cpp
View File

@ -239,7 +239,7 @@ void Dialog_AquireInto::setCfgBaseOnSection(QString section)
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("ZJScan")));
#elif defined(OEM_ZIGUANG)
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("ZGScan")));
#elif defined(OEM_HUAGAO_NEU)
#elif defined(OEM_NEUTRAL)
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("Scan")));
#else
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("HGScan")));

4
app/scanner/dialog_feedback.cpp
View File

@ -35,8 +35,8 @@ void Dialog_Feedback::on_pbtn_submit_clicked()
oemName = HGVERSION_OEMNAME_MICROTEK;
#elif defined(OEM_ZIGUANG)
oemName = HGVERSION_OEMNAME_UNIS;
#elif defined(OEM_HUAGAO_NEU)
oemName = HGVERSION_OEMNAME_HUAGAO_NEU;
#elif defined(OEM_NEUTRAL)
oemName = HGVERSION_OEMNAME_NEUTRAL;
#else
oemName = HGVERSION_OEMNAME_HUAGO;
#endif

4
app/scanner/dialog_upgrade.cpp
View File

@ -29,8 +29,8 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers
oemName = HGVERSION_OEMNAME_MICROTEK;
#elif defined(OEM_ZIGUANG)
oemName = HGVERSION_OEMNAME_UNIS;
#elif defined(OEM_HUAGAO_NEU)
oemName = HGVERSION_OEMNAME_HUAGAO_NEU;
#elif defined(OEM_NEUTRAL)
oemName = HGVERSION_OEMNAME_NEUTRAL;
#else
oemName = HGVERSION_OEMNAME_HUAGO;
#endif

25
app/scanner/mainwindow.cpp
View File

@ -120,10 +120,10 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
this->setWindowIcon(QIcon(":images/image_rsc/logo/uniscan.ico"));
this->setWindowTitle(tr("UniScan"));
m_oemName = HGVERSION_OEMNAME_UNIS;
#elif defined(OEM_HUAGO_NEU)
#elif defined(OEM_NEUTRAL)
this->setWindowIcon(QIcon(":images/image_rsc/logo/RightWay_logo.ico"));
this->setWindowTitle(tr("Scan"));
m_oemName = HGVERSION_OEMNAME_HUAGO_NEU;
m_oemName = HGVERSION_OEMNAME_NEUTRAL;
#else
this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico"));
this->setWindowTitle(tr("HuaGoScan"));
@ -143,7 +143,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
ui->actionact_update->setVisible(false);
ui->act_feedback->setVisible(false);
#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_HUAGAO_NEU)
#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_NEUTRAL)
if (m_versionDll->IsValid())
{
ui->actionact_update->setVisible(true);
@ -372,7 +372,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
m_password = "microtek";
#elif defined(OEM_ZIGUANG)
m_password = "uniscan";
#elif defined(OEM_HUAGAO_NEU)
#elif defined(OEM_NEUTRAL)
m_password = "scan";
#else
m_password = "huagoscan";
@ -3264,8 +3264,8 @@ void MainWindow::on_act_help_triggered()
QString filename = QApplication::applicationDirPath() + "/MicrotekScan_App_Help_manual.pdf";
#elif defined(OEM_ZIGUANG)
QString filename = QApplication::applicationDirPath() + "/UniScan_App_Help_manual.pdf";
#elif defined(OEM_HUAGAO_NEU)
QString filename = QApplication::applicationDirPath() + "/HGScan_App_Help_manual.pdf";
#elif defined(OEM_NEUTRAL)
QString filename = QApplication::applicationDirPath() + "/NeuScan_App_Help_manual.pdf";
#else
QString filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf";
#endif
@ -3295,8 +3295,8 @@ void MainWindow::on_act_help_triggered()
filename = QApplication::applicationDirPath() + "/../../entries/help/MicrotekScan_App_Help_manual.pdf";
#elif defined(OEM_ZIGUANG)
filename = QApplication::applicationDirPath() + "/../../entries/help/UniScan_App_Help_manual.pdf";
#elif defined(OEM_HUAGAO_NEU)
filename = QApplication::applicationDirPath() + "/../../entries/help/HGScan_App_Help_manual.pdf";
#elif defined(OEM_NEUTRAL)
filename = QApplication::applicationDirPath() + "/../../entries/help/NeuScan_App_Help_manual.pdf";
#else
filename = QApplication::applicationDirPath() + "/../../entries/help/HuaGoScan_App_Help_manual.pdf";
#endif
@ -3313,8 +3313,8 @@ void MainWindow::on_act_help_triggered()
filename = QApplication::applicationDirPath() + "/../doc/MicrotekScan_App_Help_manual.pdf";
#elif defined(OEM_ZIGUANG)
filename = QApplication::applicationDirPath() + "/../doc/UniScan_App_Help_manual.pdf";
#elif defined(OEM_HUAGAO_NEU)
filename = QApplication::applicationDirPath() + "/../doc/HGScan_App_Help_manual.pdf";
#elif defined(OEM_NEUTRAL)
filename = QApplication::applicationDirPath() + "/../doc/NeuScan_App_Help_manual.pdf";
#else
filename = QApplication::applicationDirPath() + "/../doc/HuaGoScan_App_Help_manual.pdf";
#endif
@ -3424,6 +3424,10 @@ void MainWindow::on_act_about_triggered()
content += *iter;
++iter;
}
#else
#ifdef OEM_NEUTRAL
title = tr("about");
content = tr("<p>Version: %1</p>").arg(QString::fromStdString(about->version));
#else
title = tr("about %1").arg(QString::fromStdString(about->title));
content = tr("<p>Version: %1</p>").arg(QString::fromStdString(about->version));
@ -3444,6 +3448,7 @@ void MainWindow::on_act_about_triggered()
}
content += "</p>";
}
#endif
#endif
}
free(about);

7
build.bat
View File

@ -31,6 +31,12 @@ if "%OEM%" == "hw" (
MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release
%QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_ZIGUANG" -r -tp vc HGSolution.pro
MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release
) else (
if "%OEM%" == "neu" (
%QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_NEUTRAL" -r -tp vc HGSolution.pro
MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release
%QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_NEUTRAL" -r -tp vc HGSolution.pro
MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release
) else (
%QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGSolution.pro
MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release
@ -41,5 +47,6 @@ if "%OEM%" == "hw" (
)
)
)
)
cd /d ../../

2
build2/qt/HGDemo/HGDemo.pro
View File

@ -36,7 +36,7 @@ if (contains(DEFINES, OEM_HANWANG)) {
if (contains(DEFINES, OEM_ZIGUANG)) {
RC_ICONS = ../../../app/demo/image_rsc/logo/uniscan.ico
} else {
if (contains(DEFINES, OEM_HUAGAO_NEU)) {
if (contains(DEFINES, OEM_NEUTRAL)) {
RC_ICONS = ../../../app/demo/image_rsc/logo/RightWay_logo.ico
} else {
RC_ICONS = ../../../app/demo/image_rsc/logo/logo.ico

2
build2/qt/HGFWUpgrade/HGFWUpgrade.pro
View File

@ -36,7 +36,7 @@ if (contains(DEFINES, OEM_HANWANG)) {
if (contains(DEFINES, OEM_ZIGUANG)) {
RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/uniscan.ico
} else {
if (contains(DEFINES, OEM_HUAGAO_NEU)) {
if (contains(DEFINES, OEM_NEUTRAL)) {
RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/RightWay_logo.ico
} else {
RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/logo.ico

10
build2/qt/HGOEM.pri
View File

@ -31,11 +31,11 @@ if (contains(DEFINES, OEM_HANWANG)) {
OEM_PREFIX3 = zg
OEM_NAME = unis
} else {
if (contains(DEFINES, OEM_HUAGAO_NEU)) {
OEM_PREFIX = HGNeu
OEM_PREFIX2 = HGNeu
OEM_PREFIX3 = hgneu
OEM_NAME = huagaoneu
if (contains(DEFINES, OEM_NEUTRAL)) {
OEM_PREFIX = NEU
OEM_PREFIX2 = Neu
OEM_PREFIX3 = neu
OEM_NAME = neutral
} else {
OEM_PREFIX = HG
OEM_PREFIX2 = HG

4
build2/qt/HGScanner/HGScanner.pro
View File

@ -41,9 +41,9 @@ if (contains(DEFINES, OEM_HANWANG)) {
RC_ICONS = ../../../app/scanner/image_rsc/logo/uniscan.ico
TARGET = UniScan
} else {
if (contains(DEFINES, OEM_HUAGAO_NEU)) {
if (contains(DEFINES, OEM_NEUTRAL)) {
RC_ICONS = ../../../app/scanner/image_rsc/logo/RightWay_logo.ico
TARGET = HGScan
TARGET = NeuScan
} else {
RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
TARGET = HuaGoScan

2
build2/qt/HGUpgrade/HGUpgrade.pro
View File

@ -36,7 +36,7 @@ if (contains(DEFINES, OEM_HANWANG)) {
if (contains(DEFINES, OEM_ZIGUANG)) {
RC_ICONS = ../../../app/upgrade/image_rsc/logo/uniscan.ico
} else {
if (contains(DEFINES, OEM_HUAGAO_NEU)) {
if (contains(DEFINES, OEM_NEUTRAL)) {
RC_ICONS = ../../../app/upgrade/image_rsc/logo/RightWay_logo.ico
} else {
RC_ICONS = ../../../app/upgrade/image_rsc/logo/logo.ico

0
doc/scanner/HGScan_App_Help_manual.pdf → doc/scanner/NeuScan_App_Help_manual.pdf
View File

0
doc/scanner/HGScan_scanSettings_Help_manual.pdf → doc/scanner/NeuScan_scanSettings_Help_manual.pdf
View File

2
modules/version/HGVersion.h
View File

@ -9,7 +9,7 @@ HG_DECLARE_HANDLE(HGVersionMgr);
#define HGVERSION_APPNAME_SCANNER "Scanner"
#define HGVERSION_OEMNAME_HUAGO "Huago"
#define HGVERSION_OEMNAME_HUAGAO_NEU "HuagoNeu"
#define HGVERSION_OEMNAME_NEUTRAL "Neutral"
#define HGVERSION_OEMNAME_HANVON "Hanvon"
#define HGVERSION_OEMNAME_LANXUM "Lanxum"
#define HGVERSION_OEMNAME_CUMTENN "Cumtenn"