From 729ffa50f75a025935623bfc58d0932c65f7de2f Mon Sep 17 00:00:00 2001 From: Michele Ballabio Date: Fri, 4 Apr 2008 23:04:42 +0200 Subject: [PATCH] git-gui: use +/- instead of ]/[ to show more/less context in diff On some systems, brackets cannot be used as event details (they don't have a keysym), so use +/- instead (both on keyboard and keypad) and add ctrl-= as a synonym of ctrl-+ for convenience. [sp: Had to change accelerator to show only "$M1T-="; the original version included "$M1T-+ $M1T-=" but this is not drawn at all on Mac OS X.] Signed-off-by: Michele Ballabio Signed-off-by: Shawn O. Pearce --- git-gui.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index 748efcc..7c25bb9 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2064,11 +2064,11 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} { .mbar.commit add command -label [mc "Show Less Context"] \ -command show_less_context \ - -accelerator $M1T-\[ + -accelerator $M1T-\- .mbar.commit add command -label [mc "Show More Context"] \ -command show_more_context \ - -accelerator $M1T-\] + -accelerator $M1T-= .mbar.commit add separator @@ -2715,8 +2715,11 @@ bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break} bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break} bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break} bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break} -bind $ui_comm <$M1B-Key-bracketleft> {show_less_context;break} -bind $ui_comm <$M1B-Key-bracketright> {show_more_context;break} +bind $ui_comm <$M1B-Key-minus> {show_less_context;break} +bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break} +bind $ui_comm <$M1B-Key-equal> {show_more_context;break} +bind $ui_comm <$M1B-Key-plus> {show_more_context;break} +bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break} bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break} bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break} @@ -2760,8 +2763,11 @@ bind . <$M1B-Key-t> do_add_selection bind . <$M1B-Key-T> do_add_selection bind . <$M1B-Key-i> do_add_all bind . <$M1B-Key-I> do_add_all -bind . <$M1B-Key-bracketleft> {show_less_context;break} -bind . <$M1B-Key-bracketright> {show_more_context;break} +bind . <$M1B-Key-minus> {show_less_context;break} +bind . <$M1B-Key-KP_Subtract> {show_less_context;break} +bind . <$M1B-Key-equal> {show_more_context;break} +bind . <$M1B-Key-plus> {show_more_context;break} +bind . <$M1B-Key-KP_Add> {show_more_context;break} bind . <$M1B-Key-Return> do_commit foreach i [list $ui_index $ui_workdir] { bind $i "toggle_or_diff $i %x %y; break" -- 2.11.4.GIT