Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Added "mark file" in dirdiff popup menu. Added support for testsuite. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
17c7df78238842b17eb058d47483bc83 |
User & Date: | peter 2004-02-23 21:09:27.000 |
Context
2004-02-23
| ||
21:10 | First testsuite. check-in: 89eb5ba442 user: peter tags: trunk | |
21:09 | Added "mark file" in dirdiff popup menu. Added support for testsuite. check-in: 17c7df7823 user: peter tags: trunk | |
2004-02-09
| ||
23:19 | Added pronunciations. Release 2.0.1. check-in: f107f91c9f user: peter tags: trunk | |
Changes
Changes to src/eskil.tcl.
︙ | ︙ | |||
665 666 667 668 669 670 671 | # ignoring the most awkwardly placed line. set mostp -1 set mosti 0 for {set i 0} {$i < $size1} {incr i} { if {$mark($i) == 1} { if {abs($result($i) - $i) > $mostp} { set mostp [expr {abs($result($i) - $i)}] | | | 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 | # ignoring the most awkwardly placed line. set mostp -1 set mosti 0 for {set i 0} {$i < $size1} {incr i} { if {$mark($i) == 1} { if {abs($result($i) - $i) > $mostp} { set mostp [expr {abs($result($i) - $i)}] set mosti $i } } } # puts "Most $mosti $mostp" set scores(best,$mosti) 0 } } |
︙ | ︙ | |||
1016 1017 1018 1019 1020 1021 1022 | $top.mf.m entryconfigure "Redo Diff" -state disabled $top.mt.m entryconfigure "Merge" -state disabled } proc busyCursor {top} { global oldcursor oldcursor2 if {![info exists oldcursor]} { | | | 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 | $top.mf.m entryconfigure "Redo Diff" -state disabled $top.mt.m entryconfigure "Merge" -state disabled } proc busyCursor {top} { global oldcursor oldcursor2 if {![info exists oldcursor]} { set oldcursor [$top cget -cursor] set oldcursor2 [$::diff($top,wDiff1) cget -cursor] } $top config -cursor watch foreach item {wLine1 wDiff1 wLine2 wDiff2} { if {[info exists ::diff($top,$item)]} { set w $::diff($top,$item) $w config -cursor watch |
︙ | ︙ | |||
2692 2693 2694 2695 2696 2697 2698 | unset ::diff($top,align1) unset ::diff($top,align2) } } # Called by popup menus over row numbers to add command for alignment. | | | 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 | unset ::diff($top,align1) unset ::diff($top,align2) } } # Called by popup menus over row numbers to add command for alignment. # Returns 1 if nothing was added. proc alignMenu {m top n x y} { # Get the row that was clicked set w $::diff($top,wLine$n) set index [$w index @$x,$y] set row [lindex [split $index "."] 0] set data [$w get $row.0 $row.end] |
︙ | ︙ | |||
3798 3799 3800 3801 3802 3803 3804 | } return $eq } # Display two files in the directory windows and set up info for # interacting with them. # diff: Do they differ. | | | 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 | } return $eq } # Display two files in the directory windows and set up info for # interacting with them. # diff: Do they differ. # level: Depth in a recursive run. # The values in infoFiles are: # 1 = noLeft, 2 = noRight, 4 = left is dir, 8 = right is dir, 16 = diff proc listFiles {df1 df2 diff level} { global dirdiff Pref # Optionally do not list directories. if {$Pref(nodir)} { |
︙ | ︙ | |||
3965 3966 3967 3968 3969 3970 3971 | } # Run the directory comparison proc doCompare {} { global dirdiff if {![file isdirectory $dirdiff(leftDir)]} return if {![file isdirectory $dirdiff(rightDir)]} return | | | > > > | 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 | } # Run the directory comparison proc doCompare {} { global dirdiff if {![file isdirectory $dirdiff(leftDir)]} return if {![file isdirectory $dirdiff(rightDir)]} return set dirdiff(leftFiles) {} set dirdiff(rightFiles) {} set dirdiff(infoFiles) {} set dirdiff(leftMark) "" set dirdiff(rightMark) "" $dirdiff(wLeft) delete 1.0 end $dirdiff(wRight) delete 1.0 end busyCursor .dirdiff update idletasks compareDirs $dirdiff(leftDir) $dirdiff(rightDir) normalCursor .dirdiff } |
︙ | ︙ | |||
4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 | newDiff $lf $rf] } if {$w eq $dirdiff(wLeft) && ($i & 13) == 0} { $m add command -label "Copy File" \ -command [list copyFile $row right] $m add command -label "Edit File" \ -command [list editFile $row left] } if {$w eq $dirdiff(wRight) && ($i & 14) == 0} { $m add command -label "Copy File" \ -command [list copyFile $row left] $m add command -label "Edit File" \ -command [list editFile $row right] } tk_popup $m $X $Y } # Copy a file from one directory to the other proc copyFile {row to} { | > > > > > > > > > > > > | 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 | newDiff $lf $rf] } if {$w eq $dirdiff(wLeft) && ($i & 13) == 0} { $m add command -label "Copy File" \ -command [list copyFile $row right] $m add command -label "Edit File" \ -command [list editFile $row left] $m add command -label "Mark File" \ -command [list set ::dirdiff(leftMark) $lf] if {$::dirdiff(rightMark) != ""} { $m add command -label "Compare with $::dirdiff(rightMark)" \ -command [list newDiff $lf $::dirdiff(rightMark)] } } if {$w eq $dirdiff(wRight) && ($i & 14) == 0} { $m add command -label "Copy File" \ -command [list copyFile $row left] $m add command -label "Edit File" \ -command [list editFile $row right] $m add command -label "Mark File" \ -command [list set ::dirdiff(rightMark) $rf] if {$::dirdiff(leftMark) != ""} { $m add command -label "Compare with $::dirdiff(leftMark)" \ -command [list newDiff $::dirdiff(leftMark) $rf] } } tk_popup $m $X $Y } # Copy a file from one directory to the other proc copyFile {row to} { |
︙ | ︙ | |||
4922 4923 4924 4925 4926 4927 4928 | set Pref(recursive) 0 set Pref(dir,onlydiffs) 0 set Pref(nodir) 0 set Pref(autocompare) 1 set ::diff(filter) "" | | | 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 | set Pref(recursive) 0 set Pref(dir,onlydiffs) 0 set Pref(nodir) 0 set Pref(autocompare) 1 set ::diff(filter) "" if {![info exists ::eskil_testsuite] && [file exists "~/.eskilrc"]} { safeLoad "~/.eskilrc" Pref } if {$Pref(editor) ne ""} { set ::util(editor) $Pref(editor) } } |
︙ | ︙ | |||
4964 4965 4966 4967 4968 4969 4970 | if {![info exists gurkmeja]} { set gurkmeja 1 defaultGuiOptions if {0 && [bind all <Alt-KeyPress>] eq ""} { bind all <Alt-KeyPress> [bind Menubutton <Alt-KeyPress>] #after 500 "tk_messageBox -message Miffo" } | < > > | | > | 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 4989 4990 4991 | if {![info exists gurkmeja]} { set gurkmeja 1 defaultGuiOptions if {0 && [bind all <Alt-KeyPress>] eq ""} { bind all <Alt-KeyPress> [bind Menubutton <Alt-KeyPress>] #after 500 "tk_messageBox -message Miffo" } wm withdraw . getOptions if {![info exists ::eskil_testsuite]} { parseCommandLine } } |