mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle CK_Shell, CK_LearnKeys, CK_OptionsSaveMode and CK_SaveSetup actions in dialog level instead of widget one. 

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2011-07-27 14:51:19 +04:00
parent 98e0de0c3a
commit b2152ae22a
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/editor/edit-impl.h
View File

@ -183,7 +183,7 @@ gboolean edit_drop_hotkey_menu (Dlg_head * h, int key);
void edit_menu_cmd (Dlg_head * h);
void user_menu (WEdit * edit, const char *menu_file, int selected_entry);
void edit_init_menu (struct WMenuBar *menubar);
void menu_save_mode_cmd (void);
void edit_save_mode_cmd (void);
gboolean edit_translate_key (WEdit * edit, long x_key, int *cmd, int *ch);
int edit_get_byte (WEdit * edit, long byte_index);
int edit_get_utf (WEdit * edit, long byte_index, int *char_width);

13
src/editor/edit.c
View File

@ -61,7 +61,6 @@
#include "lib/charsets.h" /* get_codepage_id */
#endif
#include "src/filemanager/cmd.h" /* view_other_cmd() */
#include "src/filemanager/usermenu.h" /* user_menu_cmd() */
#include "src/setup.h" /* option_tab_spacing */
@ -4128,18 +4127,9 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
case CK_Refresh:
edit_refresh_cmd (edit);
break;
case CK_SaveSetup:
save_setup_cmd ();
break;
case CK_LearnKeys:
learn_keys ();
break;
case CK_Options:
edit_options_dialog (edit);
break;
case CK_OptionsSaveMode:
menu_save_mode_cmd ();
break;
case CK_Date:
{
char s[BUF_MEDIUM];
@ -4178,9 +4168,6 @@ edit_execute_cmd (WEdit * edit, unsigned long command, int char_for_insertion)
case CK_Mail:
edit_mail_dialog (edit);
break;
case CK_Shell:
view_other_cmd ();
break;
#ifdef HAVE_CHARSET
case CK_SelectCodepage:
edit_select_codepage_cmd (edit);

2
src/editor/editcmd.c
View File

@ -1562,7 +1562,7 @@ edit_refresh_cmd (WEdit * edit)
/* --------------------------------------------------------------------------------------------- */
void
menu_save_mode_cmd (void)
edit_save_mode_cmd (void)
{
/* diaog sizes */
const int DLG_X = 38;

14
src/editor/editwidget.c
View File

@ -56,6 +56,8 @@
#include "src/keybind-defaults.h"
#include "src/main.h" /* home_dir */
#include "src/filemanager/cmd.h" /* view_other_cmd(), save_setup_cmd() */
#include "src/learn.h" /* learn_keys() */
#include "edit-impl.h"
#include "editwidget.h"
@ -501,11 +503,23 @@ edit_dialog_command_execute (Dlg_head * h, unsigned long command)
case CK_About:
edit_about ();
break;
case CK_Shell:
view_other_cmd ();
break;
case CK_LearnKeys:
learn_keys ();
break;
case CK_WindowMove:
case CK_WindowResize:
if (edit_widget_is_editor ((Widget *) h->current->data))
edit_handle_move_resize ((WEdit *) h->current->data, command);
break;
case CK_OptionsSaveMode:
edit_save_mode_cmd ();
break;
case CK_SaveSetup:
save_setup_cmd ();
break;
default:
ret = MSG_NOT_HANDLED;
break;