Merge pull request #4758 from RaiKoHoff/Dev_Master

Switch to "Log Monitoring" if command line option "/l" is used
2026-06-14 21:09:05 +08:00 · 2023-04-30 14:53:00 +02:00 · 2023-04-30 14:53:00 +02:00 · c69696d7b9
commit c69696d7b9
parent fab95f8f55 eeadb53309
8 changed files with 55 additions and 11 deletions
--- a/language/common_res.h
+++ b/language/common_res.h
@ -320,14 +320,15 @@
 #define IDD_MUI_INFOBOX5                17031
 #define IDD_MUI_INFOBOX6                17032
 #define IDD_MUI_INFOBOX7                17033
-#define IDD_MUI_SORT                    17034
-#define IDD_MUI_RECODE                  17035
-#define IDD_MUI_ENCODING                17036
-#define IDD_MUI_ALIGN                   17037
-#define IDD_MUI_CMDLINEHELP             17038
-#define IDD_MUI_SYSFONT_WITHLINK        17039
-#define IDD_MUI_SYSCOLOR_DLG            17040
-#define IDD_MUI_AUTOSAVE_BACKUP         17041
+#define IDD_MUI_INFOBOX_FILECHANGED     17034
+#define IDD_MUI_SORT                    17035
+#define IDD_MUI_RECODE                  17036
+#define IDD_MUI_ENCODING                17037
+#define IDD_MUI_ALIGN                   17038
+#define IDD_MUI_CMDLINEHELP             17039
+#define IDD_MUI_SYSFONT_WITHLINK        17040
+#define IDD_MUI_SYSCOLOR_DLG            17041
+#define IDD_MUI_AUTOSAVE_BACKUP         17042

 #define IDC_COMMANDLINE                 18000
 #define IDC_SEARCHEXE                   18001
--- a/language/np3_de_de/dialogs_de_de.rc
+++ b/language/np3_de_de/dialogs_de_de.rc
@ -664,6 +664,21 @@ BEGIN
    PUSHBUTTON      "&Weiter",IDCONTINUE,242,70,50,14
 END

+IDD_MUI_INFOBOX_FILECHANGED DIALOGEX 0, 0, 299, 103
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Notepad3"
+FONT 9, "Segoe UI", 400, 0, 0x1
+BEGIN
+//~ICON            IDR_MAINWND,IDC_INFOBOXICON,7,7,0,0
+CONTROL         IDR_MAINWND, IDC_INFOBOXICON, "Static", SS_BITMAP | SS_NOTIFY, 7, 7, 24, 24, WS_EX_TRANSPARENT
+LTEXT           "", IDC_INFOBOXTEXT, 35, 7, 202, 53, SS_EDITCONTROL | SS_NOPREFIX | SS_LEFT
+CONTROL         "&Diese Nachricht nicht nochmals anzeigen.", IDC_INFOBOXCHECK,
+                "Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,66,122,10
+DEFPUSHBUTTON   "&Neu Laden", IDRETRY, 186, 82, 50, 14
+PUSHBUTTON      "&Abbrechen", IDCANCEL, 130, 82, 50, 14
+PUSHBUTTON      "&Weiter", IDCONTINUE, 242, 82, 50, 14
+END
+
 IDD_MUI_SORT DIALOGEX 0, 0, 185, 188
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Sortiere Zeilen"
--- a/language/np3_de_de/strings_de_de.rc
+++ b/language/np3_de_de/strings_de_de.rc
@ -177,7 +177,7 @@ BEGIN
    IDS_MUI_ASK_CLEAR_UNDO  "Diese Operation wird die Undo-History löschen. Weiter machen?"
    IDS_MUI_READONLY_SAVE   """%s"" ist schreibgeschützt. Dokument unter einem anderen Dateipfad speichern?"
    IDS_MUI_FILECHANGENOTIFY
-                            "Die geladene Datei wurde durch ein anderes Programm auf dem Datenträger verändert.\n[Abbrechen]:\tIgnoriere alle Änderungen (Stiller Indikator).\n[Wiederholen]:\tDatei neu laden.\n[Weiter]:\tWechsle ins Logfile Monitoring."
+                            "Die geladene Datei wurde durch ein anderes Programm auf dem Datenträger verändert. Bitte wähle:\n\nAbbrechen - \tIgnoriere alle Änderungen\nNeu Laden - \tDatei neu laden\nWeiter - \t\tWechsle zum Logfile Monitoring"
    IDS_MUI_FILECHANGENOTIFY2 "Die geladene Datei wurde auf dem Datenträger gelöscht. Nochmals speichern?"
    IDS_MUI_FILELOCK_ERROR  "Es konnte keine exklusive Dateisperre auf ""%s"" gesetzt werden!"
    IDS_MUI_STICKYWINPOS    "Eingefrorene Fensterpositionierung is eingeschaltet worden. Jede neue Notepad3 Instanz wird nun diese Fensterpositionierung initial verwenden."
--- a/language/np3_en_us/dialogs_en_us.rc
+++ b/language/np3_en_us/dialogs_en_us.rc
@ -664,6 +664,21 @@ BEGIN
    PUSHBUTTON      "&Continue",IDCONTINUE,242,70,50,14
 END

+IDD_MUI_INFOBOX_FILECHANGED DIALOGEX 0, 0, 299, 103
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Notepad3"
+FONT 9, "Segoe UI", 400, 0, 0x1
+BEGIN
+    //~ICON            IDR_MAINWND,IDC_INFOBOXICON,7,7,0,0
+    CONTROL         IDR_MAINWND, IDC_INFOBOXICON, "Static", SS_BITMAP | SS_NOTIFY, 7, 7, 24, 24, WS_EX_TRANSPARENT
+    LTEXT           "",IDC_INFOBOXTEXT,35,7,202,53,SS_EDITCONTROL | SS_NOPREFIX | SS_LEFT
+    CONTROL         "&Don't display this message again.",IDC_INFOBOXCHECK,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,122,10
+    DEFPUSHBUTTON   "&Reload",IDRETRY,186,82,50,14
+    PUSHBUTTON      "&Cancel", IDCANCEL, 130, 82, 50, 14
+    PUSHBUTTON      "&Continue",IDCONTINUE,242,82,50,14
+END
+
 IDD_MUI_SORT DIALOGEX 0, 0, 185, 188
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Sort Lines"
--- a/language/np3_en_us/strings_en_us.rc
+++ b/language/np3_en_us/strings_en_us.rc
@ -177,7 +177,7 @@ BEGIN
    IDS_MUI_ASK_CLEAR_UNDO  "This operation will clear the undo history. Continue?"
    IDS_MUI_READONLY_SAVE   """%s"" is read only. Save to a different file?"
    IDS_MUI_FILECHANGENOTIFY
-                            "The current file has been modified by an external program.\n[Cancel]:\tIgnore any changes (silent indicator).\n[Try Again]:\tReload File.\n[Continue]:\tSwitch to File Monitoring."
+                            "The current file has been modified by an external program.\nPlease choose:\n\nCancel -\t\tIgnore further changes\nReload -\t\tReload File\nContinue -\tSwitch to file monitoring"
    IDS_MUI_FILECHANGENOTIFY2 "The current file has been deleted. Save now?"
    IDS_MUI_FILELOCK_ERROR  "Can not acquire exclusive file lock for ""%s""!"
    IDS_MUI_STICKYWINPOS    "Sticky Window Position is enabled. Any new Notepad3 windows will use the current window placement settings."
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@ -282,6 +282,8 @@ static INT_PTR CALLBACK _InfoBoxLngDlgProc(HWND hwnd, UINT umsg, WPARAM wParam,
            SetBitmapControl(hwnd, IDC_INFOBOXICON, hIconBmp);
        }

+        //UINT const tabStopDist[3] = { 4, 4, 8 };
+        //SendMessage(GetDlgItem(hwnd, IDC_INFOBOXTEXT), EM_SETTABSTOPS, 3, (LPARAM)tabStopDist);
        SetDlgItemText(hwnd, IDC_INFOBOXTEXT, lpMsgBox->lpstrMessage);

        if (lpMsgBox->bDisableCheckBox) {
@ -522,6 +524,10 @@ LONG InfoBoxLng(UINT uType, LPCWSTR lpstrSetting, UINT uidMsg, ...)
        idDlg = IDD_MUI_INFOBOX7;
        break;

+    case MB_FILECHANGEDNOTIFY:
+        idDlg = IDD_MUI_INFOBOX_FILECHANGED;
+        break;
+    
    default:
        idDlg = IDD_MUI_INFOBOX;
        break;
--- a/src/Dialogs.h
+++ b/src/Dialogs.h
@ -34,6 +34,9 @@
 #define UpdateWindowEx(hwnd) /* UpdateWindow(hwnd) */ \
  RedrawWindow((hwnd), NULL, NULL, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_INTERNALPAINT /* | RDW_UPDATENOW */)

+// additional InfoBoxLng() state (MB_CANCELTRYCONTINUE == 0x00000006L)
+#define MB_FILECHANGEDNOTIFY 0x0000000EL
+
 // ----------------------------------------------------------------------------

 // === MinimizeToTray Functions - see comments in Dialogs.c  ===
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@ -1897,6 +1897,10 @@ HWND InitInstance(const HINSTANCE hInstance, int nCmdShow)
                        }
                    }
                }
+                else if (s_flagChangeNotify == FWM_AUTORELOAD) {
+                    FileWatching.MonitoringLog = false; // will be reset in IDM_VIEW_CHASING_DOCTAIL
+                    PostWMCommand(hwndMain, IDM_VIEW_CHASING_DOCTAIL);
+                }
            }
        }

@ -12544,7 +12548,7 @@ LRESULT MsgFileChangeNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
        case FWM_MSGBOX: {
            SetForegroundWindow(hwnd);
            /// LONG const answer = MessageBoxExW(Globals.hwndMain, L"File change, Cancel, Retry, Continue", L"NP3", MB_ABORTRETRYIGNORE, GetLangIdByLocaleName(Globals.CurrentLngLocaleName));
-            LONG const answer = InfoBoxLng(MB_CANCELTRYCONTINUE | MB_ICONWARNING, NULL, IDS_MUI_FILECHANGENOTIFY);
+            LONG const answer = InfoBoxLng(MB_FILECHANGEDNOTIFY | MB_ICONWARNING, NULL, IDS_MUI_FILECHANGENOTIFY);
            switch (LOWORD(answer)) {
            case IDCANCEL:
            case IDABORT: