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 76e59c77e..24ebcedee 100644
Binary files a/language/common_res.rc and b/language/common_res.rc differ
diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc
index d6d461160..17d63ba8c 100644
Binary files a/language/np3_af_za/dialogs_af_za.rc and b/language/np3_af_za/dialogs_af_za.rc differ
diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc
index a5cbc90f3..0db7ff7d3 100644
Binary files a/language/np3_de_de/dialogs_de_de.rc and b/language/np3_de_de/dialogs_de_de.rc differ
diff --git a/language/np3_en_gb/dialogs_en_gb.rc b/language/np3_en_gb/dialogs_en_gb.rc
index e81698265..64915925d 100644
Binary files a/language/np3_en_gb/dialogs_en_gb.rc and b/language/np3_en_gb/dialogs_en_gb.rc differ
diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc
index 0619a507d..4f7516758 100644
Binary files a/language/np3_en_us/dialogs_en_us.rc and b/language/np3_en_us/dialogs_en_us.rc differ
diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc
index d46f35537..739090a0e 100644
Binary files a/language/np3_es_es/dialogs_es_es.rc and b/language/np3_es_es/dialogs_es_es.rc differ
diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc
index 4be88b72c..29f51da41 100644
Binary files a/language/np3_fr_fr/dialogs_fr_fr.rc and b/language/np3_fr_fr/dialogs_fr_fr.rc differ
diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc
index 5ed401b52..b197c2423 100644
Binary files a/language/np3_nl_nl/dialogs_nl_nl.rc and b/language/np3_nl_nl/dialogs_nl_nl.rc differ
diff --git a/res/Notepad3_128.ico b/res/Notepad3_128.ico
deleted file mode 100644
index d103acd88..000000000
Binary files a/res/Notepad3_128.ico and /dev/null differ
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