diff --git src/inputclass.c src/inputclass.c index aaec38d..27e0332 100644 --- src/inputclass.c +++ src/inputclass.c @@ -122,8 +122,8 @@ const char *key_binding[NUM_KEYS] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* Function keys */ - ESCAPE_ABBREV, ESCAPE_ABBREV, NEXTDOC_ABBREV, PREVDOC_ABBREV, SELECTDOC_ABBREV, UNDO_ABBREV, REDO_ABBREV, PREVWORD_ABBREV, - NEXTWORD_ABBREV, PLAYONCE_ABBREV, HELP_ABBREV, NULL, NULL, NULL, NULL, NULL, + ESCAPE_ABBREV, QUIT_ABBREV, SAVE_ABBREV, MARK_ABBREV, SELECTDOC_ABBREV, UNDO_ABBREV, REDO_ABBREV, FIND_ABBREV, + REPLACEALL_ABBREV, PLAYONCE_ABBREV, ESCAPE_ABBREV, HELP_ABBREV, HELP_ABBREV, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git src/menu.c src/menu.c index 210671c..b852e29 100644 --- src/menu.c +++ src/menu.c @@ -90,49 +90,49 @@ typedef struct { static menu_item file_item[] = { - { "Open... ^O", OPEN_ABBREV }, - { "Open New... ", OPENNEW_ABBREV }, - { "Save ^S", SAVE_ABBREV }, - { "Save As... ", SAVEAS_ABBREV }, - { "Quit Now [Q", QUIT_ABBREV }, - { "Save&Exit [X", EXIT_ABBREV }, - { "About ", ABOUT_ABBREV } + { "Open... ^O", OPEN_ABBREV }, + { "Open New... ", OPENNEW_ABBREV }, + { "Save F2/^S", SAVE_ABBREV }, + { "Save As... ", SAVEAS_ABBREV }, + { "Quit Now F1/[Q", QUIT_ABBREV }, + { "Save&Exit [X", EXIT_ABBREV }, + { "About ", ABOUT_ABBREV } }; static const menu_item documents_item[] = { - { "New ^D", NEWDOC_ABBREV }, + { "New ^D", NEWDOC_ABBREV }, { "Clear ", CLEAR_ABBREV }, { "Close ^Q", CLOSEDOC_ABBREV }, - { "Next f2/[D", NEXTDOC_ABBREV }, - { "Prev f3", PREVDOC_ABBREV }, - { "Select... f4", SELECTDOC_ABBREV } + { "Next [D", NEXTDOC_ABBREV }, + { "Prev ", PREVDOC_ABBREV }, + { "Select... F4", SELECTDOC_ABBREV } }; static const menu_item edit_item[] = { - { "Mark Block ^B", MARK_ABBREV }, - { "Cut ^X", CUT_ABBREV }, - { "Copy ^C", COPY_ABBREV }, - { "Paste ^V", PASTE_ABBREV }, - { "Erase ", ERASE_ABBREV }, - { "Through [T", THROUGH_ABBREV }, - { "Delete Line ^Y", DELETELINE_ABBREV }, - { "Delete EOL [Y", DELETEEOL_ABBREV }, - { "Mark Vert ^@", MARKVERT_ABBREV }, - { "Paste Vert ^W", PASTEVERT_ABBREV }, - { "Open Clip [O", OPENCLIP_ABBREV }, - { "Save Clip [S", SAVECLIP_ABBREV } + { "Mark Block F3/^B", MARK_ABBREV }, + { "Cut ^X", CUT_ABBREV }, + { "Copy ^C", COPY_ABBREV }, + { "Paste ^V", PASTE_ABBREV }, + { "Erase ", ERASE_ABBREV }, + { "Through [T", THROUGH_ABBREV }, + { "Delete Line ^Y", DELETELINE_ABBREV }, + { "Delete EOL [Y", DELETEEOL_ABBREV }, + { "Mark Vert ^@", MARKVERT_ABBREV }, + { "Paste Vert ^W", PASTEVERT_ABBREV }, + { "Open Clip [O", OPENCLIP_ABBREV }, + { "Save Clip [S", SAVECLIP_ABBREV } }; static const menu_item search_item[] = { - { "Find... ^F", FIND_ABBREV }, + { "Find... F7/^F", FIND_ABBREV }, { "Find RegExp... ^_", FINDREGEXP_ABBREV }, { "Replace... ^R", REPLACE_ABBREV }, { "Replace Once... ", REPLACEONCE_ABBREV }, - { "Replace All... ", REPLACEALL_ABBREV }, + { "Replace All... F8", REPLACEALL_ABBREV }, { "Repeat Last ^G", REPEATLAST_ABBREV }, { "Goto Line... ^J", GOTOLINE_ABBREV }, { "Goto Col... [J", GOTOCOLUMN_ABBREV }, @@ -146,7 +146,7 @@ static const menu_item search_item[] = static const menu_item macros_item[] = { { "Start/Stop Rec ^T", RECORD_ABBREV }, - { "Play Once f9/[M", PLAYONCE_ABBREV }, + { "Play Once F9/[M", PLAYONCE_ABBREV }, { "Play Many... ", PLAY_ABBREV }, { "Play Macro... ", MACRO_ABBREV }, { "Open Macro... ", OPENMACRO_ABBREV }, @@ -158,10 +158,10 @@ static const menu_item extras_item[] = { { "Exec... ^K", EXEC_ABBREV }, { "Suspend ^Z", SUSPEND_ABBREV }, - { "Help... f10", HELP_ABBREV }, + { "Help... F12", HELP_ABBREV }, { "Refresh ^L", REFRESH_ABBREV }, - { "Undo f5/[U", UNDO_ABBREV }, - { "Redo f6/[R", REDO_ABBREV }, + { "Undo F5/[U", UNDO_ABBREV }, + { "Redo F6/[R", REDO_ABBREV }, { "Undel Line ^U", UNDELLINE_ABBREV }, { "Center ", CENTER_ABBREV }, { "Paragraph [P", PARAGRAPH_ABBREV }, @@ -193,8 +193,8 @@ PICK( "Page Down ", PAGEDOWN_ABBREV , "Next Page ", NEXTPAGE_AB { "Bottom Of Screen", MOVEBOS_ABBREV }, { "Incr Up Home", MOVEINCUP_ABBREV }, { "Incr Down End", MOVEINCDOWN_ABBREV }, - { "Prev Word f7/[B", PREVWORD_ABBREV }, - { "Next Word f8/[F", NEXTWORD_ABBREV } + { "Prev Word [B", PREVWORD_ABBREV }, + { "Next Word [F", NEXTWORD_ABBREV } }; @@ -223,7 +223,7 @@ static menu def_menus[DEF_MENU_NUM] = { { sizeof(file_item) / sizeof(menu_item), 1, - 12, + 17, 0, "File", file_item @@ -239,7 +239,7 @@ static menu def_menus[DEF_MENU_NUM] = { { sizeof(edit_item) / sizeof(menu_item), 16, - 14, + 17, 0, "Edit", edit_item diff --git src/ne.c src/ne.c index bf8ebfa..be06af4 100644 --- src/ne.c +++ src/ne.c @@ -49,7 +49,7 @@ char *NO_WARRANTY_msg[] = { PROGRAM_NAME " " VERSION ".", "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the", "GNU General Public License for more details.", "", - "Press F1, Escape or Escape-Escape to see the menus. The shortcuts", + "Press F10 to see the menus. Press F12 to see the help. The shortcuts", "prefixed by ^ are activated by the Control key; the shortcuts prefixed", "by [ are activated by Control+Meta or just Meta, depending on your terminal", "emulator. Alternatively, just press Escape followed by a letter.",