@matheusbsbs / matheus-bagliano / commits / 9feefbd2d2
Fork 0

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>

Shawn O. Pearce committed Jul 25, 2007 at 04:32 UTC 9feefbd2d285f9af629cff9075eff06cf33d9de9
1 file changed +9 -5
lib/merge.tcl
+9 -5
@@ -125,7 +125,6 @@ constructor dialog {} {
125 wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
126 }
127
128 - set _visualize [cb _visualize]
128 set _start [cb _start]
129
130 label $w.header \
@@ -134,10 +133,14 @@ constructor dialog {} {
133 pack $w.header -side top -fill x
134
135 frame $w.buttons
137 - button $w.buttons.visualize -text Visualize -command $_visualize
136 + button $w.buttons.visualize \
137 + -text Visualize \
138 + -command [cb _visualize]
139 pack $w.buttons.visualize -side left
139 - button $w.buttons.create -text Merge -command $_start
140 - pack $w.buttons.create -side right
140 + button $w.buttons.merge \
141 + -text Merge \
142 + -command $_start
143 + pack $w.buttons.merge -side right
144 button $w.buttons.cancel \
145 -text {Cancel} \
146 -command [cb _cancel]
@@ -149,9 +152,10 @@ constructor dialog {} {
152
153 bind $w <$M1B-Key-Return> $_start
154 bind $w <Key-Return> $_start
152 - bind $w <Visibility> [cb _visible]
155 bind $w <Key-Escape> [cb _cancel]
156 wm protocol $w WM_DELETE_WINDOW [cb _cancel]
157 +
158 + bind $w.buttons.merge <Visibility> [cb _visible]
159 tkwait window $w
160 }
161