ports/mc
ports/mc
1
1
Форкнуть 0
Код Релизы 2 Активность

Ticket #320: menu and configuration dialogs reorganization.

Просмотр исходного кода 
'Left'/'Right' menu was reorganized.
'File listing' menu item was added to fast switch file panel
to file listing mode.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Этот коммит содержится в:
Andrew Borodin 2010-03-08 12:10:36 +03:00
родитель 017dbda2d7
Коммит 4ef4a5e032
7 изменённых файлов: 93 добавлений и 81 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
misc/mc.keymap.default
Просмотреть файл

@ -227,6 +227,7 @@ CmdSingleDirsize = ctrl-space
CmdSuspend = ctrl-z
CmdSwapPanel = ctrl-u
CmdHistory = alt-h
CmdListing =
CmdToggleListing = alt-t
CmdToggleShowHidden = alt-dot
CmdTogglePanelsSplit = alt-comma

1
misc/mc.keymap.emacs
Просмотреть файл

@ -231,6 +231,7 @@ CmdSingleDirsize = ctrl-space
CmdSuspend = ctrl-z
CmdSwapPanel = ctrl-u
CmdHistory = alt-h
CmdListing =
CmdToggleListing = alt-t
CmdToggleShowHidden = alt-dot
CmdTogglePanelsSplit = alt-comma

6
src/cmd.c
Просмотреть файл

@ -1453,6 +1453,12 @@ switch_to_listing (int panel_index)
void
listing_cmd (void)
{
switch_to_listing (MENU_PANEL_IDX);
}
void
change_listing_cmd (void)
{
int list_type;
int use_msformat;

1
src/cmd.h
Просмотреть файл

@ -60,6 +60,7 @@ char *get_random_hint (int force);
void user_file_menu_cmd (void);
void info_cmd (void);
void listing_cmd (void);
void change_listing_cmd (void);
void quick_cmd_no_menu (void);
void info_cmd_no_menu (void);
void quick_view_cmd (void);

141
src/cmddef.h
Просмотреть файл

@ -306,77 +306,78 @@
/* main commands */
#define CK_AddHotlist 7001
#define CK_ChmodCmd 7002
#define CK_ChownAdvancedCmd 7003
#define CK_ChownCmd 7004
#define CK_CompareDirsCmd 7005
#define CK_ConfigureBox 7006
#define CK_ConfigureVfs 7007
#define CK_ConfirmBox 7008
#define CK_CopyCmd 7009
#define CK_CopyCurrentPathname 7010
#define CK_CopyCurrentReadlink 7011
#define CK_CopyCurrentTagged 7012
#define CK_CopyOtherPathname 7013
#define CK_CopyOtherReadlink 7014
#define CK_CopyOtherTagged 7015
#define CK_DeleteCmd 7016
#define CK_DirsizesCmd 7017
#define CK_DisplayBitsBox 7018
#define CK_EditCmd 7019
#define CK_EditExtFileCmd 7020
#define CK_EditFhlFileCmd 7021
#define CK_EditMcMenuCmd 7022
#define CK_EditSymlinkCmd 7023
#define CK_EditSyntaxCmd 7024
#define CK_EditUserMenuCmd 7025
#define CK_ExternalPanelize 7026
#define CK_FilterCmd 7027
#define CK_FilteredViewCmd 7028
#define CK_FindCmd 7029
#define CK_FishlinkCmd 7030
#define CK_FtplinkCmd 7031
#define CK_HistoryCmd 7032
#define CK_InfoCmd 7033
#define CK_JobsCmd 7034
#define CK_LayoutCmd 7035
#define CK_LearnKeys 7036
#define CK_LinkCmd 7037
#define CK_ListingCmd 7038
#define CK_ListmodeCmd 7039
#define CK_MenuLastSelectedCmd 7042
#define CK_MkdirCmd 7044
#define CK_NetlinkCmd 7045
#define CK_QuickCdCmd 7046
#define CK_QuickChdirCmd 7047
#define CK_QuickViewCmd 7048
#define CK_QuietQuitCmd 7049
#define CK_QuitCmd 7050
#define CK_RenameCmd 7051
#define CK_RereadCmd 7052
#define CK_ReselectVfs 7053
#define CK_ReverseSelectionCmd 7054
#define CK_SaveSetupCmd 7055
#define CK_SelectCmd 7056
#define CK_SingleDirsizeCmd 7057
#define CK_SmblinkCmd 7058
#define CK_SuspendCmd 7059
#define CK_SwapCmd 7060
#define CK_SymlinkCmd 7061
#define CK_ToggleListingCmd 7062
#define CK_ToggleShowHidden 7063
#define CK_TreeCmd 7064
#define CK_TreeBoxCmd 7065
#define CK_UndeleteCmd 7066
#define CK_UnselectCmd 7067
#define CK_UserFileMenuCmd 7068
#define CK_UserMenuCmd 7069
#define CK_ViewCmd 7070
#define CK_ViewFileCmd 7071
#define CK_ChangeListingCmd 7002
#define CK_ChmodCmd 7003
#define CK_ChownAdvancedCmd 7004
#define CK_ChownCmd 7005
#define CK_CompareDirsCmd 7006
#define CK_ConfigureBox 7007
#define CK_ConfigureVfs 7008
#define CK_ConfirmBox 7009
#define CK_CopyCmd 7010
#define CK_CopyCurrentPathname 7011
#define CK_CopyCurrentReadlink 7012
#define CK_CopyCurrentTagged 7013
#define CK_CopyOtherPathname 7014
#define CK_CopyOtherReadlink 7015
#define CK_CopyOtherTagged 7016
#define CK_DeleteCmd 7017
#define CK_DirsizesCmd 7018
#define CK_DisplayBitsBox 7019
#define CK_EditCmd 7020
#define CK_EditExtFileCmd 7021
#define CK_EditFhlFileCmd 7022
#define CK_EditMcMenuCmd 7023
#define CK_EditSymlinkCmd 7024
#define CK_EditSyntaxCmd 7025
#define CK_EditUserMenuCmd 7026
#define CK_ExternalPanelize 7027
#define CK_FilterCmd 7028
#define CK_FilteredViewCmd 7029
#define CK_FindCmd 7030
#define CK_FishlinkCmd 7031
#define CK_FtplinkCmd 7032
#define CK_HistoryCmd 7033
#define CK_InfoCmd 7034
#define CK_JobsCmd 7035
#define CK_LayoutBox 7036
#define CK_LearnKeys 7037
#define CK_LinkCmd 7038
#define CK_ListingCmd 7039
#define CK_ListmodeCmd 7042
#define CK_MenuLastSelectedCmd 7044
#define CK_MkdirCmd 7045
#define CK_NetlinkCmd 7046
#define CK_QuickCdCmd 7047
#define CK_QuickChdirCmd 7048
#define CK_QuickViewCmd 7049
#define CK_QuietQuitCmd 7050
#define CK_QuitCmd 7051
#define CK_RenameCmd 7052
#define CK_RereadCmd 7053
#define CK_ReselectVfs 7054
#define CK_ReverseSelectionCmd 7055
#define CK_SaveSetupCmd 7056
#define CK_SelectCmd 7057
#define CK_SingleDirsizeCmd 7058
#define CK_SmblinkCmd 7059
#define CK_SuspendCmd 7060
#define CK_SwapCmd 7061
#define CK_SymlinkCmd 7062
#define CK_ToggleListingCmd 7063
#define CK_ToggleShowHidden 7064
#define CK_TreeCmd 7065
#define CK_TreeBoxCmd 7066
#define CK_UndeleteCmd 7067
#define CK_UnselectCmd 7068
#define CK_UserFileMenuCmd 7069
#define CK_UserMenuCmd 7070
#define CK_ViewCmd 7071
#define CK_ViewFileCmd 7072
#define CK_HelpCmd 7072
#define CK_MenuCmd 7073
#define CK_TogglePanelsSplit 7074
#define CK_DiffViewCmd 7075
#define CK_MenuCmd 7074
#define CK_TogglePanelsSplit 7075
#define CK_DiffViewCmd 7076
/* panels */
#define CK_PanelChdirOtherPanel 8001

1
src/keybind.c
Просмотреть файл

@ -358,6 +358,7 @@ static name_keymap_t command_names[] = {
{ "CmdLayout", CK_LayoutCmd },
{ "CmdLearnKeys", CK_LearnKeys },
{ "CmdLink", CK_LinkCmd },
{ "CmdChangeListing", CK_ChangeListingCmd },
{ "CmdListing", CK_ListingCmd },
#ifdef LISTMODE_EDITOR
{ "CmdListmodeCmd", CK_ListmodeCmd }.

23
src/main.c
Просмотреть файл

@ -671,18 +671,16 @@ 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_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_entry_create (_("File listin&g"), CK_ListingCmd));
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));
entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("&Filter..."), CK_FilterCmd));
entries = g_list_append (entries, menu_entry_create (_("&Listing mode..."), CK_ChangeListingCmd));
entries = g_list_append (entries, menu_entry_create (_("&Sort order..."), CK_Sort));
entries = g_list_append (entries, menu_entry_create (_("&Filter..."), CK_FilterCmd));
#ifdef HAVE_CHARSET
entries = g_list_append (entries, menu_separator_create ());
entries =
g_list_append (entries, menu_entry_create (_("&Encoding..."), CK_PanelSetPanelEncoding));
entries = g_list_append (entries, menu_entry_create (_("&Encoding..."), CK_PanelSetPanelEncoding));
#endif
#ifdef USE_NETCODE
entries = g_list_append (entries, menu_separator_create ());
@ -694,7 +692,7 @@ create_panel_menu (void)
#ifdef ENABLE_VFS_SMB
entries = g_list_append (entries, menu_entry_create (_("SM&B link..."), CK_SmblinkCmd));
#endif /* ENABLE_VFS_SMB */
#endif
#endif /* USE_NETCODE */
entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("&Rescan"), CK_RereadCmd));
@ -1176,6 +1174,9 @@ midnight_execute_cmd (Widget * sender, unsigned long command)
case CK_AddHotlist:
add2hotlist_cmd ();
break;
case CK_ChangeListingCmd:
change_listing_cmd ();
break;
case CK_ChmodCmd:
chmod_cmd ();
break;