35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
-
+
|
# Stop Tk from meddling with the command line by copying it first.
set ::eskil(argv) $::argv
set ::eskil(argc) $::argc
set ::argv {}
set ::argc 0
set debug 0
set diffver "Version 2.4b2 2008-03-04"
set diffver "Version 2.4b2 2008-04-09"
set ::thisScript [file join [pwd] [info script]]
# Do initalisations for needed packages and globals.
# This is not run until needed to speed up command line error reporting.
proc Init {} {
package require Tk 8.4
catch {package require textSearch}
|
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
|
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
|
-
+
-
+
|
$top.m.mf add command -label "Open Conflict File..." \
-command [list openConflict $top]
$top.m.mf add command -label "Open Patch File..." \
-command [list openPatch $top]
$top.m.mf add command -label "Revision Diff..." -underline 0 \
-command [list openRev $top]
$top.m.mf add separator
$top.m.mf add command -label "Print Ps..." -underline 0 \
$top.m.mf add command -label "Print Ps..." \
-command [list doPrint $top]
$top.m.mf add command -label "Print Pdf..." \
$top.m.mf add command -label "Print Pdf..." -underline 0 \
-command [list doPrint2 $top]
$top.m.mf add separator
$top.m.mf add command -label "Close" -underline 0 \
-command [list cleanupAndExit $top]
$top.m.mf add separator
$top.m.mf add command -label "Quit" -underline 0 \
-command {cleanupAndExit all}
|
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
|
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
|
+
+
+
|
# Print options
set Pref(grayLevel1) 0.6
set Pref(grayLevel2) 0.8
set Pref(wideLines) 0
set Pref(printHeaderSize) 10
set Pref(printCharsPerLine) 80
set Pref(printPaper) a4
set Pref(printColorChange) "1.0 0.6 0.6"
set Pref(printColorNew1) "0.6 1.0 0.6"
set Pref(printColorNew2) "0.6 0.6 1.0"
# Directory diff options
set Pref(dir,comparelevel) 1
set Pref(dir,ignorekey) 0
set Pref(dir,incfiles) ""
set Pref(dir,exfiles) "*.o"
set Pref(dir,incdirs) ""
|