From b4f6121dc4ac18b303a5897cfe1cf47fd2589684 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Mon, 23 Sep 2019 17:07:43 +0200 Subject: [PATCH] + chg: appearance of INFOBOX4 (MB_YESNOCANCEL) (en-US only) --- language/np3_en_us/dialogs_en_us.rc | 24 ++++++++++++------------ src/Dialogs.c | 6 ++++-- src/Notepad3.c | 6 +++--- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc index 06a26fef8..dd5278e37 100644 --- a/language/np3_en_us/dialogs_en_us.rc +++ b/language/np3_en_us/dialogs_en_us.rc @@ -562,8 +562,8 @@ CAPTION "Notepad3" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN ICON IDR_MAINWND48,IDC_INFOBOXICON,7,7,21,20 - LTEXT "",IDC_INFOBOXTEXT,35,7,202,41 - DEFPUSHBUTTON "OK",IDOK,187,50,50,14 + LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_EDITCONTROL | SS_NOPREFIX + DEFPUSHBUTTON "&OK",IDOK,187,50,50,14 CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,122,10 END @@ -574,7 +574,7 @@ CAPTION "Notepad3" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN ICON IDR_MAINWND48,IDC_INFOBOXICON,7,7,21,20 - LTEXT "",IDC_INFOBOXTEXT,35,7,202,41 + LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_EDITCONTROL | SS_NOPREFIX PUSHBUTTON "&Yes",IDYES,131,50,50,14 PUSHBUTTON "&No",IDNO,187,50,50,14 CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK, @@ -587,25 +587,25 @@ CAPTION "Notepad3" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN ICON IDR_MAINWND48,IDC_INFOBOXICON,7,7,21,20 - LTEXT "",IDC_INFOBOXTEXT,35,7,202,41 - DEFPUSHBUTTON "OK",IDOK,131,50,50,14 + LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_EDITCONTROL | SS_NOPREFIX + DEFPUSHBUTTON "&OK",IDOK,131,50,50,14 PUSHBUTTON "&Cancel",IDCANCEL,187,50,50,14 CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,122,10 END -IDD_MUI_INFOBOX4 DIALOGEX 0, 0, 244, 71 +IDD_MUI_INFOBOX4 DIALOGEX 0, 0, 174, 91 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Notepad3" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN ICON IDR_MAINWND48,IDC_INFOBOXICON,7,7,21,20 - LTEXT "",IDC_INFOBOXTEXT,35,7,202,41 - DEFPUSHBUTTON "Yes",IDOK,75,50,50,14 - PUSHBUTTON "&No",IDNO,131,50,50,14 - PUSHBUTTON "&Cancel",IDCANCEL,187,50,50,14 + LTEXT "",IDC_INFOBOXTEXT,35,7,126,41,SS_EDITCONTROL | SS_NOPREFIX + DEFPUSHBUTTON "&Yes",IDOK,7,70,50,14 + PUSHBUTTON "&No",IDNO,61,70,50,14 + PUSHBUTTON "&Cancel",IDCANCEL,115,70,50,14 CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,122,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,54,122,10 END IDD_MUI_INFOBOX5 DIALOGEX 0, 0, 244, 71 @@ -614,7 +614,7 @@ CAPTION "Notepad3" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN ICON IDR_MAINWND48,IDC_INFOBOXICON,7,7,21,20 - LTEXT "",IDC_INFOBOXTEXT,35,7,202,41 + LTEXT "",IDC_INFOBOXTEXT,35,7,202,41,SS_EDITCONTROL | SS_NOPREFIX DEFPUSHBUTTON "Retry",IDRETRY,131,50,50,14 PUSHBUTTON "&Cancel",IDCANCEL,187,50,50,14 CONTROL "&Don't display this message again.",IDC_INFOBOXCHECK, diff --git a/src/Dialogs.c b/src/Dialogs.c index 7fdbb2d78..b57621b73 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -245,20 +245,22 @@ static INT_PTR CALLBACK _InfoBoxLngDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, case IDYES: case IDRETRY: case IDIGNORE: + case IDTRYAGAIN: case IDCONTINUE: if (IsButtonChecked(hwnd, IDC_INFOBOXCHECK) && StrIsNotEmpty(lpMsgBox->lpstrSetting)) { IniFileSetInt(Globals.IniFile, Constants.SectionSuppressedMessages, lpMsgBox->lpstrSetting, LOWORD(wParam)); } - case IDCANCEL: case IDNO: case IDABORT: case IDCLOSE: - case IDTRYAGAIN: + case IDCANCEL: EndDialog(hwnd, LOWORD(wParam)); return true; case IDC_INFOBOXCHECK: DialogEnableControl(hwnd, IDNO, !IsButtonChecked(hwnd, IDC_INFOBOXCHECK)); + DialogEnableControl(hwnd, IDABORT, !IsButtonChecked(hwnd, IDC_INFOBOXCHECK)); + DialogEnableControl(hwnd, IDCLOSE, !IsButtonChecked(hwnd, IDC_INFOBOXCHECK)); DialogEnableControl(hwnd, IDCANCEL, !IsButtonChecked(hwnd, IDC_INFOBOXCHECK)); break; diff --git a/src/Notepad3.c b/src/Notepad3.c index 02363b0b3..2b5de1079 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -9871,15 +9871,15 @@ bool FileSave(bool bSaveAlways, bool bAsk, bool bSaveAs, bool bSaveCopy, bool bP if (bAsk) { // File or "Untitled" ... - WCHAR tch[80] = { L'\0' }; + WCHAR tch[MAX_PATH] = { L'\0' }; if (StrIsNotEmpty(Globals.CurrentFile)) { - StringCchCopyN(tch, COUNTOF(tch), PathFindFileName(Globals.CurrentFile), 56); + StringCchCopy(tch, COUNTOF(tch), PathFindFileName(Globals.CurrentFile)); } else { GetLngString(IDS_MUI_UNTITLED, tch, COUNTOF(tch)); } - switch (InfoBoxLng(MB_YESNOCANCEL | MB_ICONINFORMATION, NULL, IDS_MUI_ASK_SAVE, tch)) { + switch (InfoBoxLng(MB_YESNOCANCEL | MB_ICONWARNING, NULL, IDS_MUI_ASK_SAVE, tch)) { case IDCANCEL: return false; case IDNO: