Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Made Redo Diff restore the view. Improved the look of Doc window a bit. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
14d984e4a6557ef505ff8716d7868d5e |
User & Date: | peter 2004-08-17 19:46:43.000 |
Context
2004-08-17
| ||
19:48 | Added markup. check-in: 86aeb8f0a3 user: peter tags: trunk | |
19:46 | Made Redo Diff restore the view. Improved the look of Doc window a bit. check-in: 14d984e4a6 user: peter tags: trunk | |
2004-08-16
| ||
20:14 | Typo fix. check-in: a83257241f user: peter tags: trunk | |
Changes
Changes to src/eskil.tcl.
︙ | ︙ | |||
47 48 49 50 51 52 53 | # Add a dummy if it does not exist. proc addBalloon {args} {} } else { namespace import -force psballoon::addBalloon } set debug 0 | | | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | # Add a dummy if it does not exist. proc addBalloon {args} {} } else { namespace import -force psballoon::addBalloon } set debug 0 set diffver "Version 2.0.4+ 2004-08-17" set thisScript [file join [pwd] [info script]] set thisDir [file dirname $thisScript] # Follow any link set tmplink $thisScript while {[file type $tmplink] eq "link"} { set tmplink [file readlink $tmplink] |
︙ | ︙ | |||
1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 | # Clean up after a diff proc cleanupFiles {top} { switch $::diff($top,cleanup) { "rev" {cleanupRev $top} "conflict" {cleanupConflict $top} } } # Main diff function. proc doDiff {top} { global Pref global doingLine1 doingLine2 if {$::diff($top,mode) eq "" && ($::diff($top,leftOK) == 0 || $::diff($top,rightOK) == 0)} { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 | # Clean up after a diff proc cleanupFiles {top} { switch $::diff($top,cleanup) { "rev" {cleanupRev $top} "conflict" {cleanupConflict $top} } } # Redo Diff command proc redoDiff {top} { # Note what rows are being displayed set w $::widgets($top,wDiff1) set width [winfo width $w] set height [winfo height $w] set first [$w index @0,0] set last [$w index @[expr {$width - 4}],[expr {$height - 4}]] set first [lindex [split $first .] 0] set last [lindex [split $last .] 0] # Narrow it 5 lines since seeText will try to view 5 lines extra incr first 5 incr last -5 if {$last < $first} { set last $first } doDiff $top # Restore view foreach item {wLine1 wDiff1 wLine2 wDiff2} { set w $::widgets($top,$item) seeText $w $first.0 $last.0 } } # Main diff function. proc doDiff {top} { global Pref global doingLine1 doingLine2 if {$::diff($top,mode) eq "" && ($::diff($top,leftOK) == 0 || $::diff($top,rightOK) == 0)} { |
︙ | ︙ | |||
3242 3243 3244 3245 3246 3247 3248 | #frame $top.f.line -height 1 -bg SystemButtonHighlight #pack $top.f.line -side bottom -fill x } menubutton $top.mf -text "File" -underline 0 -menu $top.mf.m menu $top.mf.m $top.mf.m add command -label "Redo Diff" -underline 5 \ | | | 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 | #frame $top.f.line -height 1 -bg SystemButtonHighlight #pack $top.f.line -side bottom -fill x } menubutton $top.mf -text "File" -underline 0 -menu $top.mf.m menu $top.mf.m $top.mf.m add command -label "Redo Diff" -underline 5 \ -command [list redoDiff $top] -state disabled if {$debug == 1} { $top.mf.m entryconfigure "Redo Diff" -state normal } $top.mf.m add separator $top.mf.m add command -label "Open Both..." -underline 0 \ -command [list openBoth $top 0] $top.mf.m add command -label "Open Both (forget)..." \ |
︙ | ︙ | |||
4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 | $w.t tag configure change -foreground $Pref(colorchange) \ -background $Pref(bgchange) $w.t tag configure ul -underline 1 insertTaggedText $w.t $doc $w.t configure -state disabled } proc makeDocWin {fileName} { set w [helpWin .doc "Eskil Help"] | > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < < | | 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 | $w.t tag configure change -foreground $Pref(colorchange) \ -background $Pref(bgchange) $w.t tag configure ul -underline 1 insertTaggedText $w.t $doc $w.t configure -state disabled } proc createDocFonts {} { if {[catch {font create docFont -family Helvetica -size -16}]} return eval font create docFontB [font configure docFont] -weight bold set h [font metrics docFont -linespace] set t [expr {-$h + 4}] font create docFontP -family Courier -size $t for {} {$t > -20} {incr t -1} { font configure docFontP -size $t if {[font metrics docFontP -linespace] >= $h} break } } # Configure a text window as Doc viewer proc configureDocWin {w} { createDocFonts $w configure -font docFont -wrap word $w tag configure ul -underline 1 $w tag configure b -font docFontB $w tag configure bullet -tabs "1c" -lmargin2 "1c" $w tag configure pre -font docFontP set top [winfo toplevel $w] foreach event {<Key-Prior> <Key-Next>} { bind $top $event [string map [list "%W" $w] [bind Text $event]] } } proc makeDocWin {fileName} { set w [helpWin .doc "Eskil Help"] set t [Scroll y text $w.t -width 80 -height 25] pack $w.t -side top -expand 1 -fill both configureDocWin $t if {![file exists $::thisDir/doc/$fileName]} { $t insert end "ERROR: Could not find doc file " $t insert end \"$fileName\" return } insertTaggedText $t $::thisDir/doc/$fileName |
︙ | ︙ | |||
4735 4736 4737 4738 4739 4740 4741 | set ::dirdiff(leftDir) [file join [pwd] dir1] set ::dirdiff(rightDir) [file join [pwd] dir2] makeDirDiffWin doCompare set w [helpWin .ht "Eskil Tutorial"] | | < < < < < | < < < < < | 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 | set ::dirdiff(leftDir) [file join [pwd] dir1] set ::dirdiff(rightDir) [file join [pwd] dir2] makeDirDiffWin doCompare set w [helpWin .ht "Eskil Tutorial"] text $w.t -width 82 -height 35 -yscrollcommand "$w.sb set" scrollbar $w.sb -orient vert -command "$w.t yview" pack $w.sb -side right -fill y pack $w.t -side left -expand 1 -fill both configureDocWin $w.t # Move border properties to frame set bw [$w.t cget -borderwidth] set relief [$w.t cget -relief] $w configure -relief $relief -borderwidth $bw $w.t configure -borderwidth 0 insertTaggedText $w.t $doc $w.t configure -state disabled } proc printUsage {} { puts {Usage: eskil.tcl [options] [file1] [file2] [options] All options but the ones listed below |
︙ | ︙ |