diff --git a/app/fwupgrade/FWUpgrade_resource.qrc b/app/fwupgrade/FWUpgrade_resource.qrc index f15f8cd2..eca3c2b8 100644 --- a/app/fwupgrade/FWUpgrade_resource.qrc +++ b/app/fwupgrade/FWUpgrade_resource.qrc @@ -23,5 +23,7 @@ image_rsc/logo/waiting.gif image_rsc/distortion/testPaper.jpg image_rsc/logo/deli.ico + image_rsc/logo/maxsound_logo.ico + image_rsc/logo/toec_logo.ico diff --git a/app/fwupgrade/image_rsc/logo/MaxSound.ico b/app/fwupgrade/image_rsc/logo/MaxSound.ico deleted file mode 100644 index 4a9df6e4..00000000 Binary files a/app/fwupgrade/image_rsc/logo/MaxSound.ico and /dev/null differ diff --git a/app/fwupgrade/image_rsc/logo/Toec.ico b/app/fwupgrade/image_rsc/logo/Toec.ico deleted file mode 100644 index db11734b..00000000 Binary files a/app/fwupgrade/image_rsc/logo/Toec.ico and /dev/null differ diff --git a/app/scanner2/image_rsc/logo/MaxSound.ico b/app/fwupgrade/image_rsc/logo/maxsound_logo.ico similarity index 100% rename from app/scanner2/image_rsc/logo/MaxSound.ico rename to app/fwupgrade/image_rsc/logo/maxsound_logo.ico diff --git a/app/scanner2/image_rsc/logo/Toec.ico b/app/fwupgrade/image_rsc/logo/toec_logo.ico similarity index 100% rename from app/scanner2/image_rsc/logo/Toec.ico rename to app/fwupgrade/image_rsc/logo/toec_logo.ico diff --git a/app/fwupgrade/resource.rc b/app/fwupgrade/resource.rc index 062637e4..7af3b5b2 100644 --- a/app/fwupgrade/resource.rc +++ b/app/fwupgrade/resource.rc @@ -66,6 +66,10 @@ IDI_ICON1 ICON "image_rsc\\logo\\uniscan.ico" IDI_ICON1 ICON "image_rsc\\logo\\NoBrand_logo.ico" #elif defined(OEM_DELI) IDI_ICON1 ICON "image_rsc\\logo\\deli.ico" +#elif defined(OEM_MEISONGDA) +IDI_ICON1 ICON "image_rsc\\logo\\maxsound_logo.ico" +#elif defined(OEM_GUANGDIANTONG) +IDI_ICON1 ICON "image_rsc\\logo\\toec_logo.ico" #else IDI_ICON1 ICON "image_rsc\\logo\\logo.ico" #endif diff --git a/app/fwupgrade/resourceTmp.rc b/app/fwupgrade/resourceTmp.rc deleted file mode 100644 index b7e1b7b5..00000000 --- a/app/fwupgrade/resourceTmp.rc +++ /dev/null @@ -1,170 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// 中文(简体,中国) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(936) - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -#if defined(OEM_HANWANG) -IDI_ICON1 ICON "image_rsc\\logo\\Hanvon_logo1.ico" -#elif defined(OEM_LISICHENG) -IDI_ICON1 ICON "image_rsc\\logo\\Lanxum_logo.ico" -#elif defined(OEM_CANGTIAN) -IDI_ICON1 ICON "image_rsc\\logo\\Cumtenn_logo.ico" -#elif defined(OEM_ZHONGJING) -IDI_ICON1 ICON "image_rsc\\logo\\Microtek_logo.ico" -#elif defined(OEM_ZIGUANG) -IDI_ICON1 ICON "image_rsc\\logo\\uniscan.ico" -#elif defined(OEM_NEUTRAL) -IDI_ICON1 ICON "image_rsc\\logo\\NoBrand_logo.ico" -#elif defined(OEM_DELI) -IDI_ICON1 ICON "image_rsc\\logo\\deli.ico" -#else -IDI_ICON1 ICON "image_rsc\\logo\\logo.ico" -#endif - -#endif // 中文(简体,中国) resources -///////////////////////////////////////////////////////////////////////////// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,52,10000,24240 - PRODUCTVERSION 4,52,10000,24240 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS__WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE 0x0L - BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000403a8" - BEGIN - VALUE "FileVersion", "4.52.10000.24240\0" - VALUE "ProductVersion", "4.52.10000.24240\0" -#if defined(OEM_HANWANG) - VALUE "ProductName", "HANVONSCAN\0" - VALUE "CompanyName", "汉王科技股份有限公司\0" - VALUE "FileDescription", "汉王扫描仪应用程序\0" - VALUE "LegalCopyright", "Copyright (C) HANVONSCAN 2023\0" - VALUE "InternalName", "HWFWUpgrade.exe\0" - VALUE "OriginalFilename", "HWFWUpgrade.exe\0" -#elif defined(OEM_LISICHENG) - VALUE "ProductName", "LANXUMSCAN\0" - VALUE "CompanyName", "立思辰信息科技有限公司\0" - VALUE "FileDescription", "立思辰扫描仪应用程序\0" - VALUE "LegalCopyright", "Copyright (C) LANXUMSCAN 2023\0" - VALUE "InternalName", "LSCFWUpgrade.exe\0" - VALUE "OriginalFilename", "LSCFWUpgrade.exe\0" -#elif defined(OEM_CANGTIAN) - VALUE "ProductName", "CUMTENNSCAN\0" - VALUE "CompanyName", "浙江沧田智能信息科技有限公司\0" - VALUE "FileDescription", "沧田扫描仪应用程序\0" - VALUE "LegalCopyright", "Copyright (C) CUMTENNSCAN 2023\0" - VALUE "InternalName", "CTSFWUpgrade.exe\0" - VALUE "OriginalFilename", "CTSFWUpgrade.exe\0" -#elif defined(OEM_ZHONGJING) - VALUE "ProductName", "MICROTEKSCAN\0" - VALUE "CompanyName", "Microtek DocWizard EX\0" - VALUE "FileDescription", "Microtek DocWizard EX App\0" - VALUE "LegalCopyright", "Copyright (C) MICROTEKSCAN 2023\0" - VALUE "InternalName", "ZJFWUpgrade.exe\0" - VALUE "OriginalFilename", "ZJFWUpgrade.exe\0" -#elif defined(OEM_ZIGUANG) - VALUE "ProductName", "UNISCAN\0" - VALUE "CompanyName", "紫光股份有限公司\0" - VALUE "FileDescription", "紫光扫描仪应用程序\0" - VALUE "LegalCopyright", "Copyright (C) UNISCAN 2023\0" - VALUE "InternalName", "ZGFWUpgrade.exe\0" - VALUE "OriginalFilename", "ZGFWUpgrade.exe\0" -#elif defined(OEM_NEUTRAL) - VALUE "ProductName", "SCANNER\0" - VALUE "CompanyName", "Scanner\0" - VALUE "FileDescription", "Scanner\0" - VALUE "LegalCopyright", "Copyright (C) SCANNER 2023\0" - VALUE "InternalName", "NEUFWUpgrade.exe\0" - VALUE "OriginalFilename", "NEUFWUpgrade.exe\0" -#elif defined(OEM_DELI) - VALUE "ProductName", "DELISCAN\0" - VALUE "CompanyName", "得力信息科技有限公司\0" - VALUE "FileDescription", "得力扫描仪应用程序\0" - VALUE "LegalCopyright", "Copyright (C) DELISCAN 2023\0" - VALUE "InternalName", "DLFWUpgrade.exe\0" - VALUE "OriginalFilename", "DLFWUpgrade.exe\0" -#else - VALUE "ProductName", "HUAGOSCAN\0" - VALUE "CompanyName", "宁波华高信息科技有限公司\0" - VALUE "FileDescription", "华高扫描仪应用程序\0" - VALUE "LegalCopyright", "Copyright (C) HUAGOSCAN 2023\0" - VALUE "InternalName", "HGFWUpgrade.exe\0" - VALUE "OriginalFilename", "HGFWUpgrade.exe\0" -#endif - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0004, 936 - END - END -/* End of Version info */ - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/app/scanner2/Scanner_resource.qrc b/app/scanner2/Scanner_resource.qrc index 7dc12ff6..38bc7030 100644 --- a/app/scanner2/Scanner_resource.qrc +++ b/app/scanner2/Scanner_resource.qrc @@ -83,8 +83,8 @@ image_rsc/logo/logo.ico image_rsc/logo/NoBrand_logo.ico image_rsc/logo/RightWay_logo.ico - image_rsc/logo/maxsound.ico - image_rsc/logo/toec.ico + image_rsc/logo/maxsound_logo.ico + image_rsc/logo/toec_logo.ico image_rsc/logo/waiting.gif image_rsc/statusbar/statusBar_admin.png image_rsc/scroll/bottom_Hot.png diff --git a/modules/twainui/image_rsc/logo/MaxSound.ico b/app/scanner2/image_rsc/logo/maxsound_logo.ico similarity index 100% rename from modules/twainui/image_rsc/logo/MaxSound.ico rename to app/scanner2/image_rsc/logo/maxsound_logo.ico diff --git a/modules/twainui/image_rsc/logo/Toec.ico b/app/scanner2/image_rsc/logo/toec_logo.ico similarity index 100% rename from modules/twainui/image_rsc/logo/Toec.ico rename to app/scanner2/image_rsc/logo/toec_logo.ico diff --git a/app/upgrade/Upgrade_resource.qrc b/app/upgrade/Upgrade_resource.qrc index 0d5ba347..f4c4b4e1 100644 --- a/app/upgrade/Upgrade_resource.qrc +++ b/app/upgrade/Upgrade_resource.qrc @@ -20,5 +20,7 @@ image_rsc/logo/RightWay_logo.ico image_rsc/logo/waiting.gif image_rsc/logo/deli.ico + image_rsc/logo/maxsound_logo.ico + image_rsc/logo/toec_logo.ico diff --git a/app/upgrade/image_rsc/logo/MaxSound.ico b/app/upgrade/image_rsc/logo/MaxSound.ico deleted file mode 100644 index 4a9df6e4..00000000 Binary files a/app/upgrade/image_rsc/logo/MaxSound.ico and /dev/null differ diff --git a/app/upgrade/image_rsc/logo/Toec.ico b/app/upgrade/image_rsc/logo/Toec.ico deleted file mode 100644 index db11734b..00000000 Binary files a/app/upgrade/image_rsc/logo/Toec.ico and /dev/null differ diff --git a/app/upgrade/image_rsc/logo/maxsound_logo.ico b/app/upgrade/image_rsc/logo/maxsound_logo.ico new file mode 100644 index 00000000..e2d953c1 Binary files /dev/null and b/app/upgrade/image_rsc/logo/maxsound_logo.ico differ diff --git a/app/upgrade/image_rsc/logo/toec_logo.ico b/app/upgrade/image_rsc/logo/toec_logo.ico new file mode 100644 index 00000000..5b952f78 Binary files /dev/null and b/app/upgrade/image_rsc/logo/toec_logo.ico differ diff --git a/app/upgrade/resource.rc b/app/upgrade/resource.rc index 6568b557..341799ee 100644 --- a/app/upgrade/resource.rc +++ b/app/upgrade/resource.rc @@ -66,6 +66,10 @@ IDI_ICON1 ICON "image_rsc\\logo\\uniscan.ico" IDI_ICON1 ICON "image_rsc\\logo\\NoBrand_logo.ico" #elif defined(OEM_DELI) IDI_ICON1 ICON "image_rsc\\logo\\deli.ico" +#elif defined(OEM_MEISONGDA) +IDI_ICON1 ICON "image_rsc\\logo\\maxsound_logo.ico" +#elif defined(OEM_GUANGDIANTONG) +IDI_ICON1 ICON "image_rsc\\logo\\toec_logo.ico" #else IDI_ICON1 ICON "image_rsc\\logo\\logo.ico" #endif diff --git a/doc/scanner/CumtennScan_scanSettings_Help_manual_EN.pdf b/doc/scanner/CumtennScan_scanSettings_Help_manual_EN.pdf new file mode 100644 index 00000000..38d869b2 Binary files /dev/null and b/doc/scanner/CumtennScan_scanSettings_Help_manual_EN.pdf differ diff --git a/modules/twainui/TwainUI_resource.qrc b/modules/twainui/TwainUI_resource.qrc index b1bc68aa..1cfe29cc 100644 --- a/modules/twainui/TwainUI_resource.qrc +++ b/modules/twainui/TwainUI_resource.qrc @@ -21,7 +21,7 @@ image_rsc/logo/RightWay_logo.ico image_rsc/logo/uniscan.ico image_rsc/logo/deli.ico - image_rsc/logo/maxsound.ico - image_rsc/logo/toec.ico + image_rsc/logo/maxsound_logo.ico + image_rsc/logo/toec_logo.ico diff --git a/modules/twainui/image_rsc/logo/maxsound_logo.ico b/modules/twainui/image_rsc/logo/maxsound_logo.ico new file mode 100644 index 00000000..e2d953c1 Binary files /dev/null and b/modules/twainui/image_rsc/logo/maxsound_logo.ico differ diff --git a/modules/twainui/image_rsc/logo/toec_logo.ico b/modules/twainui/image_rsc/logo/toec_logo.ico new file mode 100644 index 00000000..5b952f78 Binary files /dev/null and b/modules/twainui/image_rsc/logo/toec_logo.ico differ