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 00000000..f573b6d0 Binary files /dev/null and b/app/fwupgrade/image_rsc/logo/deli.ico differ 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 00000000..f573b6d0 Binary files /dev/null and b/app/scanner/image_rsc/logo/deli.ico differ 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 00000000..f573b6d0 Binary files /dev/null and b/app/scanner2/image_rsc/logo/deli.ico differ 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 00000000..f573b6d0 Binary files /dev/null and b/app/upgrade/image_rsc/logo/deli.ico differ 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 00000000..f573b6d0 Binary files /dev/null and b/modules/twainui/image_rsc/logo/deli.ico differ 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)