mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-03-12 10:53:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Unified some commands that differ in its behaviour when called via menu or shortcuts.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2009-11-10 11:42:31 +03:00
parent e252488ac2
commit eb2e4b0e17
5 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/mc.keymap.default
View File

@ -245,8 +245,6 @@ CmdLink = l
CmdSymlink = s
CmdInfo = i
CmdQuickView = q
CmdMenuInfo = i
CmdMenuQuickView = q
CmdExternalPanelize = exclamation
CmdReselectVfs = a
CmdJobs = j

2
misc/mc.keymap.emacs
View File

@ -250,8 +250,6 @@ CmdLink = l
CmdSymlink = s
CmdInfo = i
CmdQuickView = q
CmdMenuInfo = i
CmdMenuQuickView = q
CmdExternalPanelize = exclamation
CmdReselectVfs = a
CmdJobs = j

2
src/cmddef.h
View File

@ -333,9 +333,7 @@
#define CK_LinkCmd 7037
#define CK_ListingCmd 7038
#define CK_ListmodeCmd 7039
#define CK_MenuInfoCmd 7040
#define CK_MenuLastSelectedCmd 7042
#define CK_MenuQuickViewCmd 7043
#define CK_MkdirCmd 7044
#define CK_NetlinkCmd 7045
#define CK_QuickCdCmd 7046

3
src/keybind.c
View File

@ -328,8 +328,6 @@ static name_keymap_t command_names[] = {
#ifdef LISTMODE_EDITOR
{ "CmdListmodeCmd", CK_ListmodeCmd }.
#endif
{ "CmdMenuInfo", CK_MenuInfoCmd },
{ "CmdMenuQuickView", CK_MenuQuickViewCmd },
{ "CmdMkdir", CK_MkdirCmd },
#if defined (USE_NETCODE) && defined (ENABLE_VFS_MCFS)
{ "CmdNetlink", CK_NetlinkCmd },
@ -855,7 +853,6 @@ const global_keymap_t default_main_x_map[] = {
{ 'l', CK_LinkCmd, "l" },
{ 's', CK_SymlinkCmd, "s" },
{ XCTRL ('s'), CK_EditSymlinkCmd, "C-s" },
{ 'i', CK_MenuInfoCmd, "i" },
{ 'i', CK_InfoCmd, "i" },
{ 'q', CK_QuickViewCmd, "q" },
{ 'h', CK_AddHotlist, "h" },

20
src/main.c
View File

@ -679,8 +679,8 @@ create_panel_menu (void)
GList *entries = NULL;
entries = g_list_append (entries, menu_entry_create (_("&Listing mode..."), CK_ListingCmd));
entries = g_list_append (entries, menu_entry_create (_("&Quick view"), CK_MenuQuickViewCmd));
entries = g_list_append (entries, menu_entry_create (_("&Info" ), CK_MenuInfoCmd));
entries = g_list_append (entries, menu_entry_create (_("&Quick view"), CK_QuickViewCmd));
entries = g_list_append (entries, menu_entry_create (_("&Info" ), CK_InfoCmd));
entries = g_list_append (entries, menu_entry_create (_("&Tree"), CK_TreeCmd));
entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("&Sort order..."), CK_Sort));
@ -1237,7 +1237,10 @@ midnight_execute_cmd (Widget *sender, unsigned long command)
history_cmd ();
break;
case CK_InfoCmd:
info_cmd_no_menu ();
if (sender == the_menubar)
info_cmd (); /* mwnu */
else
info_cmd_no_menu (); /* shortcut or buttonbar */
break;
#ifdef WITH_BACKGROUND
case CK_JobsCmd:
@ -1264,15 +1267,9 @@ midnight_execute_cmd (Widget *sender, unsigned long command)
case CK_MenuCmd:
menu_cmd ();
break;
case CK_MenuInfoCmd:
info_cmd ();
break;
case CK_MenuLastSelectedCmd:
menu_last_selected_cmd ();
break;
case CK_MenuQuickViewCmd:
quick_view_cmd ();
break;
case CK_MkdirCmd:
mkdir_cmd ();
break;
@ -1293,7 +1290,10 @@ midnight_execute_cmd (Widget *sender, unsigned long command)
quick_chdir_cmd ();
break;
case CK_QuickViewCmd:
quick_cmd_no_menu ();
if (sender == the_menubar)
quick_view_cmd (); /* menu */
else
quick_cmd_no_menu (); /* shortcut or buttonabr */
break;
case CK_QuietQuitCmd:
quiet_quit_cmd ();