git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/4] git-gui: search and linenumber input are mutual exclusive in the blame view

From
Pat Thoyts <patthoyts@users.sourceforge.net>
Date
Oct 15, 2011, 22:22 UTC
Message-ID
<877h45ki95.fsf@fox.patthoyts.tk>
In-Reply-To
<1d1c91fdaa0bfd31067fd2e06f3f1ecf5597b8d3.1318513492.git.bert.wesarg@googlemail.com>
Bert Wesarg <bert.wesarg@googlemail.com> writes:
Show 59 quoted lines
>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
Previous: Bert Wesarg
Message 10 of 10 in “git-gui: search and linenumber input are mutual exclusive in the blame view”
  1. 1/4 git-gui: search and linenumber input are mutual exclusive in the blame viewBert Wesarg, Oct 13, 2011
  2. 2/4 git-gui: clear the goto line input when hidingBert Wesarg, Oct 13, 2011
  3. 3/4 git-gui: only except numbers in the goto-line inputBert Wesarg, Oct 13, 2011
  4. 4/4 git-gui: incremental goto line in blame viewBert Wesarg, Oct 13, 2011
  5. Pat ThoytsOct 15, 2011
  6. Pat ThoytsOct 15, 2011
  7. Bert WesargOct 16, 2011
  8. Pat ThoytsOct 15, 2011
  9. Bert WesargOct 16, 2011
  10. Pat ThoytsOct 15, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.