From f196c32a5de2ea51cd7ec03a208c3135a5bc405c Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 19 Nov 2018 21:20:18 +0100 Subject: [PATCH 1/2] + MUI - Command Line Help - Add a Notepad3 Icon --- language/np3_af_za/dialogs_af_za.rc | 2 +- language/np3_be_by/dialogs_be_by.rc | 2 +- language/np3_de_de/dialogs_de_de.rc | 2 +- language/np3_en_gb/dialogs_en_gb.rc | 2 +- language/np3_en_us/dialogs_en_us.rc | 2 +- language/np3_es_es/dialogs_es_es.rc | 2 +- language/np3_fr_fr/dialogs_fr_fr.rc | 2 +- language/np3_ja_jp/dialogs_ja_jp.rc | 2 +- language/np3_nl_nl/dialogs_nl_nl.rc | 2 +- language/np3_ru_ru/dialogs_ru_ru.rc | 2 +- language/np3_zh_cn/dialogs_zh_cn.rc | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc index 2a6f209a9..628ac1bf7 100644 --- a/language/np3_af_za/dialogs_af_za.rc +++ b/language/np3_af_za/dialogs_af_za.rc @@ -76,7 +76,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Command Line Help" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -ICON IDI_MUI_RUN, IDC_STATIC, 10, 7, 20, 20 +ICON IDR_MAINWND48, IDC_STATIC, 10, 7, 20, 20 DEFPUSHBUTTON "OK", IDOK, 220, 137, 55, 16 //LTEXT "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290 EDITTEXT IDC_CMDLINEHELP, 36, 7, 230, 120, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc index 483a3ab4c..60ad705e5 100644 --- a/language/np3_be_by/dialogs_be_by.rc +++ b/language/np3_be_by/dialogs_be_by.rc @@ -75,7 +75,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Command Line Help" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -ICON IDI_MUI_RUN, IDC_STATIC, 10, 7, 20, 20 +ICON IDR_MAINWND48, IDC_STATIC, 10, 7, 20, 20 DEFPUSHBUTTON "OK", IDOK, 220, 137, 55, 16 //LTEXT "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290 EDITTEXT IDC_CMDLINEHELP, 36, 7, 230, 120, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc index a0f3d006d..820dee5fc 100644 --- a/language/np3_de_de/dialogs_de_de.rc +++ b/language/np3_de_de/dialogs_de_de.rc @@ -76,7 +76,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Command Line Help" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -ICON IDI_MUI_RUN, IDC_STATIC, 10, 7, 20, 20 +ICON IDR_MAINWND48, IDC_STATIC, 10, 7, 20, 20 DEFPUSHBUTTON "OK", IDOK, 220, 137, 55, 16 //LTEXT "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290 EDITTEXT IDC_CMDLINEHELP, 36, 7, 230, 120, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER diff --git a/language/np3_en_gb/dialogs_en_gb.rc b/language/np3_en_gb/dialogs_en_gb.rc index 49bf2ac02..bbd02a9c8 100644 --- a/language/np3_en_gb/dialogs_en_gb.rc +++ b/language/np3_en_gb/dialogs_en_gb.rc @@ -76,7 +76,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Command Line Help" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -ICON IDI_MUI_RUN, IDC_STATIC, 10, 7, 20, 20 +ICON IDR_MAINWND48, IDC_STATIC, 10, 7, 20, 20 DEFPUSHBUTTON "OK", IDOK, 220, 137, 55, 16 //LTEXT "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290 EDITTEXT IDC_CMDLINEHELP, 36, 7, 230, 120, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc index 68a66b262..00ecbe937 100644 --- a/language/np3_en_us/dialogs_en_us.rc +++ b/language/np3_en_us/dialogs_en_us.rc @@ -76,7 +76,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Command Line Help" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -ICON IDI_MUI_RUN, IDC_STATIC, 10, 7, 20, 20 +ICON IDR_MAINWND48, IDC_STATIC, 10, 7, 20, 20 DEFPUSHBUTTON "OK", IDOK, 220, 137, 55, 16 //LTEXT "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290 EDITTEXT IDC_CMDLINEHELP, 36, 7, 230, 120, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc index 2afee59fc..065f5eea7 100644 --- a/language/np3_es_es/dialogs_es_es.rc +++ b/language/np3_es_es/dialogs_es_es.rc @@ -76,7 +76,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Command Line Help" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -ICON IDI_MUI_RUN, IDC_STATIC, 10, 7, 20, 20 +ICON IDR_MAINWND48, IDC_STATIC, 10, 7, 20, 20 DEFPUSHBUTTON "OK", IDOK, 220, 137, 55, 16 //LTEXT "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290 EDITTEXT IDC_CMDLINEHELP, 36, 7, 230, 120, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc index 745f0008e..00fbfe892 100644 --- a/language/np3_fr_fr/dialogs_fr_fr.rc +++ b/language/np3_fr_fr/dialogs_fr_fr.rc @@ -76,7 +76,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Command Line Help" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -ICON IDI_MUI_RUN, IDC_STATIC, 10, 7, 20, 20 +ICON IDR_MAINWND48, IDC_STATIC, 10, 7, 20, 20 DEFPUSHBUTTON "OK", IDOK, 220, 137, 55, 16 //LTEXT "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290 EDITTEXT IDC_CMDLINEHELP, 36, 7, 230, 120, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER diff --git a/language/np3_ja_jp/dialogs_ja_jp.rc b/language/np3_ja_jp/dialogs_ja_jp.rc index 503913d8b..e1f992fce 100644 --- a/language/np3_ja_jp/dialogs_ja_jp.rc +++ b/language/np3_ja_jp/dialogs_ja_jp.rc @@ -76,7 +76,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Command Line Help" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -ICON IDI_MUI_RUN, IDC_STATIC, 10, 7, 20, 20 +ICON IDR_MAINWND48, IDC_STATIC, 10, 7, 20, 20 DEFPUSHBUTTON "OK", IDOK, 220, 137, 55, 16 //LTEXT "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290 EDITTEXT IDC_CMDLINEHELP, 36, 7, 230, 120, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc index a074cf7ab..89c5fe914 100644 --- a/language/np3_nl_nl/dialogs_nl_nl.rc +++ b/language/np3_nl_nl/dialogs_nl_nl.rc @@ -76,7 +76,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Command Line Help" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -ICON IDI_MUI_RUN, IDC_STATIC, 10, 7, 20, 20 +ICON IDR_MAINWND48, IDC_STATIC, 10, 7, 20, 20 DEFPUSHBUTTON "OK", IDOK, 220, 137, 55, 16 //LTEXT "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290 EDITTEXT IDC_CMDLINEHELP, 36, 7, 230, 120, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER diff --git a/language/np3_ru_ru/dialogs_ru_ru.rc b/language/np3_ru_ru/dialogs_ru_ru.rc index fd695a2cb..c840070df 100644 --- a/language/np3_ru_ru/dialogs_ru_ru.rc +++ b/language/np3_ru_ru/dialogs_ru_ru.rc @@ -76,7 +76,7 @@ CAPTION "Command Line Help" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_MUI_RUN, IDC_STATIC, 10, 7, 20, 20 -DEFPUSHBUTTON "OK", IDOK, 220, 137, 55, 16 +ICON IDR_MAINWND48, IDC_STATIC, 10, 7, 20, 20 //LTEXT "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290 EDITTEXT IDC_CMDLINEHELP, 36, 7, 230, 120, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER END diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc index 3a49a869f..3eaa0f631 100644 --- a/language/np3_zh_cn/dialogs_zh_cn.rc +++ b/language/np3_zh_cn/dialogs_zh_cn.rc @@ -76,7 +76,7 @@ CAPTION "Command Line Help" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_MUI_RUN, IDC_STATIC, 10, 7, 20, 20 -DEFPUSHBUTTON "OK", IDOK, 220, 137, 55, 16 +ICON IDR_MAINWND48, IDC_STATIC, 10, 7, 20, 20 //LTEXT "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290 EDITTEXT IDC_CMDLINEHELP, 36, 7, 230, 120, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER END From 38ecb2ecef6d51511bc61d0bb705a74e2d13dd05 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Tue, 20 Nov 2018 09:02:36 +0100 Subject: [PATCH 2/2] + fix: format of German cmdln-help strings + enh: center cmdln-help dialog in Notepad3 window --- language/np3_de_de/strings_de_de.rc | 34 ++++++++++++----------------- src/Dialogs.c | 1 + 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index bca349091..f74e5f5b0 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -196,37 +196,31 @@ BEGIN IDS_MUI_CMDLINEHELP "\ Kommandozeilen Hilfe\r\n\r\n\ Datei\tMuss das letzte Argument sein,\r\n\ - \tnormalerweise keine gequoteten Leerstellen.\r\n\ -+\tAkzeptiere mehrere Dateien\r\n\ - \t(mit gequoteten Leerstellen).\r\n\ --\tAkzeptiere ein einzelne Datei\r\n\ - \t(ohne gequotete Leerstellen).\r\n\ -…\tCodierung\r\n\ - \t(/ansi, /unicode, /unicodebe, /utf8, /utf8sig).\r\n\ -…\tZeilenumbruch Modus\r\n\ - \t(/crlf, /cr, /lf).\r\n\ + \t normalerweise keine gequoteten Leerstellen.\r\n\ ++\tAkzeptiere mehrere Dateien (mit gequoteten Leerstellen).\r\n\ +-\tAkzeptiere ein einzelne Datei (ohne gequotete Leerstellen).\r\n\ +…\tCodierung (/ansi, /unicode, /unicodebe, /utf8, /utf8sig).\r\n\ +…\tZeilenumbruch Modus (/crlf, /cr, /lf).\r\n\ /e\tDatei Quellen Codierung.\r\n\ -/g\tSpringe zur gegebenen Position\r\n\ - \t(/g -1 Ende der Datei).\r\n\ +/g\tSpringe zur gegebenen Position (/g -1 Ende der Datei).\r\n\ /m\tFinde gegebenen Suchbegriff\r\n\ - \t(/m- letzter, /mr regex, /mb backslash).\r\n\ + \t (/m- letzter, /mr regex, /mb backslash).\r\n\ /l\tAuto-Neu-Laden einer veränderten Datei.\r\n\ -/q\tErzwinge die Erzeugung einer neuen Datei\r\n\ - \tohne Nachfrage.\r\n\ +/q\tErzwinge die Erzeugung einer neuen Datei ohne Nachfrage.\r\n\ /s\tSetze das gegebene Syntax Schema.\r\n\ /d\tSetze das Standard-Text Schema.\r\n\ /h\tSetze das Web Quellcode Schema.\r\n\ /x\tSetze das XML Dokument Schema.\r\n\ /c\tÖffne ein neues Fenster und\r\n\ - \tfüge den Inhalt der Zwischenablage ein.\r\n\ + \t füge den Inhalt der Zwischenablage ein.\r\n\ /b\tÖffne ein neues 'Paste Board' um\r\n\ - \tdie Einträge der Zwischenablage zu sammeln.\r\n\ + \t die Einträge der Zwischenablage zu sammeln.\r\n\ /n\tÖffne immer ein neues Fenster\r\n\ - \t(/ns single file instance).\r\n\ + \t (/ns single file instance).\r\n\ /r\tBenutze geöffnetes Fenster erneut\r\n\ - \t(/rs single file instance).\r\n\ + \t (/rs single file instance).\r\n\ /p\tSetze Fenster: Position und Größe\r\n\ - \t(/p0, /ps, /pf,l,t,r,b,m).\r\n\ + \t (/p0, /ps, /pf,l,t,r,b,m).\r\n\ /t\tSetze Fenster-Titel.\r\n\ /i\tStarte als 'Tray-Icon'.\r\n\ /o\tHalte Fenster immer auf oberster Ebene.\r\n\ @@ -235,7 +229,7 @@ Datei\tMuss das letzte Argument sein,\r\n\ /v\tDrucke Datei und beende Programm.\r\n\ /vd\tDrucke Datei (öffne Drucker-Dialog).\r\n\ /z\tÜberspringe Nächstes\r\n\ - \t(nützlich für Registy-Basierte Notepad Ersetzung).\ + \t (nützlich für Registy-Basierte Notepad Ersetzung).\ " IDS_MUI_STYLEEDIT_HELP "\ diff --git a/src/Dialogs.c b/src/Dialogs.c index 595a0d83c..015e77ebb 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -293,6 +293,7 @@ INT_PTR CALLBACK CmdLineHelpProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lPa SetWindowText(hwnd, szTitle); SetDlgItemText(hwnd, IDC_CMDLINEHELP, szText); //SendMessage(hwnd, WM_NEXTDLGCTL, (WPARAM)IDC_CMDLINEHELP, TRUE); + CenterDlgInParent(hwnd); } break;