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

app增加得力OEM

This commit is contained in:
yangjiaxuan 2023-07-17 13:40:22 +08:00
parent 6ae492077d
commit fcfedf5d03
28 changed files with 142 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/fwupgrade/FWUpgrade_resource.qrc
View File

@ -18,5 +18,6 @@
<file>image_rsc/logo/uniscan.ico</file>
<file>image_rsc/logo/waiting.gif</file>
<file>image_rsc/distortion/testPaper.jpg</file>
<file>image_rsc/logo/deli.ico</file>
</qresource>
</RCC>

BIN
app/fwupgrade/image_rsc/logo/deli.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

1
app/scanner/Scanner_resource.qrc
View File

@ -106,5 +106,6 @@
<file>image_rsc/logo/uniscan.ico</file>
<file>image_rsc/actions/imageEdit.png</file>
<file>image_rsc/actions/scanInto.png</file>
<file>image_rsc/logo/deli.ico</file>
</qresource>
</RCC>

4
app/scanner/VersionDll.cpp
View File

@ -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

2
app/scanner/dialog_aquireinto.cpp
View File

@ -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

2
app/scanner/dialog_feedback.cpp
View File

@ -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

2
app/scanner/dialog_upgrade.cpp
View File

@ -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

BIN
app/scanner/image_rsc/logo/deli.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

30
app/scanner/mainwindow.cpp
View File

@ -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");
@ -4097,6 +4123,8 @@ void MainWindow::upgradeApp(QString pkgPath)
// isSuccessdStart = proc.startDetached(tmpPath + "ZJUpgradeApp.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

1
app/scanner2/Scanner_resource.qrc
View File

@ -106,5 +106,6 @@
<file>image_rsc/logo/uniscan.ico</file>
<file>image_rsc/actions/imageEdit.png</file>
<file>image_rsc/actions/scanInto.png</file>
<file>image_rsc/logo/deli.ico</file>
</qresource>
</RCC>

2
app/scanner2/dialog_aquireinto.cpp
View File

@ -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

2
app/scanner2/dialog_feedback.cpp
View File

@ -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

2
app/scanner2/dialog_upgrade.cpp
View File

@ -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

BIN
app/scanner2/image_rsc/logo/deli.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

38
app/scanner2/mainwindow.cpp
View File

@ -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");
@ -3411,6 +3437,8 @@ void MainWindow::upgradeApp(QString pkgPath)
// isSuccessdStart = proc.startDetached(tmpPath + "ZJUpgradeApp.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);
@ -3426,6 +3454,8 @@ void MainWindow::upgradeApp(QString pkgPath)
// isSuccessdStart = proc.startDetached(tmpPath + "ZjUpgradeApp", 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

1
app/upgrade/Upgrade_resource.qrc
View File

@ -16,5 +16,6 @@
<file>image_rsc/logo/NoBrand_logo.ico</file>
<file>image_rsc/logo/RightWay_logo.ico</file>
<file>image_rsc/logo/waiting.gif</file>
<file>image_rsc/logo/deli.ico</file>
</qresource>
</RCC>

BIN
app/upgrade/image_rsc/logo/deli.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

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

@ -37,7 +37,10 @@ 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 {
if (contains(DEFINES, OEM_DELI)) {
RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/deli.ico
} else {
RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/logo.ico
}
@ -46,6 +49,7 @@ if (contains(DEFINES, OEM_HANWANG)) {
}
}
}
}
CONFIG(debug, debug|release) {
MY_CONFIGURE = Debug

7
build2/qt/HGOEM.pri
View File

@ -36,6 +36,12 @@ if (contains(DEFINES, OEM_HANWANG)) {
OEM_PREFIX2 = Neu
OEM_PREFIX3 = neu
OEM_NAME = neutral
} else {
if (contains(DEFINES, OEM_DELI)) {
OEM_PREFIX = DL
OEM_PREFIX2 = Dl
OEM_PREFIX3 = dl
OEM_NAME = deli
} else {
OEM_PREFIX = HG
OEM_PREFIX2 = HG
@ -47,3 +53,4 @@ if (contains(DEFINES, OEM_HANWANG)) {
}
}
}
}

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

@ -42,8 +42,12 @@ 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 {
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
@ -53,6 +57,7 @@ if (contains(DEFINES, OEM_HANWANG)) {
}
}
}
}
CONFIG(debug, debug|release) {
MY_CONFIGURE = Debug

7
build2/qt/HGScanner2/HGScanner2.pro
View File

@ -42,8 +42,12 @@ 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 {
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
@ -53,6 +57,7 @@ if (contains(DEFINES, OEM_HANWANG)) {
}
}
}
}
CONFIG(debug, debug|release) {
MY_CONFIGURE = Debug

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

@ -37,7 +37,10 @@ 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 {
if (contains(DEFINES, OEM_DELI)) {
RC_ICONS = ../../../app/upgrade/image_rsc/logo/deli.ico
} else {
RC_ICONS = ../../../app/upgrade/image_rsc/logo/logo.ico
}
@ -46,6 +49,7 @@ if (contains(DEFINES, OEM_HANWANG)) {
}
}
}
}
CONFIG(debug, debug|release) {
MY_CONFIGURE = Debug

4
modules/twain_user/HGTwainImpl.cpp
View File

@ -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)

1
modules/twainui/TwainUI_resource.qrc
View File

@ -14,5 +14,6 @@
<file>image_rsc/logo/NoBrand_logo.ico</file>
<file>image_rsc/logo/RightWay_logo.ico</file>
<file>image_rsc/logo/uniscan.ico</file>
<file>image_rsc/logo/deli.ico</file>
</qresource>
</RCC>

2
modules/twainui/app_cfg.cpp
View File

@ -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)

2
modules/twainui/hg_settingdialog.cpp
View File

@ -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
}

BIN
modules/twainui/image_rsc/logo/deli.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

1
modules/version/HGVersion.h
View File

@ -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)