CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-17 21:03:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'Dev_Fixes4Release' into Dev_NewFeatures

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-11-20 09:13:59 +01:00
commit 61d33541ad
13 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
language/np3_af_za/dialogs_af_za.rc
View File

@ -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

2
language/np3_be_by/dialogs_be_by.rc
View File

@ -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

2
language/np3_de_de/dialogs_de_de.rc
View File

@ -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

34
language/np3_de_de/strings_de_de.rc
View File

@ -198,37 +198,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\
@ -237,7 +231,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 "\

2
language/np3_en_gb/dialogs_en_gb.rc
View File

@ -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

2
language/np3_en_us/dialogs_en_us.rc
View File

@ -77,7 +77,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

2
language/np3_es_es/dialogs_es_es.rc
View File

@ -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

2
language/np3_fr_fr/dialogs_fr_fr.rc
View File

@ -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

2
language/np3_ja_jp/dialogs_ja_jp.rc
View File

@ -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

2
language/np3_nl_nl/dialogs_nl_nl.rc
View File

@ -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

2
language/np3_ru_ru/dialogs_ru_ru.rc
View File

@ -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

2
language/np3_zh_cn/dialogs_zh_cn.rc
View File

@ -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

1
src/Dialogs.c
View File

@ -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;