From: Pat Thoyts <patthoyts@users.sourceforge.net>
To: Bert Wesarg <bert.wesarg@googlemail.com>
Cc: David Fries <David@Fries.net>, git@vger.kernel.org
Subject: Re: [PATCH 1/4] git-gui: search and linenumber input are mutual exclusive in the blame view
Date: Sat, 15 Oct 2011 23:22:14 +0100 [thread overview]
Message-ID: <877h45ki95.fsf@fox.patthoyts.tk> (raw)
In-Reply-To: <1d1c91fdaa0bfd31067fd2e06f3f1ecf5597b8d3.1318513492.git.bert.wesarg@googlemail.com> (Bert Wesarg's message of "Thu, 13 Oct 2011 15:48:12 +0200")
Bert Wesarg <bert.wesarg@googlemail.com> writes:
>It was possible to open the search input (Ctrl+S) and the goto-line input
>(Ctrl+G) at the same time. Prevent this.
>
>Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
>---
> lib/blame.tcl | 22 ++++++++++++++++------
> 1 files changed, 16 insertions(+), 6 deletions(-)
>
>diff --git a/lib/blame.tcl b/lib/blame.tcl
>index 2099776..691941e 100644
>--- a/lib/blame.tcl
>+++ b/lib/blame.tcl
>@@ -280,11 +280,11 @@ constructor new {i_commit i_path i_jump} {
> $w.ctxm add command \
> -label [mc "Find Text..."] \
> -accelerator F7 \
>- -command [list searchbar::show $finder]
>+ -command [cb _show_finder]
> $w.ctxm add command \
> -label [mc "Goto Line..."] \
> -accelerator "Ctrl-G" \
>- -command [list linebar::show $gotoline]
>+ -command [cb _show_linebar]
> menu $w.ctxm.enc
> build_encoding_menu $w.ctxm.enc [cb _setencoding]
> $w.ctxm add cascade \
>@@ -351,13 +351,13 @@ constructor new {i_commit i_path i_jump} {
> bind $w_cviewer <Tab> "[list focus $w_file];break"
> bind $w_cviewer <Button-1> [list focus $w_cviewer]
> bind $w_file <Visibility> [cb _focus_search $w_file]
>- bind $top <F7> [list searchbar::show $finder]
>- bind $top <Key-slash> [list searchbar::show $finder]
>- bind $top <Control-Key-s> [list searchbar::show $finder]
>+ bind $top <F7> [cb _show_finder]
>+ bind $top <Key-slash> [cb _show_finder]
>+ bind $top <Control-Key-s> [cb _show_finder]
> bind $top <Escape> [list searchbar::hide $finder]
> bind $top <F3> [list searchbar::find_next $finder]
> bind $top <Shift-F3> [list searchbar::find_prev $finder]
>- bind $top <Control-Key-g> [list linebar::show $gotoline]
>+ bind $top <Control-Key-g> [cb _show_linebar]
> catch { bind $top <Shift-Key-XF86_Switch_VT_3> [list searchbar::find_prev $finder] }
>
> grid configure $w.header -sticky ew
>@@ -1349,4 +1349,14 @@ method _resize {new_height} {
> set old_height $new_height
> }
>
>+method _show_finder {} {
>+ linebar::hide $gotoline
>+ searchbar::show $finder
>+}
>+
>+method _show_linebar {} {
>+ searchbar::hide $finder
>+ linebar::show $gotoline
>+}
>+
> }
Looks good. Will apply.
--
Pat Thoyts http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD
prev parent reply other threads:[~2011-10-15 22:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-13 13:48 [PATCH 1/4] git-gui: search and linenumber input are mutual exclusive in the blame view Bert Wesarg
2011-10-13 13:48 ` [PATCH 2/4] git-gui: clear the goto line input when hiding Bert Wesarg
2011-10-15 22:20 ` Pat Thoyts
2011-10-16 10:29 ` Bert Wesarg
2011-10-13 13:48 ` [PATCH 3/4] git-gui: only except numbers in the goto-line input Bert Wesarg
2011-10-15 22:17 ` Pat Thoyts
2011-10-16 10:32 ` Bert Wesarg
2011-10-13 13:48 ` [RFC/PATCH 4/4] git-gui: incremental goto line in blame view Bert Wesarg
2011-10-15 22:26 ` Pat Thoyts
2011-10-15 22:22 ` Pat Thoyts [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877h45ki95.fsf@fox.patthoyts.tk \
--to=patthoyts@users.sourceforge.net \
--cc=David@Fries.net \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.