Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Change the icon in About box"

Browse Source 
Due to the mysterious reason, change the icon in About box makes application icon display incorrectly (in explorer & on taskbar).

This reverts commit 3a46a6c23d.
This commit is contained in:
Don HO 2020-04-21 14:49:58 +02:00
parent 126b55b064
commit 0323ed3425
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/src/Notepad_plus.rc
View File

@ -66,7 +66,6 @@ IDI_CHAMELEON ICON "icons/chameleon.ico"
//IDI_JESUISCHARLIE ICON "icons/Je_suis_Charlie.ico" //IDI_JESUISCHARLIE ICON "icons/Je_suis_Charlie.ico"
//IDI_GILETJAUNE ICON "icons/giletJaune.ico" //IDI_GILETJAUNE ICON "icons/giletJaune.ico"
//IDI_SAMESEXMARRIAGE ICON "icons/same-sexMarriageTaiwan.ico" //IDI_SAMESEXMARRIAGE ICON "icons/same-sexMarriageTaiwan.ico"
IDI_FUCK_CCP_VIRUS ICON "icons/fuckCcpVirus.ico"
IDI_NEW_OFF_ICON ICON "icons/new_off.ico" IDI_NEW_OFF_ICON ICON "icons/new_off.ico"
IDI_OPEN_OFF_ICON ICON "icons/open_off.ico" IDI_OPEN_OFF_ICON ICON "icons/open_off.ico"
IDI_SAVE_OFF_ICON ICON "icons/save_off.ico" IDI_SAVE_OFF_ICON ICON "icons/save_off.ico"
@ -1015,11 +1014,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_BORDER | WS_SYSMENU
FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1 FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1
BEGIN BEGIN
EDITTEXT IDC_BUILD_DATETIME,150,2,150,10, ES_READONLY | NOT WS_BORDER 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_JESUISCHARLIE,"Static",SS_OWNERDRAW,20,5,64,64
//CONTROL "",IDI_GILETJAUNE,"Static",SS_OWNERDRAW,20,5,64,64 //CONTROL "",IDI_GILETJAUNE,"Static",SS_OWNERDRAW,20,5,64,64
//CONTROL "", IDI_SAMESEXMARRIAGE,"Static",SS_OWNERDRAW,20,5,64,64 //CONTROL "", IDI_SAMESEXMARRIAGE,"Static",SS_OWNERDRAW,20,5,64,64
CONTROL "", IDI_FUCK_CCP_VIRUS,"Static",SS_OWNERDRAW,20,5,64,64
LTEXT NOTEPAD_PLUS_VERSION, IDC_STATIC,70,20,140,11 LTEXT NOTEPAD_PLUS_VERSION, IDC_STATIC,70,20,140,11
LTEXT "bit",IDC_VERSION_BIT,150,20,140,11 LTEXT "bit",IDC_VERSION_BIT,150,20,140,11
//LTEXT "Author :",IDC_STATIC,21,45,31,8 //LTEXT "Author :",IDC_STATIC,21,45,31,8

3
PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
View File

@ -81,11 +81,10 @@ INT_PTR CALLBACK AboutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara
case WM_DRAWITEM : 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_JESUISCHARLIE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE);
//HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_GILETJAUNE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); //HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_GILETJAUNE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE);
//HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_SAMESEXMARRIAGE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); //HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_SAMESEXMARRIAGE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE);
HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_FUCK_CCP_VIRUS), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE);
DRAWITEMSTRUCT *pdis = (DRAWITEMSTRUCT *)lParam; DRAWITEMSTRUCT *pdis = (DRAWITEMSTRUCT *)lParam;
::DrawIconEx(pdis->hDC, 0, 0, hIcon, 64, 64, 0, NULL, DI_NORMAL); ::DrawIconEx(pdis->hDC, 0, 0, hIcon, 64, 64, 0, NULL, DI_NORMAL);
return TRUE; return TRUE;

BIN
PowerEditor/src/icons/fuckCcpVirus.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 42 KiB

3
PowerEditor/src/resource.h
View File

@ -41,11 +41,10 @@
#endif #endif
#define IDI_M30ICON 100 #define IDI_M30ICON 100
//#define IDI_CHAMELEON 101 #define IDI_CHAMELEON 101
//#define IDI_JESUISCHARLIE 102 //#define IDI_JESUISCHARLIE 102
//#define IDI_GILETJAUNE 102 //#define IDI_GILETJAUNE 102
//#define IDI_SAMESEXMARRIAGE 102 //#define IDI_SAMESEXMARRIAGE 102
#define IDI_FUCK_CCP_VIRUS 102
#define IDR_RT_MANIFEST 103 #define IDR_RT_MANIFEST 103
#define IDI_NEW_OFF_ICON 201 #define IDI_NEW_OFF_ICON 201