From fcfedf5d0321cf049258686bb73d0bb7982098d1 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Mon, 17 Jul 2023 13:40:22 +0800
Subject: [PATCH] =?UTF-8?q?app=E5=A2=9E=E5=8A=A0=E5=BE=97=E5=8A=9BOEM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/fwupgrade/FWUpgrade_resource.qrc | 1 +
app/fwupgrade/image_rsc/logo/deli.ico | Bin 0 -> 67646 bytes
app/scanner/Scanner_resource.qrc | 1 +
app/scanner/VersionDll.cpp | 4 +++
app/scanner/dialog_aquireinto.cpp | 2 ++
app/scanner/dialog_feedback.cpp | 2 ++
app/scanner/dialog_upgrade.cpp | 2 ++
app/scanner/image_rsc/logo/deli.ico | Bin 0 -> 67646 bytes
app/scanner/mainwindow.cpp | 34 ++++++++++++++++--
app/scanner2/Scanner_resource.qrc | 1 +
app/scanner2/dialog_aquireinto.cpp | 2 ++
app/scanner2/dialog_feedback.cpp | 2 ++
app/scanner2/dialog_upgrade.cpp | 2 ++
app/scanner2/image_rsc/logo/deli.ico | Bin 0 -> 67646 bytes
app/scanner2/mainwindow.cpp | 46 ++++++++++++++++++++----
app/upgrade/Upgrade_resource.qrc | 5 +--
app/upgrade/image_rsc/logo/deli.ico | Bin 0 -> 67646 bytes
build2/qt/HGFWUpgrade/HGFWUpgrade.pro | 8 +++--
build2/qt/HGOEM.pri | 15 +++++---
build2/qt/HGScanner/HGScanner.pro | 13 ++++---
build2/qt/HGScanner2/HGScanner2.pro | 11 ++++--
build2/qt/HGUpgrade/HGUpgrade.pro | 8 +++--
modules/twain_user/HGTwainImpl.cpp | 4 ++-
modules/twainui/TwainUI_resource.qrc | 1 +
modules/twainui/app_cfg.cpp | 2 ++
modules/twainui/hg_settingdialog.cpp | 2 ++
modules/twainui/image_rsc/logo/deli.ico | Bin 0 -> 67646 bytes
modules/version/HGVersion.h | 1 +
28 files changed, 142 insertions(+), 27 deletions(-)
create mode 100644 app/fwupgrade/image_rsc/logo/deli.ico
create mode 100644 app/scanner/image_rsc/logo/deli.ico
create mode 100644 app/scanner2/image_rsc/logo/deli.ico
create mode 100644 app/upgrade/image_rsc/logo/deli.ico
create mode 100644 modules/twainui/image_rsc/logo/deli.ico
diff --git a/app/fwupgrade/FWUpgrade_resource.qrc b/app/fwupgrade/FWUpgrade_resource.qrc
index 1c362b25..00a84370 100644
--- a/app/fwupgrade/FWUpgrade_resource.qrc
+++ b/app/fwupgrade/FWUpgrade_resource.qrc
@@ -18,5 +18,6 @@
image_rsc/logo/uniscan.ico
image_rsc/logo/waiting.gif
image_rsc/distortion/testPaper.jpg
+ image_rsc/logo/deli.ico
diff --git a/app/fwupgrade/image_rsc/logo/deli.ico b/app/fwupgrade/image_rsc/logo/deli.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f573b6d0c35bace092fb9b82aa55cc78dae9667a
GIT binary patch
literal 67646
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
IjN`!n0E!4adH?_b
literal 0
HcmV?d00001
diff --git a/app/scanner/Scanner_resource.qrc b/app/scanner/Scanner_resource.qrc
index 3942cd66..db032ab1 100644
--- a/app/scanner/Scanner_resource.qrc
+++ b/app/scanner/Scanner_resource.qrc
@@ -106,5 +106,6 @@
image_rsc/logo/uniscan.ico
image_rsc/actions/imageEdit.png
image_rsc/actions/scanInto.png
+ image_rsc/logo/deli.ico
diff --git a/app/scanner/VersionDll.cpp b/app/scanner/VersionDll.cpp
index 49a54e51..9de00b88 100644
--- a/app/scanner/VersionDll.cpp
+++ b/app/scanner/VersionDll.cpp
@@ -65,6 +65,8 @@ HGResult VersionDll::Load()
strcat(dllPath, "ZGVersion.dll");
#elif defined(OEM_NEUTRAL)
strcat(dllPath, "HGNeuVersion.dll");
+ #elif defined(OEM_DELI)
+ strcat(dllPath, "DeliVersion.dll");
#else
strcat(dllPath, "HGVersion.dll");
#endif
@@ -81,6 +83,8 @@ HGResult VersionDll::Load()
strcpy(dllPath, "libZgVersion.so");
#elif defined(OEM_NEUTRAL)
strcat(dllPath, "libHGNeuVersion.so");
+ #elif defined(OEM_DELI)
+ strcat(dllPath, "libDeliVersion.so");
#else
strcpy(dllPath, "libHGVersion.so");
#endif
diff --git a/app/scanner/dialog_aquireinto.cpp b/app/scanner/dialog_aquireinto.cpp
index f6ae7546..62a46ef5 100644
--- a/app/scanner/dialog_aquireinto.cpp
+++ b/app/scanner/dialog_aquireinto.cpp
@@ -237,6 +237,8 @@ void Dialog_AquireInto::setCfgBaseOnSection(QString section)
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("ZGScan")));
#elif defined(OEM_NEUTRAL)
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("Scan")));
+#elif defined(OEM_DELI)
+ ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("DLScan")));
#else
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("HGScan")));
#endif
diff --git a/app/scanner/dialog_feedback.cpp b/app/scanner/dialog_feedback.cpp
index 0bc68cf1..89f611fa 100644
--- a/app/scanner/dialog_feedback.cpp
+++ b/app/scanner/dialog_feedback.cpp
@@ -37,6 +37,8 @@ void Dialog_Feedback::on_pbtn_submit_clicked()
oemName = HGVERSION_OEMNAME_UNIS;
#elif defined(OEM_NEUTRAL)
oemName = HGVERSION_OEMNAME_HUAGAO_NEU;
+#elif defined(OEM_DELI)
+ oemName = HGVERSION_OEMNAME_DELI;
#else
oemName = HGVERSION_OEMNAME_HUAGO;
#endif
diff --git a/app/scanner/dialog_upgrade.cpp b/app/scanner/dialog_upgrade.cpp
index f195aac2..d4d598ed 100644
--- a/app/scanner/dialog_upgrade.cpp
+++ b/app/scanner/dialog_upgrade.cpp
@@ -31,6 +31,8 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers
oemName = HGVERSION_OEMNAME_UNIS;
#elif defined(OEM_NEUTRAL)
oemName = HGVERSION_OEMNAME_HUAGAO_NEU;
+#elif defined(OEM_DELI)
+ oemName = HGVERSION_OEMNAME_DELI;
#else
oemName = HGVERSION_OEMNAME_HUAGO;
#endif
diff --git a/app/scanner/image_rsc/logo/deli.ico b/app/scanner/image_rsc/logo/deli.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f573b6d0c35bace092fb9b82aa55cc78dae9667a
GIT binary patch
literal 67646
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
IjN`!n0E!4adH?_b
literal 0
HcmV?d00001
diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp
index 66aa3be7..9026b868 100644
--- a/app/scanner/mainwindow.cpp
+++ b/app/scanner/mainwindow.cpp
@@ -124,6 +124,10 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
this->setWindowIcon(QIcon(":images/image_rsc/logo/RightWay_logo.ico"));
this->setWindowTitle(tr("Scan"));
m_oemName = HGVERSION_OEMNAME_HUAGO_NEU;
+#elif defined(OEM_DELI)
+ this->setWindowIcon(QIcon(":images/image_rsc/logo/deli.ico"));
+ this->setWindowTitle(tr("DeliScan"));
+ m_oemName = HGVERSION_OEMNAME_DELI;
#else
this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico"));
this->setWindowTitle(tr("HuaGoScan"));
@@ -143,7 +147,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_NEUTRAL)
+#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_NEUTRAL) && !defined(OEM_DELI)
if (m_versionDll->IsValid())
{
ui->actionact_update->setVisible(true);
@@ -374,6 +378,8 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
m_password = "uniscan";
#elif defined(OEM_NEUTRAL)
m_password = "scan";
+ #elif defined(OEM_DELI)
+ m_password = "deliscan";
#else
m_password = "huagoscan";
#endif
@@ -3263,6 +3269,8 @@ void MainWindow::on_act_help_triggered()
filename = QApplication::applicationDirPath() + "/UniScan_App_Help_manual.pdf";
#elif defined(OEM_NEUTRAL)
filename = QApplication::applicationDirPath() + "/HGScan_App_Help_manual.pdf";
+ #elif defined(OEM_DELI)
+ filename = QApplication::applicationDirPath() + "/DeliScan_App_Help_manual.pdf";
#else
filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf";
#endif
@@ -3294,6 +3302,8 @@ void MainWindow::on_act_help_triggered()
filename = QApplication::applicationDirPath() + "/../../entries/help/UniScan_App_Help_manual.pdf";
#elif defined(OEM_NEUTRAL)
filename = QApplication::applicationDirPath() + "/../../entries/help/HGScan_App_Help_manual.pdf";
+#elif defined(OEM_DELI)
+ filename = QApplication::applicationDirPath() + "/../../entries/help/DeliScan_App_Help_manual.pdf";
#else
filename = QApplication::applicationDirPath() + "/../../entries/help/HuaGoScan_App_Help_manual.pdf";
#endif
@@ -3314,6 +3324,8 @@ void MainWindow::on_act_help_triggered()
filename = QApplication::applicationDirPath() + "/../doc/UniScan_App_Help_manual.pdf";
#elif defined(OEM_NEUTRAL)
filename = QApplication::applicationDirPath() + "/../doc/HGScan_App_Help_manual.pdf";
+#elif defined(OEM_DELI)
+ filename = QApplication::applicationDirPath() + "/../doc/DeliScan_App_Help_manual.pdf";
#else
filename = QApplication::applicationDirPath() + "/../doc/HuaGoScan_App_Help_manual.pdf";
#endif
@@ -4000,6 +4012,13 @@ void MainWindow::upgradeApp(QString pkgPath)
// QFile::copy(curPath + "ZGBase.dll", tmpPath + "ZGBase.dll");
// QFile::remove(tmpPath + "ZGVersion.dll");
// QFile::copy(curPath + "ZGVersion.dll", tmpPath + "ZGVersion.dll");
+// #elif defined(OEM_DELI)
+// QFile::remove(tmpPath + "DLUpgradeApp.exe");
+// QFile::copy(curPath + "DLUpgradeApp.exe", tmpPath + "DLUpgradeApp.exe");
+// QFile::remove(tmpPath + "DLBase.dll");
+// QFile::copy(curPath + "DLBase.dll", tmpPath + "DLBase.dll");
+// QFile::remove(tmpPath + "DLVersion.dll");
+// QFile::copy(curPath + "DLVersion.dll", tmpPath + "DLVersion.dll");
// #else
QFile::remove(tmpPath + "HGUpgradeApp.exe");
QFile::copy(curPath + "HGUpgradeApp.exe", tmpPath + "HGUpgradeApp.exe");
@@ -4066,6 +4085,13 @@ void MainWindow::upgradeApp(QString pkgPath)
// QFile::copy(curPath + "libZgBase.so", tmpPath + "libZgBase.so");
// QFile::remove(tmpPath + "libZgVersion.so");
// QFile::copy(curPath + "libZgVersion.so", tmpPath + "libZgVersion.so");
+// #elif defined(OEM_DELI)
+// QFile::remove(tmpPath + "DlUpgradeApp");
+// QFile::copy(curPath + "DlUpgradeApp", tmpPath + "DlUpgradeApp");
+// QFile::remove(tmpPath + "libDlBase.so");
+// QFile::copy(curPath + "libDlBase.so", tmpPath + "libDlBase.so");
+// QFile::remove(tmpPath + "libDlVersion.so");
+// QFile::copy(curPath + "libDlVersion.so", tmpPath + "libDlVersion.so");
// #else
QFile::remove(tmpPath + "HGUpgradeApp");
QFile::copy(curPath + "HGUpgradeApp", tmpPath + "HGUpgradeApp");
@@ -4095,8 +4121,10 @@ void MainWindow::upgradeApp(QString pkgPath)
// isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp.exe", argList);
// #elif defined(OEM_ZHONGJING)
// isSuccessdStart = proc.startDetached(tmpPath + "ZJUpgradeApp.exe", argList);
-// #elif defined(OEM_ZIGUANG)
-// isSuccessdStart = proc.startDetached(tmpPath + "ZGUpgradeApp.exe", argList);
+// #elif defined(OEM_ZIGUANG)
+// isSuccessdStart = proc.startDetached(tmpPath + "ZGUpgradeApp.exe", argList);
+// #elif defined(OEM_DELI)
+// isSuccessdStart = proc.startDetached(tmpPath + "DLUpgradeApp.exe", argList);
// #else
isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp.exe", argList);
// #endif
diff --git a/app/scanner2/Scanner_resource.qrc b/app/scanner2/Scanner_resource.qrc
index 3942cd66..db032ab1 100644
--- a/app/scanner2/Scanner_resource.qrc
+++ b/app/scanner2/Scanner_resource.qrc
@@ -106,5 +106,6 @@
image_rsc/logo/uniscan.ico
image_rsc/actions/imageEdit.png
image_rsc/actions/scanInto.png
+ image_rsc/logo/deli.ico
diff --git a/app/scanner2/dialog_aquireinto.cpp b/app/scanner2/dialog_aquireinto.cpp
index 51693435..a076245b 100644
--- a/app/scanner2/dialog_aquireinto.cpp
+++ b/app/scanner2/dialog_aquireinto.cpp
@@ -234,6 +234,8 @@ void Dialog_AquireInto::setCfgBaseOnSection(QString section)
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("ZGScan")));
#elif defined(OEM_NEUTRAL)
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("Scan")));
+#elif defined(OEM_DELI)
+ ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("DLScan")));
#else
ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("HGScan")));
#endif
diff --git a/app/scanner2/dialog_feedback.cpp b/app/scanner2/dialog_feedback.cpp
index 0cce5094..103a2ab1 100644
--- a/app/scanner2/dialog_feedback.cpp
+++ b/app/scanner2/dialog_feedback.cpp
@@ -37,6 +37,8 @@ void Dialog_Feedback::on_pbtn_submit_clicked()
oemName = HGVERSION_OEMNAME_UNIS;
#elif defined(OEM_NEUTRAL)
oemName = HGVERSION_OEMNAME_NEUTRAL;
+#elif defined(OEM_DELI)
+ oemName = HGVERSION_OEMNAME_DELI;
#else
oemName = HGVERSION_OEMNAME_HUAGO;
#endif
diff --git a/app/scanner2/dialog_upgrade.cpp b/app/scanner2/dialog_upgrade.cpp
index 715d5ae5..05e30b0d 100644
--- a/app/scanner2/dialog_upgrade.cpp
+++ b/app/scanner2/dialog_upgrade.cpp
@@ -31,6 +31,8 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers
oemName = HGVERSION_OEMNAME_UNIS;
#elif defined(OEM_NEUTRAL)
oemName = HGVERSION_OEMNAME_NEUTRAL;
+#elif defined(OEM_DELI)
+ oemName = HGVERSION_OEMNAME_DELI;
#else
oemName = HGVERSION_OEMNAME_HUAGO;
#endif
diff --git a/app/scanner2/image_rsc/logo/deli.ico b/app/scanner2/image_rsc/logo/deli.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f573b6d0c35bace092fb9b82aa55cc78dae9667a
GIT binary patch
literal 67646
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
IjN`!n0E!4adH?_b
literal 0
HcmV?d00001
diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp
index bcaaa31a..487bce3b 100644
--- a/app/scanner2/mainwindow.cpp
+++ b/app/scanner2/mainwindow.cpp
@@ -118,9 +118,13 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
this->setWindowTitle(tr("UniScan"));
m_oemName = HGVERSION_OEMNAME_UNIS;
#elif defined(OEM_NEUTRAL)
- this->setWindowIcon(QIcon(":images/image_rsc/logo/RightWay_logo.ico"));
+ this->setWindowIcon(QIcon(":images/image_rsc/logo/NoBrand_logo.ico"));
this->setWindowTitle(tr("Scan"));
m_oemName = HGVERSION_OEMNAME_NEUTRAL;
+#elif defined(OEM_DELI)
+ this->setWindowIcon(QIcon(":images/image_rsc/logo/deli.ico"));
+ this->setWindowTitle(tr("DeliScan"));
+ m_oemName = HGVERSION_OEMNAME_DELI;
#else
this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico"));
this->setWindowTitle(tr("HuaGoScan"));
@@ -142,7 +146,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_NEUTRAL)
+#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_NEUTRAL) && !defined(OEM_DELI)
if (m_versionDll->IsValid())
{
ui->actionact_update->setVisible(true);
@@ -348,6 +352,8 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
m_password = "uniscan";
#elif defined(OEM_NEUTRAL)
m_password = "scan";
+ #elif defined(OEM_DELI)
+ m_password = "deliscan";
#else
m_password = "huagoscan";
#endif
@@ -2805,6 +2811,8 @@ void MainWindow::on_act_help_triggered()
filename = QApplication::applicationDirPath() + "/UniScan_App_Help_manual.pdf";
#elif defined(OEM_NEUTRAL)
filename = QApplication::applicationDirPath() + "/NeuScan_App_Help_manual.pdf";
+ #elif defined(OEM_DELI)
+ filename = QApplication::applicationDirPath() + "/DeliScan_App_Help_manual.pdf";
#else
filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf";
#endif
@@ -2836,6 +2844,8 @@ void MainWindow::on_act_help_triggered()
filename = QApplication::applicationDirPath() + "/../../entries/help/UniScan_App_Help_manual.pdf";
#elif defined(OEM_NEUTRAL)
filename = QApplication::applicationDirPath() + "/../../entries/help/NeuScan_App_Help_manual.pdf";
+#elif defined(OEM_DELI)
+ filename = QApplication::applicationDirPath() + "/../../entries/help/DeliScan_App_Help_manual.pdf";
#else
filename = QApplication::applicationDirPath() + "/../../entries/help/HuaGoScan_App_Help_manual.pdf";
#endif
@@ -2856,6 +2866,8 @@ void MainWindow::on_act_help_triggered()
filename = QApplication::applicationDirPath() + "/../doc/UniScan_App_Help_manual.pdf";
#elif defined(OEM_NEUTRAL)
filename = QApplication::applicationDirPath() + "/../doc/NeuScan_App_Help_manual.pdf";
+#elif defined(OEM_DELI)
+ filename = QApplication::applicationDirPath() + "/../doc/DeliScan_App_Help_manual.pdf";
#else
filename = QApplication::applicationDirPath() + "/../doc/HuaGoScan_App_Help_manual.pdf";
#endif
@@ -3269,6 +3281,13 @@ void MainWindow::upgradeApp(QString pkgPath)
// QFile::copy(curPath + "ZGBase.dll", tmpPath + "ZGBase.dll");
// QFile::remove(tmpPath + "ZGVersion.dll");
// QFile::copy(curPath + "ZGVersion.dll", tmpPath + "ZGVersion.dll");
+// #elif defined(OEM_DELI)
+// QFile::remove(tmpPath + "DLUpgradeApp.exe");
+// QFile::copy(curPath + "DLUpgradeApp.exe", tmpPath + "DLUpgradeApp.exe");
+// QFile::remove(tmpPath + "DLBase.dll");
+// QFile::copy(curPath + "DLBase.dll", tmpPath + "DLBase.dll");
+// QFile::remove(tmpPath + "DLVersion.dll");
+// QFile::copy(curPath + "DLVersion.dll", tmpPath + "DLVersion.dll");
// #else
QFile::remove(tmpPath + "HGUpgradeApp.exe");
QFile::copy(curPath + "HGUpgradeApp.exe", tmpPath + "HGUpgradeApp.exe");
@@ -3380,6 +3399,13 @@ void MainWindow::upgradeApp(QString pkgPath)
// QFile::copy(curPath + "libZgBase.so", tmpPath + "libZgBase.so");
// QFile::remove(tmpPath + "libZgVersion.so");
// QFile::copy(curPath + "libZgVersion.so", tmpPath + "libZgVersion.so");
+// #elif defined(OEM_DELI)
+// QFile::remove(tmpPath + "DlUpgradeApp");
+// QFile::copy(curPath + "DlUpgradeApp", tmpPath + "DlUpgradeApp");
+// QFile::remove(tmpPath + "libDlBase.so");
+// QFile::copy(curPath + "libDlBase.so", tmpPath + "libDlBase.so");
+// QFile::remove(tmpPath + "libDlVersion.so");
+// QFile::copy(curPath + "libDlVersion.so", tmpPath + "libDlVersion.so");
// #else
QFile::remove(tmpPath + "HGUpgradeApp");
QFile::copy(curPath + "HGUpgradeApp", tmpPath + "HGUpgradeApp");
@@ -3409,8 +3435,10 @@ void MainWindow::upgradeApp(QString pkgPath)
// isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp.exe", argList);
// #elif defined(OEM_ZHONGJING)
// isSuccessdStart = proc.startDetached(tmpPath + "ZJUpgradeApp.exe", argList);
-// #elif defined(OEM_ZIGUANG)
-// isSuccessdStart = proc.startDetached(tmpPath + "ZGUpgradeApp.exe", argList);
+// #elif defined(OEM_ZIGUANG)
+// isSuccessdStart = proc.startDetached(tmpPath + "ZGUpgradeApp.exe", argList);
+// #elif defined(OEM_DELI)
+// isSuccessdStart = proc.startDetached(tmpPath + "DLUpgradeApp.exe", argList);
// #else
proc.setWorkingDirectory(tmpPath);
isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp.exe", argList);
@@ -3424,8 +3452,10 @@ void MainWindow::upgradeApp(QString pkgPath)
// isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp", argList);
// #elif defined(OEM_ZHONGJING)
// isSuccessdStart = proc.startDetached(tmpPath + "ZjUpgradeApp", argList);
-// #elif defined(OEM_ZIGUANG)
-// isSuccessdStart = proc.startDetached(tmpPath + "ZgUpgradeApp", argList);
+// #elif defined(OEM_ZIGUANG)
+// isSuccessdStart = proc.startDetached(tmpPath + "ZgUpgradeApp", argList);
+// #elif defined(OEM_DELI)
+// isSuccessdStart = proc.startDetached(tmpPath + "DlUpgradeApp", argList);
// #else
isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp", argList);
// #endif
@@ -3633,6 +3663,8 @@ void MainWindow::ocrMsgPumpFunc(HGMsgPump msgPump, const HGMsg *msg, HGPointer p
proc.startDetached(curPath + "ZgOCR.exe", argList);
#elif defined(OEM_NEUTRAL)
proc.startDetached(curPath + "NeuOCR.exe", argList);
+ #elif defined(OEM_DELI)
+ proc.startDetached(curPath + "DeliOCR.exe", argList);
#else
proc.startDetached(curPath + "HGOCR.exe", argList);
#endif
@@ -3649,6 +3681,8 @@ void MainWindow::ocrMsgPumpFunc(HGMsgPump msgPump, const HGMsg *msg, HGPointer p
proc.startDetached(curPath + "ZgOCR", argList);
#elif defined(OEM_NEUTRAL)
proc.startDetached(curPath + "NeuOCR", argList);
+ #elif defined(OEM_DELI)
+ proc.startDetached(curPath + "DeliOCR", argList);
#else
proc.startDetached(curPath + "HGOCR", argList);
#endif
diff --git a/app/upgrade/Upgrade_resource.qrc b/app/upgrade/Upgrade_resource.qrc
index 0751d17f..6cb479bb 100644
--- a/app/upgrade/Upgrade_resource.qrc
+++ b/app/upgrade/Upgrade_resource.qrc
@@ -10,11 +10,12 @@
image_rsc/logo/HUAGO-LOGO-for UI.jpg
image_rsc/logo/HUAGO-LOGO-for UI.png
image_rsc/logo/Lanxum_logo.ico
- image_rsc/logo/Cumtenn_logo.ico
+ image_rsc/logo/Cumtenn_logo.ico
image_rsc/logo/logo.ico
- image_rsc/logo/uniscan.ico
+ image_rsc/logo/uniscan.ico
image_rsc/logo/NoBrand_logo.ico
image_rsc/logo/RightWay_logo.ico
image_rsc/logo/waiting.gif
+ image_rsc/logo/deli.ico
diff --git a/app/upgrade/image_rsc/logo/deli.ico b/app/upgrade/image_rsc/logo/deli.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f573b6d0c35bace092fb9b82aa55cc78dae9667a
GIT binary patch
literal 67646
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
IjN`!n0E!4adH?_b
literal 0
HcmV?d00001
diff --git a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro
index ebb55864..c3dedf51 100644
--- a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro
+++ b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro
@@ -37,9 +37,13 @@ if (contains(DEFINES, OEM_HANWANG)) {
RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/uniscan.ico
} else {
if (contains(DEFINES, OEM_NEUTRAL)) {
- RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/RightWay_logo.ico
+ RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/NoBrand_logo.ico
} else {
- RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/logo.ico
+ if (contains(DEFINES, OEM_DELI)) {
+ RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/deli.ico
+ } else {
+ RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/logo.ico
+ }
}
}
}
diff --git a/build2/qt/HGOEM.pri b/build2/qt/HGOEM.pri
index 9fdfd25c..63359fda 100644
--- a/build2/qt/HGOEM.pri
+++ b/build2/qt/HGOEM.pri
@@ -37,10 +37,17 @@ if (contains(DEFINES, OEM_HANWANG)) {
OEM_PREFIX3 = neu
OEM_NAME = neutral
} else {
- OEM_PREFIX = HG
- OEM_PREFIX2 = HG
- OEM_PREFIX3 = hg
- OEM_NAME = huagao
+ if (contains(DEFINES, OEM_DELI)) {
+ OEM_PREFIX = DL
+ OEM_PREFIX2 = Dl
+ OEM_PREFIX3 = dl
+ OEM_NAME = deli
+ } else {
+ OEM_PREFIX = HG
+ OEM_PREFIX2 = HG
+ OEM_PREFIX3 = hg
+ OEM_NAME = huagao
+ }
}
}
}
diff --git a/build2/qt/HGScanner/HGScanner.pro b/build2/qt/HGScanner/HGScanner.pro
index dd945187..0e2b6b2e 100644
--- a/build2/qt/HGScanner/HGScanner.pro
+++ b/build2/qt/HGScanner/HGScanner.pro
@@ -42,11 +42,16 @@ if (contains(DEFINES, OEM_HANWANG)) {
TARGET = UniScan
} else {
if (contains(DEFINES, OEM_NEUTRAL)) {
- RC_ICONS = ../../../app/scanner/image_rsc/logo/RightWay_logo.ico
- TARGET = HGScan
+ RC_ICONS = ../../../app/scanner/image_rsc/logo/NoBrand_logo.ico
+ TARGET = NeuScan
} else {
- RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
- TARGET = HuaGoScan
+ if (contains(DEFINES, OEM_DELI)) {
+ RC_ICONS = ../../../app/scanner/image_rsc/logo/deli.ico
+ TARGET = DELI SCAN
+ } else {
+ RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
+ TARGET = HuaGoScan
+ }
}
}
}
diff --git a/build2/qt/HGScanner2/HGScanner2.pro b/build2/qt/HGScanner2/HGScanner2.pro
index 4b3865d0..2a6c9816 100644
--- a/build2/qt/HGScanner2/HGScanner2.pro
+++ b/build2/qt/HGScanner2/HGScanner2.pro
@@ -42,11 +42,16 @@ if (contains(DEFINES, OEM_HANWANG)) {
TARGET = UniScan2
} else {
if (contains(DEFINES, OEM_NEUTRAL)) {
- RC_ICONS = ../../../app/scanner2/image_rsc/logo/RightWay_logo.ico
+ RC_ICONS = ../../../app/scanner2/image_rsc/logo/NoBrand_logo.ico
TARGET = NeuScan2
} else {
- RC_ICONS = ../../../app/scanner2/image_rsc/logo/logo.ico
- TARGET = HuaGoScan2
+ if (contains(DEFINES, OEM_DELI)) {
+ RC_ICONS = ../../../app/scanner2/image_rsc/logo/deli.ico
+ TARGET = DELI SCAN2
+ } else {
+ RC_ICONS = ../../../app/scanner2/image_rsc/logo/logo.ico
+ TARGET = HuaGoScan2
+ }
}
}
}
diff --git a/build2/qt/HGUpgrade/HGUpgrade.pro b/build2/qt/HGUpgrade/HGUpgrade.pro
index a02cd090..c208aaf2 100644
--- a/build2/qt/HGUpgrade/HGUpgrade.pro
+++ b/build2/qt/HGUpgrade/HGUpgrade.pro
@@ -37,9 +37,13 @@ if (contains(DEFINES, OEM_HANWANG)) {
RC_ICONS = ../../../app/upgrade/image_rsc/logo/uniscan.ico
} else {
if (contains(DEFINES, OEM_NEUTRAL)) {
- RC_ICONS = ../../../app/upgrade/image_rsc/logo/RightWay_logo.ico
+ RC_ICONS = ../../../app/upgrade/image_rsc/logo/NoBrand_logo.ico
} else {
- RC_ICONS = ../../../app/upgrade/image_rsc/logo/logo.ico
+ if (contains(DEFINES, OEM_DELI)) {
+ RC_ICONS = ../../../app/upgrade/image_rsc/logo/deli.ico
+ } else {
+ RC_ICONS = ../../../app/upgrade/image_rsc/logo/logo.ico
+ }
}
}
}
diff --git a/modules/twain_user/HGTwainImpl.cpp b/modules/twain_user/HGTwainImpl.cpp
index cb3813d2..d4c555f4 100644
--- a/modules/twain_user/HGTwainImpl.cpp
+++ b/modules/twain_user/HGTwainImpl.cpp
@@ -332,7 +332,7 @@ LRESULT CALLBACK HGTwainDSMImpl::NewWndProc(HWND hWnd, UINT msg, WPARAM wParam,
bool HGTwainDSMImpl::filterTwainSource(const char* sourceName, int majorNum)
{
-#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_NEUTRAL)
+#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_NEUTRAL) && !defined(OEM_DELI)
std::string oemIden = "HUAGOSCAN";
#elif defined(OEM_HANWANG)
std::string oemIden = "Hanvon";
@@ -344,6 +344,8 @@ bool HGTwainDSMImpl::filterTwainSource(const char* sourceName, int majorNum)
std::string oemIden = "Microtek";
#elif defined(OEM_ZIGUANG)
std::string oemIden = "Uniscan";
+#elif defined(OEM_DELI)
+ std::string oemIden = "DELI SCAN";
#endif
if (sourceName != strstr(sourceName, oemIden.c_str()) || 4 != majorNum)
diff --git a/modules/twainui/TwainUI_resource.qrc b/modules/twainui/TwainUI_resource.qrc
index 7688a98d..275066a5 100644
--- a/modules/twainui/TwainUI_resource.qrc
+++ b/modules/twainui/TwainUI_resource.qrc
@@ -14,5 +14,6 @@
image_rsc/logo/NoBrand_logo.ico
image_rsc/logo/RightWay_logo.ico
image_rsc/logo/uniscan.ico
+ image_rsc/logo/deli.ico
diff --git a/modules/twainui/app_cfg.cpp b/modules/twainui/app_cfg.cpp
index 2da298ac..73388f7f 100644
--- a/modules/twainui/app_cfg.cpp
+++ b/modules/twainui/app_cfg.cpp
@@ -188,6 +188,8 @@ HGResult GetConfigPath(HGChar* configPath, HGUInt maxLen)
appName = "MicrotekScan";
#elif defined(OEM_ZIGUANG)
appName = "UniScan";
+#elif defined(OEM_DELI)
+ appName = "DeliScan";
#endif
#if defined(HG_CMP_MSC)
diff --git a/modules/twainui/hg_settingdialog.cpp b/modules/twainui/hg_settingdialog.cpp
index bc2ec147..6979fc03 100644
--- a/modules/twainui/hg_settingdialog.cpp
+++ b/modules/twainui/hg_settingdialog.cpp
@@ -2282,6 +2282,8 @@ void hg_settingdialog::setIcon()
this->setWindowIcon(QIcon(":logo/image_rsc/logo/Microtek_logo.ico"));
#elif defined(OEM_ZIGUANG)
this->setWindowIcon(QIcon(":logo/image_rsc/logo/uniscan.ico"));
+#elif defined(OEM_DELI)
+ this->setWindowIcon(QIcon(":logo/image_rsc/logo/deli.ico"));
#endif
}
diff --git a/modules/twainui/image_rsc/logo/deli.ico b/modules/twainui/image_rsc/logo/deli.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f573b6d0c35bace092fb9b82aa55cc78dae9667a
GIT binary patch
literal 67646
zcmeHP33yc16&`RwTWYOa>qZr;vWUu(1PFvpQBYBffKV%xB8m%CDT*R3ZWJwUbuA)P
zMXK~ei&aq3Dhg!ZcajiD0ucxV$U+v9)AQfS%lE$d=FYsAWa{8Om+$f>@4b2V-1DFP
z-ZvgkC;qo+k%#}kz|-TTPM)(o9#0SMd|i8
z{+o-v#D8XEFZc`oV*kyS0l{DJm-ydY84&$97ki2S%*I~u7yQNkn=J!^zu+(Nzqv9X
z`fo1w691Wvz2GnSi~ToS1_Xb>U*dmrWkB@bT>S(8D2-B#}Xx5)>98!GL)SS_UvJSMYck7j%FojE~;4g}%%9*q7;v>=aMY
zZRc%3OdxYn$Hh}W9;XkF-Gj%(`1l*+f=-Mb!}bZ?;v>%6dj#Jb**V@j){kAwZ%FWu
zVLE_0<`c=s8!t?y1(OTu?Pqq=7i;!Y>}Lllj{7$sRniB4-$T#M*-29eWT`n^)`A6O
z0MBW!ELgMv@2JiRH2#uwdTPdYTJy>t`j*E}{PGYbf9>t@8xPUv@9n2IpV&on#^%xJ
zGm~58R$kQ{n-K`DLuZUtfdw9QqN8COjyn-0@$eKYBb&au?D
za~wS~sem$KtGs!QvH#qPLdpZk28LWsKpJ*SPmemO=QGCw{-3N(+w!V*x=Q?iiY*bP2Ws
zdZBBn-yBx>Lq46-)N)^k=>IUbJ^grW_|TW;mnhnGw7NOJ`Qu8u{`^!WQ}$RW&>X?*
z2=<4tK~LYigX(IW>AMrUvg500@|Bsb^f-|L_-^1g;-^Wp{_TBEhEew%EBJ#4{aNq(
z9T!I*y}8%%{G8qh+cvRhhT?f3+;I)GAWj0m-+XeH(;-~lx3{dGZtIt+?6MP?1T7;^
zPh!7**wr}40{-B46x&(E_8+h8c-o9;LT++3MKkt&
zJ8|61y!DlV81~7?Hy+@a(@g`Pk2W?3jKlmrFF&n@hI0HKaYDRbdXV42A8vT3!r#{&
zox5v9uHtXF`hVoCGY01{{~S$+N(zq9$N$(zE1ud#%OBrGYhL<}b1&z1@x2$ym0yRA
zx8o0afX~177bzUGHv}c-U`3(1v;UzvSv9_1$2XrE(UK-~hdrX7FS
zs1au*QOUO8asE1vnULpWOpJZ8>fRa|@?XT(;fO!@HGh0?`Tm6Ueb`Tu)Vz?(4QkO9
z=qzj`=8ZZa=D2W55giE*_hm
zmM~3_jghA%(U$cGm2W_vj+o5eAp@(PEm!p!)NMfzVnWEnQ!|P!5%GJ3&p|GTd1L-j
zRt?Wjd=qx~^BfV|pmr9heYAY9(yRW=PYWyE5jON9=K1~C=Tk$yz9s@3e%n8bN+hu`M)+b=+>teCfd7;fDVJ=KZ8z8B|-Puj}Qp?Tqf4pzwFX
zZ^b*VkHIf2TNpTgU;cQRk`;Uhct$bLzg)Xt%kFfpm12D%ie(I#LjR$o!8-U3**e>^
zN%eF1Xzw`R&GU_VChBjX2li~r6`9l+K!#CcMxEPfeKXwfhu>auSFx7gxUgViA^Z8w
zLG>OyvpVDiH8RM}j@(-9^S5lMr2fZy*NcGX*mF|pyOMhC{SW?no5~Fkmrdck?VhW0
zTXovf?Y15fH%{o0-s;zY)sk7oT3Q
zy)XI~uR9{nfi3bkcYo)?34g5TMxU5S318^>xa`km%E$Vfi<5I$$G|#m^&yP_Fczqd
zq22=j&4|sh2O`%4CD=1XVf*UE#n?1e6a2bC;ZhK6U%P$
zS9<(k;WZ%WgGImFBW&Z?b5aO(8eK!|4O<%w|Mgsd!@6WB@z3N~AAGU!|2lwee1q#=
z@NaH-5>EI78{{{!pX&7pIWb~Hr*Xe8FA&p@Iomn@bH?cPAO0RW8REoH>3=%!*-&vS
z+ZX6|ApDoJ{vXTu5ANcv`LBORU$2AD_10LN`#8G{0Dq_Y5C1=XP`1uYs68cEdquqp
z_`9h$Yai-!A@1`-Y>T}1?uU*)a6Y@FObPM}$$Us|cfE)Y~D~`W7jp}%h
zhQEe7+eEHaAlFCD@2#hIQy$l&p|ehU8t<)0VqdraJAG~OKP&gO#{VYZkJ`oDarvaL
z(hs&Bc>1Ki+`ySxHf_{4dgn(>;Tp|5ThYh8|cFRBj!SUwE8)H
z&Rtb`RMlvdJ#r|EpclC=V$6TOps#f_9c@2u4G`0!}uT1!CLEVmbE}FeM=P$KH0lJ#CL4pzcD|^IIw)|_U(Zl
zODSB>!M)b}Ou!%f>dQKJ%cbeO2H@ZCT1=}tc$A*xb$09rMhy;j5$EZ(z1B(1tkT(;5FW_g!&Tp-y@$zZm8-vJg3oTrqJv$c@(=L_#Tj4
z-mf0jg=-5eHi@!plgw1MBd_;A@CwRaVJ3$V7}q+tyK`?FxX
z>~-!?;17Gb@Hd6DjrW}8r`D+a1vw0QA-_X_eYY{Z{)o8Ql0%2bcJ2R0%m%+bh4(~P
z?$y`oobc1SXZ|g1!yoenpRPJRndMQxc4&>$-s8&;mnxfsy+?LlhXQ}BD-7p7G*_RI
ztmZfBv}BHzynXapDKzp_@7lAS4u_xHg+Ipd?!DSVv#!piBM#rK3B>#M;Ey~5`iQ-`
zSoaH6Lq34G1-=7z(9Y{n;6I#o8?t>q=c3(se}uiC$LA3LDlFKa*=cd`x!w3<4AfPS
zCr#sZ?Xsfad)@-!(k}cN3)o`B0+V`YP*GOL+ksU}%T;WMT-6tQ@FEoWV}A?wl>Ft+
zVzr0uN!~YR^`-ot)B`u`>0PH2!e>$R}{KYBI0T6
zxk263ZJWn2Jl2lf#(#Dito?MbnV{vN3ENbx=av@Sk9R%RzP^WUYS}X!#cN;w^xhgj
z6!@dQ_51^R{IUKRF8G7@(Y!Al`Ue|{y;du^{)+dSYy9jNL>#@7_erCM{@Bzax{7tS
zALkWL*MBU&>yGeE@CSHL9(Ho|^X2^BZ4F^Ru&!bK0`DHa_{S2JqhfElRo~N%W1SBb
z{^9)or!{x`5jujJ3UnDc0%Fvgx~HkV{@62zJsUH5KP}$v!+RUBU05$b4l{^*N8t~e
zKnwI1&xcJwjz59xK*--7;(QY|hleK?&|H=eyo+!H?%BT{RljqS#cK_%G`G-?bBj5L!#!@E
zkKcb;aBG2@w=X~N%nvv|4U6A@=}28<|BILn9kqFThcCgqW4^UFH#`m1y`TxPMkN2%
zkez0Hj_l<9Z7;WUBcH`OH|Fi{nXPqSm%fU5&@uUcN8)aK7UBl@Ys}r=an4$A3l)xS
zelBBxoI^)9?Qs)8+*ZD@E7}UwhRdVg1^N7=E{KRzq!~;
z{AV`yg1_J|_TOw75c~yyiT}-&0nvYRv6uMIZ0rSp!C&mZ*)kyb3;q)Sn=1pN|K?&Z
z@t@h)3;u$?*nhKSK=2p*8~pq(Bz%MPA3hK28Rs(Y$N{CB$AeOjG~s}7KsX>A5Do|j
IjN`!n0E!4adH?_b
literal 0
HcmV?d00001
diff --git a/modules/version/HGVersion.h b/modules/version/HGVersion.h
index 85929276..dc9e1147 100644
--- a/modules/version/HGVersion.h
+++ b/modules/version/HGVersion.h
@@ -15,6 +15,7 @@ HG_DECLARE_HANDLE(HGVersionMgr);
#define HGVERSION_OEMNAME_CUMTENN "Cumtenn"
#define HGVERSION_OEMNAME_MICROTEK "Microtek"
#define HGVERSION_OEMNAME_UNIS "Unis"
+#define HGVERSION_OEMNAME_DELI "Deli"
#pragma pack(push)
#pragma pack(4)