From 93247568d0622d81cd70d0f3eb362098ce502749 Mon Sep 17 00:00:00 2001 From: Ilia Maslakov Date: Sun, 18 Apr 2010 10:19:03 +0000 Subject: [PATCH] added diff options dialog Signed-off-by: Ilia Maslakov --- misc/mc.keymap.default | 1 + misc/mc.keymap.emacs | 1 + src/cmddef.h | 1 + src/diffviewer/ydiff.c | 8 +++++--- src/keybind.c | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/misc/mc.keymap.default b/misc/mc.keymap.default index 60252515d..18dc9155d 100644 --- a/misc/mc.keymap.default +++ b/misc/mc.keymap.default @@ -381,6 +381,7 @@ DiffEditOther = f14 DiffMergeCurrentHunk = f5 DiffSearch = f7 DiffContinueSearch = f17 +DiffOptions = f9 DiffBOF = ctrl-home DiffEOF = ctrl-end DiffDown = down diff --git a/misc/mc.keymap.emacs b/misc/mc.keymap.emacs index 2417338a6..43f810ec9 100644 --- a/misc/mc.keymap.emacs +++ b/misc/mc.keymap.emacs @@ -385,6 +385,7 @@ DiffEditOther = f14 DiffMergeCurrentHunk = f5 DiffSearch = f7 DiffContinueSearch = f17 +DiffOptions = f9 DiffBOF = ctrl-home DiffEOF = ctrl-end DiffDown = down diff --git a/src/cmddef.h b/src/cmddef.h index 7cd9952d5..2885e88d1 100644 --- a/src/cmddef.h +++ b/src/cmddef.h @@ -447,6 +447,7 @@ #define CK_DiffMergeCurrentHunk 9035 #define CK_DiffSave 9036 #define CK_DiffContinueSearch 9037 +#define CK_DiffOptions 9038 /* Process a block through a shell command: CK_Pipe_Block(i) executes shell_cmd[i]. diff --git a/src/diffviewer/ydiff.c b/src/diffviewer/ydiff.c index f0b3056a5..b07e152c1 100644 --- a/src/diffviewer/ydiff.c +++ b/src/diffviewer/ydiff.c @@ -2387,9 +2387,8 @@ dview_reread (WDiff * dview) } /* --------------------------------------------------------------------------------------------- */ -#if 0 static void -dview_reinit (WDiff * dview) +dview_diff_options (WDiff * dview) { const char *quality_str[] = { N_("&Normal"), @@ -2430,7 +2429,6 @@ dview_reinit (WDiff * dview) dview_reread (dview); } } -#endif /* --------------------------------------------------------------------------------------------- */ static void @@ -2801,6 +2799,7 @@ dview_labels (WDiff * dview) buttonbar_set_label (b, 4, Q_ ("ButtonBar|Edit"), diff_map, (Widget *) dview); buttonbar_set_label (b, 5, Q_ ("ButtonBar|Merge"), diff_map, (Widget *) dview); buttonbar_set_label (b, 7, Q_ ("ButtonBar|Search"), diff_map, (Widget *) dview); + buttonbar_set_label (b, 9, Q_ ("ButtonBar|Options"), diff_map, (Widget *) dview); buttonbar_set_label (b, 10, Q_ ("ButtonBar|Quit"), diff_map, (Widget *) dview); } @@ -3069,6 +3068,9 @@ dview_execute_cmd (WDiff * dview, unsigned long command) case CK_DiffSave: dview_do_save (dview); break; + case CK_DiffOptions: + dview_diff_options (dview); + break; case CK_SelectCodepage: dview_select_encoding (dview); dview_reread (dview); diff --git a/src/keybind.c b/src/keybind.c index 58aaf19e3..9e2895f23 100644 --- a/src/keybind.c +++ b/src/keybind.c @@ -484,6 +484,7 @@ static name_keymap_t command_names[] = { { "SelectCodepage", CK_SelectCodepage}, { "DiffMergeCurrentHunk", CK_DiffMergeCurrentHunk}, { "DiffSave", CK_DiffSave}, + { "DiffOptions", CK_DiffOptions}, { NULL, CK_Ignore_Key } }; @@ -992,6 +993,7 @@ const global_keymap_t default_diff_keymap[] = { { KEY_F (5), CK_DiffMergeCurrentHunk, "F5" }, { KEY_F (7), CK_DiffSearch, "F7" }, { KEY_F (17), CK_DiffContinueSearch, "S-F7" }, + { KEY_F (9), CK_DiffOptions, "F9" }, { KEY_F (10), CK_DiffQuit, "F10" }, { KEY_F (14), CK_DiffEditOther, "S-F4" },