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

added diff options dialog

Browse Source 
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
This commit is contained in:
Ilia Maslakov 2010-04-18 10:19:03 +00:00
parent 185a6f67f7
commit 93247568d0
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
misc/mc.keymap.default
View File

@ -381,6 +381,7 @@ DiffEditOther = f14
DiffMergeCurrentHunk = f5 DiffMergeCurrentHunk = f5
DiffSearch = f7 DiffSearch = f7
DiffContinueSearch = f17 DiffContinueSearch = f17
DiffOptions = f9
DiffBOF = ctrl-home DiffBOF = ctrl-home
DiffEOF = ctrl-end DiffEOF = ctrl-end
DiffDown = down DiffDown = down

1
misc/mc.keymap.emacs
View File

@ -385,6 +385,7 @@ DiffEditOther = f14
DiffMergeCurrentHunk = f5 DiffMergeCurrentHunk = f5
DiffSearch = f7 DiffSearch = f7
DiffContinueSearch = f17 DiffContinueSearch = f17
DiffOptions = f9
DiffBOF = ctrl-home DiffBOF = ctrl-home
DiffEOF = ctrl-end DiffEOF = ctrl-end
DiffDown = down DiffDown = down

1
src/cmddef.h
View File

@ -447,6 +447,7 @@
#define CK_DiffMergeCurrentHunk 9035 #define CK_DiffMergeCurrentHunk 9035
#define CK_DiffSave 9036 #define CK_DiffSave 9036
#define CK_DiffContinueSearch 9037 #define CK_DiffContinueSearch 9037
#define CK_DiffOptions 9038
/* /*
Process a block through a shell command: CK_Pipe_Block(i) executes shell_cmd[i]. Process a block through a shell command: CK_Pipe_Block(i) executes shell_cmd[i].

8
src/diffviewer/ydiff.c
View File

@ -2387,9 +2387,8 @@ dview_reread (WDiff * dview)
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
#if 0
static void static void
dview_reinit (WDiff * dview) dview_diff_options (WDiff * dview)
{ {
const char *quality_str[] = { const char *quality_str[] = {
N_("&Normal"), N_("&Normal"),
@ -2430,7 +2429,6 @@ dview_reinit (WDiff * dview)
dview_reread (dview); dview_reread (dview);
} }
} }
#endif
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static void 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, 4, Q_ ("ButtonBar|Edit"), diff_map, (Widget *) dview);
buttonbar_set_label (b, 5, Q_ ("ButtonBar|Merge"), 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, 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); 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: case CK_DiffSave:
dview_do_save (dview); dview_do_save (dview);
break; break;
case CK_DiffOptions:
dview_diff_options (dview);
break;
case CK_SelectCodepage: case CK_SelectCodepage:
dview_select_encoding (dview); dview_select_encoding (dview);
dview_reread (dview); dview_reread (dview);

2
src/keybind.c
View File

@ -484,6 +484,7 @@ static name_keymap_t command_names[] = {
{ "SelectCodepage", CK_SelectCodepage}, { "SelectCodepage", CK_SelectCodepage},
{ "DiffMergeCurrentHunk", CK_DiffMergeCurrentHunk}, { "DiffMergeCurrentHunk", CK_DiffMergeCurrentHunk},
{ "DiffSave", CK_DiffSave}, { "DiffSave", CK_DiffSave},
{ "DiffOptions", CK_DiffOptions},
{ NULL, CK_Ignore_Key } { NULL, CK_Ignore_Key }
}; };
@ -992,6 +993,7 @@ const global_keymap_t default_diff_keymap[] = {
{ KEY_F (5), CK_DiffMergeCurrentHunk, "F5" }, { KEY_F (5), CK_DiffMergeCurrentHunk, "F5" },
{ KEY_F (7), CK_DiffSearch, "F7" }, { KEY_F (7), CK_DiffSearch, "F7" },
{ KEY_F (17), CK_DiffContinueSearch, "S-F7" }, { KEY_F (17), CK_DiffContinueSearch, "S-F7" },
{ KEY_F (9), CK_DiffOptions, "F9" },
{ KEY_F (10), CK_DiffQuit, "F10" }, { KEY_F (10), CK_DiffQuit, "F10" },
{ KEY_F (14), CK_DiffEditOther, "S-F4" }, { KEY_F (14), CK_DiffEditOther, "S-F4" },