diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 629b29ea1..efbf384ac 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -1,14 +1,15 @@ -Notepad++ v7.6.1 new enhancement and bug-fixes: +Notepad++ v7.6.2 Gilet Jaune (Yellow Vest) Edition +Pourquoi Gilet Jaune? https://notepad-plus-plus.org/fr/news/notepad-7.6.2-released.html +Why Yellow Vest? https://notepad-plus-plus.org/news/notepad-7.6.2-released.html + +Notepad++ v7.6.2 Gilet Jaune Edition new enhancement and bug-fixes: + +1. Add generation of SHA-256 hash feature. +2. Fix Plugins Admin unzip (0 lengh) bug. +3. Add Plugins Admin module into portable version (zipped package). +4. Add new feature: double click splitter resets panes to equal size. +5. Fix the plugin crash issue due to the inexistent plugin conf path. -1. Several bug-fixes & enhancement on Plugins Admin. -2. Notepad++ will load plugins from %PROGRAMDATA% instead of %LOCALAPPDATA% - https://notepad-plus-plus.org/features/plugin-admin.html -3. Fix installer's plugins copy issue under Linux (by using WINE). -4. Fix Installer HI-DPI GUI glitch. -5. Fix "Import plugins" not working issue. -6. Fix printer header/footer font issue. -7. Make installer more coherent for the option doLocalConf.xml. -8. Make text display right in summary panel. Included plugins: @@ -20,4 +21,4 @@ Included plugins: Updater (Installer only): -* WinGup (for Notepad++) v5.0.5 \ No newline at end of file +* WinGup (for Notepad++) v5.1 \ No newline at end of file diff --git a/PowerEditor/installer/images/wizard_GiletJaune.bmp b/PowerEditor/installer/images/wizard_GiletJaune.bmp new file mode 100644 index 000000000..f561abcbb Binary files /dev/null and b/PowerEditor/installer/images/wizard_GiletJaune.bmp differ diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index d1f74daf7..ffc9b7d7c 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -71,8 +71,9 @@ OutFile ".\build\npp.${APPVERSION}.Installer.exe" !define MUI_ICON ".\images\npp_inst.ico" !define MUI_UNICON ".\images\npp_inst.ico" -!define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\wizard.bmp" -;!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH +;!define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\wizard.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\wizard_GiletJaune.bmp" + !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP ".\images\headerLeft.bmp" ; optional diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 10e82c2af..87b09b78e 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -62,8 +62,9 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_M30ICON ICON "icons/npp.ico" -IDI_CHAMELEON ICON "icons/chameleon.ico" +//IDI_CHAMELEON ICON "icons/chameleon.ico" //IDI_JESUISCHARLIE ICON "icons/Je_suis_Charlie.ico" +IDI_GILETJAUNE ICON "icons/giletJaune.ico" IDI_NEW_OFF_ICON ICON "icons/new_off.ico" IDI_OPEN_OFF_ICON ICON "icons/open_off.ico" IDI_SAVE_OFF_ICON ICON "icons/save_off.ico" @@ -994,8 +995,9 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_BORDER | WS_SYSMENU FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1 BEGIN EDITTEXT IDC_BUILD_DATETIME,150,2,150,10, ES_READONLY | NOT WS_BORDER - CONTROL "",IDI_CHAMELEON,"Static",SS_OWNERDRAW,20,5,64,64 + //CONTROL "",IDI_CHAMELEON,"Static",SS_OWNERDRAW,20,5,64,64 //CONTROL "",IDI_JESUISCHARLIE,"Static",SS_OWNERDRAW,20,5,64,64 + CONTROL "",IDI_GILETJAUNE,"Static",SS_OWNERDRAW,20,5,64,64 LTEXT NOTEPAD_PLUS_VERSION, IDC_STATIC,70,20,140,11 LTEXT "bit",IDC_VERSION_BIT,150,20,140,11 LTEXT "Author :",IDC_STATIC,21,45,31,8 diff --git a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp index 8d61477f8..8ea9040d0 100644 --- a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp +++ b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp @@ -78,8 +78,9 @@ INT_PTR CALLBACK AboutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara case WM_DRAWITEM : { - HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_CHAMELEON), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); + //HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_CHAMELEON), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); //HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_JESUISCHARLIE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); + HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_GILETJAUNE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); DRAWITEMSTRUCT *pdis = (DRAWITEMSTRUCT *)lParam; ::DrawIconEx(pdis->hDC, 0, 0, hIcon, 64, 64, 0, NULL, DI_NORMAL); return TRUE; diff --git a/PowerEditor/src/icons/giletJaune.ico b/PowerEditor/src/icons/giletJaune.ico new file mode 100644 index 000000000..1fc924ecf Binary files /dev/null and b/PowerEditor/src/icons/giletJaune.ico differ diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 8f472fc94..f12f878ac 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -27,12 +27,12 @@ #pragma once -#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v7.6.1") +#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v7.6.2") // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 // ex : #define VERSION_VALUE TEXT("5.63\0") -#define VERSION_VALUE TEXT("7.6.1\0") -#define VERSION_DIGITALVALUE 7, 6, 1, 0 +#define VERSION_VALUE TEXT("7.6.2\0") +#define VERSION_DIGITALVALUE 7, 6, 2, 0 @@ -41,8 +41,10 @@ #endif #define IDI_M30ICON 100 -#define IDI_CHAMELEON 101 +//#define IDI_CHAMELEON 101 //#define IDI_JESUISCHARLIE 102 +#define IDI_GILETJAUNE 102 + #define IDR_RT_MANIFEST 103 #define IDI_NEW_OFF_ICON 201