︙ | | | ︙ | |
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
|
cleanupFiles $top
if {$::diff($top,mode) eq "conflict"} {
if {$::widgets($top,eqLabel) != "="} {
makeMergeWin $top
}
}
if {$::diff($top,printFile) ne ""} {
if {$::diff($top,printMode) eq "PS"} {
after idle "doPrint $top 1 ; cleanupAndExit all"
} else {
after idle "doPrint2 $top 1 ; cleanupAndExit all"
}
}
}
# This is the entrypoint to do a diff via DDE or Send
proc remoteDiff {file1 file2} {
newDiff $file1 $file2
}
|
<
|
<
<
<
|
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
|
cleanupFiles $top
if {$::diff($top,mode) eq "conflict"} {
if {$::widgets($top,eqLabel) != "="} {
makeMergeWin $top
}
}
if {$::diff($top,printFile) ne ""} {
after idle "doPrint $top 1 ; cleanupAndExit all"
}
}
# This is the entrypoint to do a diff via DDE or Send
proc remoteDiff {file1 file2} {
newDiff $file1 $file2
}
|
︙ | | | ︙ | |
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
|
# Fill in default data for a diff window
proc initDiffData {top} {
set ::diff($top,leftOK) 0
set ::diff($top,rightOK) 0
set ::diff($top,mode) ""
set ::diff($top,printFile) ""
set ::diff($top,printMode) "PDF"
set ::diff($top,mergeFile) ""
set ::diff($top,conflictFile) ""
set ::diff($top,limitlines) 0
set ::diff($top,plugin) ""
}
# Create a new diff window and diff two files
|
<
|
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
|
# Fill in default data for a diff window
proc initDiffData {top} {
set ::diff($top,leftOK) 0
set ::diff($top,rightOK) 0
set ::diff($top,mode) ""
set ::diff($top,printFile) ""
set ::diff($top,mergeFile) ""
set ::diff($top,conflictFile) ""
set ::diff($top,limitlines) 0
set ::diff($top,plugin) ""
}
# Create a new diff window and diff two files
|
︙ | | | ︙ | |
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
|
$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..." \
-command [list doPrint $top]
$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}
|
|
<
<
|
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
|
$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 Pdf..." -underline 0 \
-command [list doPrint $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}
|
︙ | | | ︙ | |
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
|
-conflict : Treat file as a merge conflict file and enter merge
mode.
-o <file> : Specify merge result output file.
-browse : Automatically bring up file dialog after starting.
-server : Set up Eskil to be controllable from the outside.
-printps <file> : Generate postscript and exit.
-printpdf <file> : Generate pdf and exit.
-plugin <plugin> : Use plugin
-plugininfo <info> : Pass info to plugin (plugin specific)
-plugindump <plugin> : Dump plugin source to stdout
-limit <lines> : Do not process more than <lines> lines.
|
<
|
|
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
|
-conflict : Treat file as a merge conflict file and enter merge
mode.
-o <file> : Specify merge result output file.
-browse : Automatically bring up file dialog after starting.
-server : Set up Eskil to be controllable from the outside.
-print <file> : Generate pdf and exit.
-plugin <plugin> : Use plugin
-plugininfo <info> : Pass info to plugin (plugin specific)
-plugindump <plugin> : Dump plugin source to stdout
-limit <lines> : Do not process more than <lines> lines.
|
︙ | | | ︙ | |
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
|
makeDiffWin
return
}
set allOpts {
-w --help -help -b -noignore -i -nocase -nodigit -nokeyword -prefix
-noparse -line -smallblock -block -char -word -limit -nodiff -dir
-clip -patch -browse -conflict -print -printps -printpdf
-server -o -r -context -cvs -svn -review
-foreach -preprocess -close -nonewline -plugin -plugininfo
-plugindump
}
# If the first option is "--query", use it to ask about options.
if {$::eskil(argc) == 2 && [lindex $::eskil(argv) 0] == "--query"} {
|
|
|
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
|
makeDiffWin
return
}
set allOpts {
-w --help -help -b -noignore -i -nocase -nodigit -nokeyword -prefix
-noparse -line -smallblock -block -char -word -limit -nodiff -dir
-clip -patch -browse -conflict -print
-server -o -r -context -cvs -svn -review
-foreach -preprocess -close -nonewline -plugin -plugininfo
-plugindump
}
# If the first option is "--query", use it to ask about options.
if {$::eskil(argc) == 2 && [lindex $::eskil(argv) 0] == "--query"} {
|
︙ | | | ︙ | |
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
|
set ::eskil(ignorenewline) 1
} elseif {$arg eq "-nonewline+"} {
set ::eskil(ignorenewline) 2
} elseif {$arg eq "-close"} {
set ::eskil(autoclose) 1
} elseif {$arg eq "-conflict"} {
set opts(mode) "conflict"
} elseif {$arg eq "-print" || $arg eq "-printps"} {
set nextArg printFile
} elseif {$arg eq "-printpdf"} {
set nextArg printFile
set opts(printMode) "PDF"
} elseif {$arg eq "-server"} {
if {$::tcl_platform(platform) eq "windows"} {
catch {
package require dde
dde servername Eskil
}
} else {
|
|
<
<
<
|
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
|
set ::eskil(ignorenewline) 1
} elseif {$arg eq "-nonewline+"} {
set ::eskil(ignorenewline) 2
} elseif {$arg eq "-close"} {
set ::eskil(autoclose) 1
} elseif {$arg eq "-conflict"} {
set opts(mode) "conflict"
} elseif {$arg eq "-print" || $arg eq "-printpdf"} {
set nextArg printFile
} elseif {$arg eq "-server"} {
if {$::tcl_platform(platform) eq "windows"} {
catch {
package require dde
dde servername Eskil
}
} else {
|
︙ | | | ︙ | |
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
|
set Pref(lines) 60
set Pref(editor) ""
set Pref(regsub) {}
set Pref(toolbar) 0
set Pref(wideMap) 0 ;# Not settable in GUI yet
# 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.7 0.7"
set Pref(printColorNew1) "0.7 1.0 0.7"
set Pref(printColorNew2) "0.8 0.8 1.0"
|
<
<
<
|
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
|
set Pref(lines) 60
set Pref(editor) ""
set Pref(regsub) {}
set Pref(toolbar) 0
set Pref(wideMap) 0 ;# Not settable in GUI yet
# Print options
set Pref(printHeaderSize) 10
set Pref(printCharsPerLine) 80
set Pref(printPaper) a4
set Pref(printColorChange) "1.0 0.7 0.7"
set Pref(printColorNew1) "0.7 1.0 0.7"
set Pref(printColorNew2) "0.8 0.8 1.0"
|
︙ | | | ︙ | |