From 202780db5a31be7322f19e2cbf7aeac33d9d0187 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Wed, 4 Jul 2018 09:28:00 +0200 Subject: [PATCH] + opt: optimize icon resource handling --- language/common_res.h | 8 +++----- language/common_res.rc | Bin 3656 -> 3520 bytes language/np3_af_za/dialogs_af_za.rc | Bin 73334 -> 73344 bytes language/np3_de_de/dialogs_de_de.rc | Bin 74420 -> 74430 bytes language/np3_en_gb/dialogs_en_gb.rc | Bin 73390 -> 73400 bytes language/np3_en_us/dialogs_en_us.rc | Bin 73074 -> 73084 bytes language/np3_es_es/dialogs_es_es.rc | Bin 73428 -> 73438 bytes language/np3_fr_fr/dialogs_fr_fr.rc | Bin 73330 -> 73340 bytes language/np3_nl_nl/dialogs_nl_nl.rc | Bin 73342 -> 73352 bytes res/Notepad3_128.ico | Bin 85182 -> 0 bytes src/Dialogs.c | 19 ++++++++++++++++++- src/Notepad3.c | 2 +- src/Notepad3.vcxproj | 1 - src/Notepad3.vcxproj.filters | 3 --- 14 files changed, 22 insertions(+), 11 deletions(-) delete mode 100644 res/Notepad3_128.ico diff --git a/language/common_res.h b/language/common_res.h index f97d12b20..334621acb 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -125,10 +125,9 @@ #define IDS_MUI_TRANSL_AUTHOR 15031 #define IDR_MAINWND 16000 -#define IDR_MAINWND128 16001 -#define IDR_MAINWND48 16002 -#define IDR_MAINWNDTB 16003 -#define IDR_MAINWNDTB2 16004 +#define IDR_MAINWND48 16001 +#define IDR_MAINWNDTB 16002 +#define IDR_MAINWNDTB2 16003 #define IDI_MUI_RUN 16100 #define IDI_MUI_STYLES 16101 @@ -267,7 +266,6 @@ #define IDC_RICHEDITABOUT 18089 #define IDC_TRANSL_AUTH 18090 - #define CMD_ESCAPE 20000 #define CMD_SHIFTESC 20001 #define CMD_SHIFTCTRLENTER 20002 diff --git a/language/common_res.rc b/language/common_res.rc index 76e59c77e7a9a3dc0178481dad2d60f8e0e98c59..24ebcedee6b266a4b897849c0215b61c3062bf68 100644 GIT binary patch delta 42 wcmX>hb3l4S7yD!(4joY!22X}y24@CGh9CwPAnC;5!{9pkG`sBP0*)K30OtJ)hX4Qo delta 48 zcmX>geL`kK7dxvVgAs$pWI+zm$qP7)CSPM0f{G+^2v4qHx0`Ikp|JTH`zuxeOJ5Df diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc index d6d461160682b88c5ba4ac16b4ee1af72f6c8221..17d63ba8c5a853a13ae155a5f94c106e6fe0f88c 100644 GIT binary patch delta 58 zcmeyihoxaJ%Z3$P%=!%alNBvhCm*;WH2EGE2cyDd!;|8Z|8Q~e8ZsC$STN`?fazvl L?(MwXjG4j!K@|{5 delta 48 ycmZqJ%kpgx%Z3$PlXWarCSTx^n%p8HCTPN-!(a-;MhpfJvRRyayEr#vrZ50;a0~kY diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc index a5cbc90f3f6d33660b78c7088409e2985f913c9a..0db7ff7d3aa95c2354e6c24fb776b006f1e81d48 100644 GIT binary patch delta 72 zcmdmTlx5#hmJJ)YnDrU-Co7h#PJVD%h|`e4h{1wEhe2U-Vy(Ei36Nz9#4u4PJ(*KL Ox!H<)yA?NMl{f&-HxPRO delta 50 zcmdmYlx53NmJJ)YChxm$#%jo5#9%Rb;u}dp69ydyQy?~CFo2NF^4#0yxf$n+0|2g$ B4V?f0 diff --git a/language/np3_en_gb/dialogs_en_gb.rc b/language/np3_en_gb/dialogs_en_gb.rc index e816982654059c7d598ffe311f884e8f435ae7b8..64915925dbe888bce20d8d9e2d17ee5cd3a4c770 100644 GIT binary patch delta 58 zcmZ3tmu1IZmJMgPnDrU-Cr`X!&S}VC#9+ao!=NyEW0?441#S*rmFjb0JI|w AO#lD@ diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc index d46f35537d42fc894abe370f4b14505e97de7162..739090a0e6d219f11f0e8d4f0170fda402849078 100644 GIT binary patch delta 54 zcmcbzm*w7GmJP4CnDrU-CojBUK3RdAgHd7fK`ZgecHA7ih73jw77RKJV7l3#d%Hh3 HW2-O#?6?lw delta 54 zcmcb&m*vV{mJP4CCg)kIOuleIh}Dq6h{0m=Mpa2c69ydyQy?~CFo2NFk=)xOxfxr9 E0sUwW`v3p{ diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc index 4be88b72c717b30ffae1afb406a73ecfcb88fe78..29f51da41d90dcf25bed88edcf3e1917971c3219 100644 GIT binary patch delta 54 zcmeyghvm;6mJJ)YnDrU-C$HzSXH=NnC?YOu!l1)o3dDvCMhq4(x>=NayC^qftS|tp Cc??JZ delta 50 zcmeyfhvm~AmJJ)YCa=3;#%jo5#9%Sm@uZ}n34;!UDG(bm7(mEodG77<+>Eip0J41z AKL7v# diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc index 5ed401b527cd2a440f8d57468f8ed9feec4e0d9f..b197c2423c2d0faf6c75fce5e7f4e4fd5d01e191 100644 GIT binary patch delta 58 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

PSr{fyJgE5h`e*px7&rXRz1frU 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 aE?S7A?hZcF?`WhU50 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 F{~wa=NP_?X diff --git a/src/Dialogs.c b/src/Dialogs.c index d76969bc1..30e4cb8f2 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -444,12 +444,17 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam { WCHAR wch[256] = { L'\0' }; static HFONT hFontTitle; - + static HICON hIcon = NULL; + switch (umsg) { case WM_INITDIALOG: { { + if (!hIcon) { + hIcon = LoadImage(g_hInstance, MAKEINTRESOURCE(IDR_MAINWND), IMAGE_ICON, 128, 128, LR_DEFAULTCOLOR); + } + SetDlgItemText(hwnd, IDC_VERSION, L"" VERSION_FILEVERSION_LONG); if (hFontTitle) { DeleteObject(hFontTitle); } @@ -553,6 +558,18 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam } return true; + + case WM_PAINT: + if (hIcon) { + RECT rt; + GetWindowRect(hwnd, &rt); + HDC hdc = GetWindowDC(hwnd); + DrawIconEx(hdc, 16, 32, hIcon, 128, 128, 0, NULL, DI_NORMAL); + ReleaseDC(hwnd, hdc); + } + return 0; + + case WM_NOTIFY: { LPNMHDR pnmhdr = (LPNMHDR)lParam; diff --git a/src/Notepad3.c b/src/Notepad3.c index 1ac56c71b..9297c4567 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -9611,7 +9611,7 @@ void ShowNotifyIcon(HWND hwnd,bool bAdd) { static HICON hIcon = NULL; if (!hIcon) { - hIcon = LoadImage(g_hInstance, MAKEINTRESOURCE(IDR_MAINWND128), IMAGE_ICON, + hIcon = LoadImage(g_hInstance, MAKEINTRESOURCE(IDR_MAINWND), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); } NOTIFYICONDATA nid; diff --git a/src/Notepad3.vcxproj b/src/Notepad3.vcxproj index 8dd06f152..796ad05d6 100644 --- a/src/Notepad3.vcxproj +++ b/src/Notepad3.vcxproj @@ -442,7 +442,6 @@ - diff --git a/src/Notepad3.vcxproj.filters b/src/Notepad3.vcxproj.filters index 5546dff1d..5419c5d0c 100644 --- a/src/Notepad3.vcxproj.filters +++ b/src/Notepad3.vcxproj.filters @@ -234,9 +234,6 @@ Resource Files - - Resource Files - Resource Files