diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-07-25 04:32:18 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-25 04:32:18 -0400 |
| commit | 9feefbd2d285f9af629cff9075eff06cf33d9de9 (patch) | |
| tree | 568ae3cb0319a80bd6956aba898e87bae82082cb /lib | |
| parent | git-gui: Replace merge dialog with our revision picker widget (diff) | |
| download | tgif-9feefbd2d285f9af629cff9075eff06cf33d9de9.tar.xz | |
git-gui: Cleanup bindings within merge dialog
Misc. code cleanups in the merge dialog's binding setup and action
button creation.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/merge.tcl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index f8d92b320e..62434ff310 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -125,7 +125,6 @@ constructor dialog {} { wm geometry $top "+[winfo rootx .]+[winfo rooty .]" } - set _visualize [cb _visualize] set _start [cb _start] label $w.header \ @@ -134,10 +133,14 @@ constructor dialog {} { pack $w.header -side top -fill x 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 - button $w.buttons.create -text Merge -command $_start - pack $w.buttons.create -side right + button $w.buttons.merge \ + -text Merge \ + -command $_start + pack $w.buttons.merge -side right button $w.buttons.cancel \ -text {Cancel} \ -command [cb _cancel] @@ -149,9 +152,10 @@ constructor dialog {} { bind $w <$M1B-Key-Return> $_start bind $w <Key-Return> $_start - bind $w <Visibility> [cb _visible] bind $w <Key-Escape> [cb _cancel] wm protocol $w WM_DELETE_WINDOW [cb _cancel] + + bind $w.buttons.merge <Visibility> [cb _visible] tkwait window $w } |