From eeaa4576f34fc5b9509fa404ff78e2845ddf3c1e Mon Sep 17 00:00:00 2001 From: Don HO Date: Mon, 8 Nov 2021 01:41:26 +0100 Subject: [PATCH] Add Auto-Updater icon WinGup for Notepad++ has been added a customizable icon capacity: https://github.com/notepad-plus-plus/wingup/commit/728ac51975c3580e62bc75badd98eae4ee1dfb88 An icon is added in the commit for Notepad++ updater. --- PowerEditor/installer/nsisInclude/binariesComponents.nsh | 4 ++++ PowerEditor/installer/packageAll.bat | 6 ++++++ PowerEditor/src/Parameters.cpp | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/PowerEditor/installer/nsisInclude/binariesComponents.nsh b/PowerEditor/installer/nsisInclude/binariesComponents.nsh index 642ea788d..ba1a848d8 100644 --- a/PowerEditor/installer/nsisInclude/binariesComponents.nsh +++ b/PowerEditor/installer/nsisInclude/binariesComponents.nsh @@ -75,18 +75,21 @@ ${MementoSection} "Auto-Updater" AutoUpdater File "..\bin64\updater\gup.xml" File "..\bin64\updater\LICENSE" File "..\bin64\updater\README.md" + File "..\bin64\updater\updater.ico" !else ifdef ARCHARM64 File "..\binarm64\updater\GUP.exe" File "..\binarm64\updater\libcurl.dll" File "..\binarm64\updater\gup.xml" File "..\binarm64\updater\LICENSE" File "..\binarm64\updater\README.md" + File "..\binarm64\updater\updater.ico" !else File "..\bin\updater\GUP.exe" File "..\bin\updater\libcurl.dll" File "..\bin\updater\gup.xml" File "..\bin\updater\LICENSE" File "..\bin\updater\README.md" + File "..\bin\updater\updater.ico" !endif SetOutPath "$PLUGINSDIR\gupLocalization" File "..\bin\updater\translations\" @@ -158,6 +161,7 @@ Section un.AutoUpdater Delete "$INSTDIR\updater\gpl.txt" Delete "$INSTDIR\updater\readme.txt" Delete "$INSTDIR\updater\README.md" + Delete "$INSTDIR\updater\updater.ico" Delete "$INSTDIR\updater\getDownLoadUrl.php" Delete "$INSTDIR\updater\nativeLang.xml" RMDir "$INSTDIR\updater" diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index 442c3c43a..e6fd29a12 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -376,6 +376,8 @@ copy /Y ..\bin\updater\LICENSE .\zipped.package.release\updater\ If ErrorLevel 1 goto End copy /Y ..\bin\updater\README.md .\zipped.package.release\updater\ If ErrorLevel 1 goto End +copy /Y ..\bin\updater\updater.ico .\zipped.package.release\updater\ +If ErrorLevel 1 goto End rem For disabling auto-updater copy /Y ..\src\config.4zipPackage.xml .\zipped.package.release64\config.xml @@ -392,6 +394,8 @@ copy /Y ..\bin64\updater\LICENSE .\zipped.package.release64\updater\ If ErrorLevel 1 goto End copy /Y ..\bin64\updater\README.md .\zipped.package.release64\updater\ If ErrorLevel 1 goto End +copy /Y ..\bin64\updater\updater.ico .\zipped.package.release64\updater\ +If ErrorLevel 1 goto End rem For disabling auto-updater copy /Y ..\src\config.4zipPackage.xml .\zipped.package.releaseArm64\config.xml @@ -408,6 +412,8 @@ copy /Y ..\binarm64\updater\LICENSE .\zipped.package.releaseArm64\updater\ If ErrorLevel 1 goto End copy /Y ..\binarm64\updater\README.md .\zipped.package.releaseArm64\updater\ If ErrorLevel 1 goto End +copy /Y ..\binarm64\updater\updater.ico .\zipped.package.releaseArm64\updater\ +If ErrorLevel 1 goto End diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index bc0e02fab..5477b8d2f 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -1448,7 +1448,7 @@ bool NppParameters::load() //-------------------------------------------------------------// // enableSelectFgColor.xml : for per user // - // This empty xmj file is optional - user adds this empty file // + // This empty xml file is optional - user adds this empty file // // manually in order to set selected text's foreground color. // //-------------------------------------------------------------// generic_string enableSelectFgColorPath = _userPath;