Merge pull request #820 from hpwamr/MUI_dev

Dialog box of "Command Line Help"
This commit is contained in:
Pairi Daiza 2018-11-21 09:57:36 +01:00 committed by GitHub
commit 5212b3f6dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 10 deletions

View File

@ -71,15 +71,15 @@ BEGIN
CONTROL "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_READONLY | ES_NUMBER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,20,80,360,170
END
IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 280, 160
IDD_MUI_CMDLINEHELP DIALOGEX 0, 0, 300, 210
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Command Line Help"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
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
ICON IDR_MAINWND48, IDC_STATIC, 10, 7, 20, 20
DEFPUSHBUTTON "OK", IDOK, 239, 187, 55, 16
//LTEXT "_place_holder_", IDC_CMDLINEHELP, 40, 7, 226, 290
EDITTEXT IDC_CMDLINEHELP, 36, 7, 250, 170, ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_BORDER
END
IDD_MUI_FIND DIALOGEX 0, 0, 273, 130

View File

@ -195,9 +195,15 @@ STRINGTABLE
BEGIN
IDS_MUI_CMDLINEHELP "\
Command Line Help\r\n\r\n\
Usage:\r\n\
Notepad3 \t[/?] [...[Encoding]] [...[Line ending mode]] [/e] [/g] [/m] [/l]\r\n\
\t[/q] [/s] [/d] [/h] [/x] [/c] [/b] [/n] [/r| [/p] [/t] [/i] [/o]\r\n\
\t[/f] [/u] [/v] [/vd] [/z] [[drive:][path]filename[...]]\r\n\r\n\
file\tMust be the last argument, no quoted spaces by default.\r\n\
+\tAccept multiple file arguments (with quoted spaces).\r\n\
-\tAccept single file argument (without quoted spaces).\r\n\
-\tAccept single file argument (without quoted spaces).\r\n\r\n\
Options:\r\n\
/?\tDispay this help message.\r\n\
…\tEncoding (/ansi, /unicode, /unicodebe, /utf8, /utf8sig).\r\n\
…\tLine ending mode (/crlf, /cr, /lf).\r\n\
/e\tFile source encoding.\r\n\
@ -221,14 +227,19 @@ file\tMust be the last argument, no quoted spaces by default.\r\n\
/u\tLaunch with elevated privileges.\r\n\
/v\tPrint file immediately and quit.\r\n\
/vd\tPrint file (open printer dialog).\r\n\
/z\tSkip next (usable for registry-based Notepad replacement).\
/z\tSkip next (usable for registry-based Notepad replacement).\r\n\r\n\
Examples:\r\n\
\t> Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\
\t... Open a new file: ""Test.txt"" Encoding=UTF-8-BOM, EoL=CRLF.\r\n\
\t> Notepad3 /v d:\\temp\\Test.txt\r\n\
\t... Print file: ""Test.txt"" immediately.\r\n\
"
IDS_MUI_STYLEEDIT_HELP "\
Filename extensions must be separated by ;\r\n\r\n\
Style format:\r\n\
font:Name;size:[+/-]nn.mm;bold;italic;underline;\r\n\
fore:#ffffff;back:#bbbbbb;eolfilled;indic_gradient\r\n\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
fore:#ffffff; back:#bbbbbb; eolfilled; indic_gradient\r\n\
Style properties can be copied using copy and paste or drag and drop.\
"

View File

@ -287,7 +287,7 @@ INT_PTR CALLBACK CmdLineHelpProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lPa
case WM_INITDIALOG:
{
WCHAR szTitle[80] = { L'\0' };
WCHAR szText[2048] = { L'\0' };
WCHAR szText[4096] = { L'\0' };
GetLngString(IDS_MUI_APPTITLE, szTitle, COUNTOF(szTitle));
GetLngString(IDS_MUI_CMDLINEHELP, szText, COUNTOF(szText));
SetWindowText(hwnd, szTitle);