270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
|
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
|
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
|
toplevel $w
} else {
eval destroy [winfo children $w]
}
wm title $w "Merge result"
frame $w.f
ttk::frame $w.f
radiobutton $w.f.rb1 -text "LR" -value 12 \
ttk::radiobutton $w.f.rb1 -text "LR" -value 12 \
-variable diff($top,curMergeSel) \
-command "selectMerge $top"
radiobutton $w.f.rb2 -text "L" -value 1 \
ttk::radiobutton $w.f.rb2 -text "L" -value 1 \
-variable diff($top,curMergeSel) \
-command "selectMerge $top"
radiobutton $w.f.rb3 -text "R" -value 2 \
ttk::radiobutton $w.f.rb3 -text "R" -value 2 \
-variable diff($top,curMergeSel) \
-command "selectMerge $top"
radiobutton $w.f.rb4 -text "RL" -value 21 \
ttk::radiobutton $w.f.rb4 -text "RL" -value 21 \
-variable diff($top,curMergeSel) \
-command "selectMerge $top"
bind $w <Key-Left> "focus $w; set diff($top,curMergeSel) 1; selectMerge $top"
bind $w <Key-Right> "focus $w; set diff($top,curMergeSel) 2; selectMerge $top"
button $w.f.bl -text "All L" -command "selectMergeAll $top 1"
button $w.f.br -text "All R" -command "selectMergeAll $top 2"
button $w.f.b1 -text "Prev" -command "nextMerge $top -1"
button $w.f.b2 -text "Next" -command "nextMerge $top 1"
ttk::button $w.f.bl -text "All L" -command "selectMergeAll $top 1"
ttk::button $w.f.br -text "All R" -command "selectMergeAll $top 2"
ttk::button $w.f.b1 -text "Prev" -command "nextMerge $top -1"
ttk::button $w.f.b2 -text "Next" -command "nextMerge $top 1"
bind $w <Key-Down> "focus $w ; nextMerge $top 1"
bind $w <Key-Up> "focus $w ; nextMerge $top -1"
bind $w <Shift-Key-Down> "focus $w ; nextMerge $top 10"
bind $w <Shift-Key-Up> "focus $w ; nextMerge $top -10"
button $w.f.bs -text "Save" -command "saveMerge $top"
button $w.f.bq -text "Close" -command "closeMerge $top"
ttk::button $w.f.bs -text "Save" -command "saveMerge $top"
ttk::button $w.f.bq -text "Close" -command "closeMerge $top"
wm protocol $w WM_DELETE_WINDOW "closeMerge $top"
grid $w.f.rb1 $w.f.rb2 $w.f.rb3 $w.f.rb4 x $w.f.b1 $w.f.b2 x \
$w.f.bl $w.f.br x x x $w.f.bs $w.f.bq -sticky we -padx 1
grid columnconfigure $w.f {4 7 10 12} -minsize 10
grid columnconfigure $w.f 10 -weight 1
grid columnconfigure $w.f {0 1 2 3} -uniform a
grid columnconfigure $w.f {5 6 8 9} -uniform b
grid columnconfigure $w.f {11 13 14} -uniform c
if {$::diff($top,mode) eq "conflict"} {
checkbutton $w.f.bm -text "Pure" -variable diff($top,modetype) \
ttk::checkbutton $w.f.bm -text "Pure" -variable diff($top,modetype) \
-onvalue "Pure" -offvalue "" -command {doDiff}
grid $w.f.bm -row 0 -column 11
}
text $w.t -width 80 -height 20 -xscrollcommand "$w.sbx set" \
-yscrollcommand "$w.sby set" -font myfont
scrollbar $w.sbx -orient horizontal -command "$w.t xview"
|