git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/4] git-gui: search and linenumber input are mutual exclusive in the blame view
@ 2011-10-13 13:48 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:22 ` [PATCH 1/4] git-gui: search and linenumber input are mutual exclusive in the blame view Pat Thoyts
  0 siblings, 2 replies; 10+ messages in thread
From: Bert Wesarg @ 2011-10-13 13:48 UTC (permalink / raw)
  To: Pat Thoyts; +Cc: David Fries, git, Bert Wesarg

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
+}
+
 }
-- 
1.7.6.789.gb4599

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2011-10-16 10:32 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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-13 13:48   ` [PATCH 3/4] git-gui: only except numbers in the goto-line input 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:17     ` [PATCH 3/4] git-gui: only except numbers in the goto-line input Pat Thoyts
2011-10-16 10:32       ` Bert Wesarg
2011-10-15 22:20   ` [PATCH 2/4] git-gui: clear the goto line input when hiding Pat Thoyts
2011-10-16 10:29     ` Bert Wesarg
2011-10-15 22:22 ` [PATCH 1/4] git-gui: search and linenumber input are mutual exclusive in the blame view Pat Thoyts

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).