diff --git a/programs/notepad/notepad.rc b/programs/notepad/notepad.rc index a8c8bb3..7fe6719 100644 --- a/programs/notepad/notepad.rc +++ b/programs/notepad/notepad.rc @@ -22,46 +22,58 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT MAIN_MENU MENU -{ - POPUP "&File" { - MENUITEM "&New\tCtrl+N", CMD_NEW - MENUITEM "&Open...\tCtrl+O", CMD_OPEN - MENUITEM "&Save\tCtrl+S", CMD_SAVE - MENUITEM "Save &as...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Print...\tCtrl+P", CMD_PRINT - MENUITEM "Page Se&tup...", CMD_PAGE_SETUP - MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "E&xit", CMD_EXIT - } -POPUP "&Edit" { - MENUITEM "&Undo\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", CMD_CUT - MENUITEM "&Copy\tCtrl+C", CMD_COPY - MENUITEM "&Paste\tCtrl+V", CMD_PASTE - MENUITEM "&Delete\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Time/Date\tF5", CMD_TIME_DATE - MENUITEM SEPARATOR - MENUITEM "&Wrap long lines", CMD_WRAP - MENUITEM "&Font...", CMD_FONT - } -POPUP "&Search" { - MENUITEM "&Search...\tCtrl+F", CMD_SEARCH - MENUITEM "&Search next\tF3", CMD_SEARCH_NEXT - MENUITEM "&Replace...\tCtrl+H", CMD_REPLACE - } -POPUP "&Help" { - MENUITEM "&Contents\tF1", CMD_HELP_CONTENTS - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD - } -} +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&New\tCtrl+N", CMD_NEW + MENUITEM "&Open...\tCtrl+O", CMD_OPEN + MENUITEM "&Save\tCtrl+S", CMD_SAVE + MENUITEM "Save &as...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Page Se&tup...", CMD_PAGE_SETUP + MENUITEM "&Print...\tCtrl+P", CMD_PRINT + MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "E&xit", CMD_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Undo\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", CMD_CUT + MENUITEM "&Copy\tCtrl+C", CMD_COPY + MENUITEM "&Paste\tCtrl+V", CMD_PASTE + MENUITEM "&Delete\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Find...\tCtrl+F", CMD_SEARCH + MENUITEM "Find &next\tF3", CMD_SEARCH_NEXT + MENUITEM "&Replace...\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Time/Date\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Wrap long lines", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "&View" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "&Help" + BEGIN + MENUITEM "&Contents", CMD_HELP_CONTENTS + MENUITEM "&Search...", CMD_HELP_SEARCH + MENUITEM "&Help on help", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&About", CMD_HELP_ABOUT_NOTEPAD + END +END STRINGTABLE -{ +BEGIN STRING_PAGESETUP_HEADERVALUE, "#msgctxt#do not translate#&f" STRING_PAGESETUP_FOOTERVALUE, "Page &p" @@ -89,13 +101,14 @@ you save this file in the %2 encoding.\n\ To keep these characters, click Cancel, and then select\n\ one of the Unicode options in the Encoding drop down list.\n\ Continue?" -} +STRING_LINE_COLUMN, "Line %d, column %d" +END DIALOG_PAGESETUP DIALOG 0, 0, 240, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Page Setup" -{ +BEGIN LTEXT "&Header:", 0x140, 10, 07, 68, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 78, 5,110, 12, WS_BORDER | WS_TABSTOP LTEXT "&Footer:", 0x142, 10, 24, 68, 15 @@ -114,7 +127,7 @@ EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 148, 73, 35, 11, WS_CHILD | WS_BORDER | WS_ DEFPUSHBUTTON "OK", IDOK, 195, 3, 40, 15, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 195, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Help", IDHELP, 195, 39, 40, 15, WS_TABSTOP -} +END IDD_OFN_TEMPLATE DIALOG 50,50,300,15 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER @@ -124,8 +137,20 @@ BEGIN COMBOBOX IDC_OFN_ENCCOMBO, 63,0, 150,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST END +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOGEX 0,0,165,50 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Goto line" +BEGIN +EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "Line number:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP +PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +END + ID_ACCEL ACCELERATORS -{ +BEGIN "#msgctxt#accelerator Select All#A", CMD_SELECT_ALL, VIRTKEY, CONTROL "#msgctxt#accelerator Copy#C", CMD_COPY, VIRTKEY, CONTROL "#msgctxt#accelerator Find#F", CMD_SEARCH, VIRTKEY, CONTROL @@ -143,7 +168,7 @@ ID_ACCEL ACCELERATORS VK_F5, CMD_TIME_DATE, VIRTKEY VK_INSERT, CMD_COPY, VIRTKEY, CONTROL VK_INSERT, CMD_PASTE, VIRTKEY, SHIFT -} +END LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h index 4fed2f8..60a8a60 100644 --- a/programs/notepad/notepad_res.h +++ b/programs/notepad/notepad_res.h @@ -25,6 +25,8 @@ #define MAIN_MENU 0x201 #define DIALOG_PAGESETUP 0x202 #define ID_ACCEL 0x203 +#define DIALOG_GOTO 0x207 +#define ID_LINENUMBER 0x208 #define IDI_NOTEPAD 0x300 @@ -49,11 +51,17 @@ #define CMD_SEARCH 0x120 #define CMD_SEARCH_NEXT 0x121 #define CMD_REPLACE 0x122 +#define CMD_GOTO 0x123 #define CMD_WRAP 0x119 #define CMD_FONT 0x140 +#define CMD_STATUSBAR 0x150 +#define CMD_STATUSBAR_WND_ID 0x151 + #define CMD_HELP_CONTENTS 0x130 +#define CMD_HELP_SEARCH 0x131 +#define CMD_HELP_ON_HELP 0x132 #define CMD_HELP_ABOUT_NOTEPAD 0x134 /* Control IDs */ @@ -84,6 +92,8 @@ #define STRING_LOSS_OF_UNICODE_CHARACTERS 0x183 +#define STRING_LINE_COLUMN 0x186 + /* Open/Save As dialog template */ #define IDD_OFN_TEMPLATE 0x190 #define IDC_OFN_ENCCOMBO 0x191