mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Cleanup bindings within merge dialog

Browse Source 
Misc. code cleanups in the merge dialog's binding setup and action
button creation.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce
2007-07-25 04:32:18 -04:00
parent 350a35f0a1
commit 9feefbd2d2
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/merge.tcl
View File

@ -125,7 +125,6 @@ constructor dialog {} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]" wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
} }
set _visualize [cb _visualize]
set _start [cb _start] set _start [cb _start]
label $w.header \ label $w.header \
@ -134,10 +133,14 @@ constructor dialog {} {
pack $w.header -side top -fill x pack $w.header -side top -fill x
frame $w.buttons frame $w.buttons
button $w.buttons.visualize -text Visualize -command $_visualize button $w.buttons.visualize \
-text Visualize \
-command [cb _visualize]
pack $w.buttons.visualize -side left pack $w.buttons.visualize -side left
button $w.buttons.create -text Merge -command $_start button $w.buttons.merge \
pack $w.buttons.create -side right -text Merge \
-command $_start
pack $w.buttons.merge -side right
button $w.buttons.cancel \ button $w.buttons.cancel \
-text {Cancel} \ -text {Cancel} \
-command [cb _cancel] -command [cb _cancel]
@ -149,9 +152,10 @@ constructor dialog {} {
bind $w <$M1B-Key-Return> $_start bind $w <$M1B-Key-Return> $_start
bind $w <Key-Return> $_start bind $w <Key-Return> $_start
bind $w <Visibility> [cb _visible]
bind $w <Key-Escape> [cb _cancel] bind $w <Key-Escape> [cb _cancel]
wm protocol $w WM_DELETE_WINDOW [cb _cancel] wm protocol $w WM_DELETE_WINDOW [cb _cancel]
bind $w.buttons.merge <Visibility> [cb _visible]
tkwait window $w tkwait window $w
} }