212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
|
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
|
-
-
-
+
+
+
|
if {[file exists $::diff($top,rightFile)] && \
$::diff($top,rightFile) eq $::diff($top,rightLabel)} {
lappend buttons Right
append text "\nRight: $::diff($top,rightFile)"
}
lappend buttons Browse Cancel
if {[llength $buttons] > 2} {
set apa [eval tk_dialog .savemerge {"Save merge file"} \
\$text \
questhead -1 $buttons]
set apa [tk_dialog .savemerge "Save merge file" \
$text \
questhead -1 {*}$buttons]
if {$apa < 0} return
set apa [lindex $buttons $apa]
if {$apa eq "Left"} {
set ::diff($top,mergeFile) $::diff($top,leftFile)
} elseif {$apa eq "Right"} {
set ::diff($top,mergeFile) $::diff($top,rightFile)
} elseif {$apa eq "Cancel"} {
|
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
|
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
|
-
+
|
# Create a window to display merge result.
proc makeMergeWin {top} {
set w $top.merge
if {![winfo exists $w]} {
toplevel $w
} else {
eval destroy [winfo children $w]
destroy {*}[winfo children $w]
}
wm title $w "Merge result"
ttk::frame $w.f
ttk::radiobutton $w.f.rb1 -text "LR" -value 12 \
|