调整sane得力

build.sh

@@ -445,21 +445,21 @@ elif [ "${1}" == "dlall" ] || [ "${1}" == "dl" ] || [ "${1}" == "dlweb" ] || [ "
 		elif [ "${1}" == "dlweb" ]; then
 
 			cd HGWebService
-			qmake -qt=qt5 -makefile "DEFINES += OEM_ZIGUANG" HGWebService.pro
+			qmake -qt=qt5 -makefile "DEFINES += OEM_DELI" HGWebService.pro
 			make -j8
 			cd ../
 
 		elif [ "${1}" == "dltwain" ]; then
 
 			cd HGTwainUI
-			qmake -qt=qt5 -makefile "DEFINES += OEM_ZIGUANG" HGTwainUI.pro
+			qmake -qt=qt5 -makefile "DEFINES += OEM_DELI" HGTwainUI.pro
 			make -j8
 			cd ../
 
 		else
 
 			cd HGScannerLib
-			qmake -qt=qt5 -makefile "DEFINES += OEM_ZIGUANG" HGScannerLib.pro
+			qmake -qt=qt5 -makefile "DEFINES += OEM_DELI" HGScannerLib.pro
 			make -j8
 			cd ../
 

modules/sane_user/HGSaneImpl.cpp

@@ -245,7 +245,7 @@ void HGSaneManagerImpl::RemoveSource(class HGSaneSourceImpl* sourceImpl)
 
 bool HGSaneManagerImpl::filterDeviceSource(const char *sourceName)
 {
-#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 = "hgsane";
 #elif defined(OEM_HANWANG)
     std::string oemIden = "hwsane";
@@ -257,6 +257,8 @@ bool HGSaneManagerImpl::filterDeviceSource(const char *sourceName)
     std::string oemIden = "zjsane";
 #elif defined(OEM_ZIGUANG)
     std::string oemIden = "zgsane";
+#elif defined(OEM_DELI)
+    std::string oemIden = "dlsane";
 #endif
 
     if (sourceName != strstr(sourceName, oemIden.c_str()))

modules/saneui/SaneUI_resource.qrc

@@ -4,4 +4,16 @@
         <file>SaneUI_zh_EN.qm</file>
         <file>qt_zh_CN.qm</file>
     </qresource>
+    <qresource prefix="/logo">
+        <file>image_rsc/logo/auge_logo.ico</file>
+        <file>image_rsc/logo/Cumtenn_logo.ico</file>
+        <file>image_rsc/logo/deli.ico</file>
+        <file>image_rsc/logo/Hanvon_logo1.ico</file>
+        <file>image_rsc/logo/Lanxum_logo.ico</file>
+        <file>image_rsc/logo/logo.ico</file>
+        <file>image_rsc/logo/Microtek_logo.ico</file>
+        <file>image_rsc/logo/NoBrand_logo.ico</file>
+        <file>image_rsc/logo/RightWay_logo.ico</file>
+        <file>image_rsc/logo/uniscan.ico</file>
+    </qresource>
 </RCC>

modules/saneui/app_cfg.cpp

@@ -89,6 +89,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)

modules/saneui/hg_settingdialog.cpp

@@ -2218,6 +2218,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
 }