From 44f290bcc9f3ba02a011e35353308a6817cdb019 Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Mon, 19 Jun 2023 14:24:30 +0800
Subject: [PATCH] =?UTF-8?q?app=E5=AE=89=E8=A3=85=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99HuaGoScan2=E6=94=B9=E5=90=8D=E4=B8=BAHuaGoScan?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...onScan_App_Setup2.iss => HanvonScan2_App_Setup.iss} | 10 +++++-----
 win/setup/scanner/HuaGoScan2_App_Setup.iss             | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename win/setup/scanner/{HanvonScan_App_Setup2.iss => HanvonScan2_App_Setup.iss} (96%)

diff --git a/win/setup/scanner/HanvonScan_App_Setup2.iss b/win/setup/scanner/HanvonScan2_App_Setup.iss
similarity index 96%
rename from win/setup/scanner/HanvonScan_App_Setup2.iss
rename to win/setup/scanner/HanvonScan2_App_Setup.iss
index 8ce753b..32f1649 100644
--- a/win/setup/scanner/HanvonScan_App_Setup2.iss
+++ b/win/setup/scanner/HanvonScan2_App_Setup.iss
@@ -59,7 +59,7 @@ Source: "..\..\x86\Qt\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreve
 Source: "..\..\x86\Qt\styles\*"; DestDir: "{app}\styles\"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "..\..\x86\Qt\translations\*"; DestDir: "{app}\translations\"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "..\..\x86\Qt\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "..\..\x86\Release\HanvonScan2.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "..\..\x86\Release\HanvonScan2.exe"; DestDir: "{app}\"; DestName: "HanvonScan.exe"; Flags: ignoreversion; Check: not Is64BitInstallMode
 ;Source: "..\..\x86\Release\HWUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion;  Components: Upgrade; Check: not Is64BitInstallMode
 Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode
@@ -101,7 +101,7 @@ Source: "..\..\x64\Qt\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreve
 Source: "..\..\x64\Qt\styles\*"; DestDir: "{app}\styles\"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "..\..\x64\Qt\translations\*"; DestDir: "{app}\translations\"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "..\..\x64\Qt\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x64\Release\HanvonScan2.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x64\Release\HanvonScan2.exe"; DestDir: "{app}\"; DestName: "HanvonScan.exe"; Flags: ignoreversion; Check: Is64BitInstallMode
 ;Source: "..\..\x64\Release\HWUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion;  Components: Upgrade; Check: Is64BitInstallMode
 Source: "..\..\x64\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "..\..\x64\Release\doc_seg.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode
@@ -176,8 +176,8 @@ Source: "..\..\x64\Release\CheckNewApp.exe"; DestDir: "{app}\";  Flags: ignoreve
 [INI]
 
 [Icons]
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\HanvonScan2.exe"
-Name: "{group}\{#MyAppName}"; Filename: "{app}\HanvonScan2.exe"
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\HanvonScan.exe"
+Name: "{group}\{#MyAppName}"; Filename: "{app}\HanvonScan.exe"
 Name: "{group}\汉王扫描软件帮助文档"; Filename: "{app}\HanvonScan_App_Help_manual.pdf"
 Name: "{group}\卸载"; Filename: "{uninstallexe}";
 
@@ -318,7 +318,7 @@ begin
 Filename: "{app}\DPInst32"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: not IsWin64
 Filename: "{app}\DPInst64"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: IsWin64
 ;Filename: "{app}\HWUpgradeApp.exe"; Parameters:"-type=postinstallinfo -appName=Scanner -oemName=Hanvon -desc=install/upgrade";  Components: Upgrade
-Filename: "{app}\HanvonScan2.exe"; Description: "{cm:LaunchProgram, {#MyAppName}}"; Flags: postinstall nowait skipifsilent
+Filename: "{app}\HanvonScan.exe"; Description: "{cm:LaunchProgram, {#MyAppName}}"; Flags: postinstall nowait skipifsilent
 
 [UninstallRun]
 ; 卸载驱动
diff --git a/win/setup/scanner/HuaGoScan2_App_Setup.iss b/win/setup/scanner/HuaGoScan2_App_Setup.iss
index 0eae52a..933da64 100644
--- a/win/setup/scanner/HuaGoScan2_App_Setup.iss
+++ b/win/setup/scanner/HuaGoScan2_App_Setup.iss
@@ -84,7 +84,7 @@ Source: "..\..\x86\Qt\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreve
 Source: "..\..\x86\Qt\styles\*"; DestDir: "{app}\styles\"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "..\..\x86\Qt\translations\*"; DestDir: "{app}\translations\"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "..\..\x86\Qt\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "..\..\x86\Release\HuaGoScan2.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "..\..\x86\Release\HuaGoScan2.exe"; DestDir: "{app}\"; DestName: "HuaGoScan.exe"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "..\..\x86\Release\HGUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion;  Components: Upgrade; Check: not Is64BitInstallMode
Source: "..\..\x86\Release\HGFWUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode
@@ -126,7 +126,7 @@ Source: "..\..\x64\Qt\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreve
 Source: "..\..\x64\Qt\styles\*"; DestDir: "{app}\styles\"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "..\..\x64\Qt\translations\*"; DestDir: "{app}\translations\"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "..\..\x64\Qt\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x64\Release\HuaGoScan2.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x64\Release\HuaGoScan2.exe"; DestDir: "{app}\"; DestName: "HuaGoScan.exe"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "..\..\x64\Release\HGUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion;  Components: Upgrade; Check: Is64BitInstallMode
 Source: "..\..\x64\Release\HGFWUpgradeApp.exe"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "..\..\x64\Release\cnocr.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode
@@ -196,8 +196,8 @@ Source: "..\..\x64\Release\CheckNewApp.exe"; DestDir: "{app}\";  Flags: ignoreve
 [INI]
 
 [Icons]
-Name: "{commondesktop}\{cm:MyAppName}"; Filename: "{app}\HuaGoScan2.exe"
-Name: "{group}\{cm:MyAppName}"; Filename: "{app}\HuaGoScan2.exe"
Name: "{group}\华高扫描仪维护工具"; Filename: "{app}\HGFWUpgradeApp.exe"
+Name: "{commondesktop}\{cm:MyAppName}"; Filename: "{app}\HuaGoScan.exe"
+Name: "{group}\{cm:MyAppName}"; Filename: "{app}\HuaGoScan.exe"
Name: "{group}\华高扫描仪维护工具"; Filename: "{app}\HGFWUpgradeApp.exe"
 ;Name: "{group}\Huago scanning software help document"; Filename: "{app}\HuaGoScan_App_Help_manual.pdf"; Languages: english
 Name: "{group}\华高扫描软件帮助文档"; Filename: "{app}\HuaGoScan_App_Help_manual.pdf"; Languages: chinese_simp
 ;Name: "{group}\華高掃描軟件幫助文檔"; Filename: "{app}\HuaGoScan_App_Help_manual.pdf"; Languages: chinese_trad
@@ -352,7 +352,7 @@ Filename: "{app}\DPInst32"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f";
 Filename: "{app}\DPInst64"; Parameters: "/path ""{app}\driver"" /sw /se /lm /f"; Check: IsWin64
 Filename: "{app}\HGUpgradeApp.exe"; Parameters:"-type=postinstallinfo -appName=Scanner -oemName=Huago -desc=install/upgrade";  Components: Upgrade
 ;Filename: "{app}\HuaGoScan.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=english"; Flags: postinstall nowait skipifsilent; Languages: english
-Filename: "{app}\HuaGoScan2.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=chinese"; Flags: postinstall nowait skipifsilent; Languages: chinese_simp
+Filename: "{app}\HuaGoScan.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=chinese"; Flags: postinstall nowait skipifsilent; Languages: chinese_simp
 ;Filename: "{app}\HuaGoScan.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=chinese-trad"; Flags: postinstall nowait skipifsilent; Languages: chinese_trad
 
 [UninstallRun]
;Filename: "{app}\DPInst32"; Parameters: "/u ""{app}\driver\huagaousb.inf"" /q /d"; Check: not IsWin64
;Filename: "{app}\DPInst64"; Parameters: "/u ""{app}\driver\huagaousb.inf"" /q /d"; Check: IsWin64
\ No newline at end of file