Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Mac support |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
8d2623486a48a85f2f4336cd1c162d8e |
User & Date: | peter 2015-03-06 01:17:07.142 |
Context
2015-03-09
| ||
21:41 | Updated date check-in: 245ac88266 user: peter tags: trunk | |
2015-03-06
| ||
01:17 | Mac support check-in: 8d2623486a user: peter tags: trunk | |
2015-03-01
| ||
23:47 | More key bindings on toplevel check-in: b793bf2638 user: peter tags: trunk | |
Changes
Changes to Makefile.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | #---------------------------------------------------------------------- # Make file for Eskil #---------------------------------------------------------------------- VERSION = 27 # Path to the TclKits used for creating StarPacks. TCLKIT = /home/peter/tclkit/v85 TCLKIT_LINUX = $(TCLKIT)/tclkit-linux TCLKIT_SOLARIS = $(TCLKIT)/tclkit-solaris-sparc TCLKIT_WIN = $(TCLKIT)/tclkit-win32.upx.exe # Path to the libraries used TEXTSEARCH = /home/peter/src/textsearch DIFFUTIL = /home/peter/src/DiffUtilTcl/lib.vfs/DiffUtil WCB = /home/peter/src/packages/wcb3.4 PDF4TCL = /home/peter/src/pdf4tcl/pkg SNIT = /home/peter/src/packages/tcllib/modules/snit | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | #---------------------------------------------------------------------- # Make file for Eskil #---------------------------------------------------------------------- VERSION = 27 # Path to the TclKits used for creating StarPacks. TCLKIT = /home/peter/tclkit/v85 TCLKIT_LINUX = $(TCLKIT)/tclkit-linux TCLKIT_SOLARIS = $(TCLKIT)/tclkit-solaris-sparc TCLKIT_WIN = $(TCLKIT)/tclkit-win32.upx.exe TCLKIT_MAC = $(TCLKIT)/tclkit-mac-863 # Path to the libraries used TEXTSEARCH = /home/peter/src/textsearch DIFFUTIL = /home/peter/src/DiffUtilTcl/lib.vfs/DiffUtil WCB = /home/peter/src/packages/wcb3.4 PDF4TCL = /home/peter/src/pdf4tcl/pkg SNIT = /home/peter/src/packages/tcllib/modules/snit |
︙ | ︙ | |||
159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 | wrap: sdx wrap eskil.kit wrapexe: @\rm -f eskil.linux eskil.exe eskil.solaris sdx wrap eskil.linux -runtime $(TCLKIT_LINUX) # sdx wrap eskil.solaris -runtime $(TCLKIT_SOLARIS) cd eskil.vfs/lib ; ln -s $(TWAPI) twapi sdx wrap eskil.exe -runtime $(TCLKIT_WIN) rm eskil.vfs/lib/twapi release: setup wrap wrapexe @cp eskil.kit eskil`date +%Y%m%d`.kit @cp eskil.kit eskil$(VERSION).kit @gzip eskil.linux @mv eskil.linux.gz eskil$(VERSION).linux.gz # @gzip eskil.solaris # @mv eskil.solaris.gz eskil$(VERSION).solaris.gz @zip eskil$(VERSION).win.zip eskil.exe @zip eskil`date +%Y%m%d`.win.zip eskil.exe | > > > | 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 | wrap: sdx wrap eskil.kit wrapexe: @\rm -f eskil.linux eskil.exe eskil.solaris sdx wrap eskil.linux -runtime $(TCLKIT_LINUX) sdx wrap eskil.mac -runtime $(TCLKIT_MAC) # sdx wrap eskil.solaris -runtime $(TCLKIT_SOLARIS) cd eskil.vfs/lib ; ln -s $(TWAPI) twapi sdx wrap eskil.exe -runtime $(TCLKIT_WIN) rm eskil.vfs/lib/twapi release: setup wrap wrapexe @cp eskil.kit eskil`date +%Y%m%d`.kit @cp eskil.kit eskil$(VERSION).kit @gzip eskil.linux @mv eskil.linux.gz eskil$(VERSION).linux.gz @gzip eskil.mac @mv eskil.mac.gz eskil$(VERSION).mac.gz # @gzip eskil.solaris # @mv eskil.solaris.gz eskil$(VERSION).solaris.gz @zip eskil$(VERSION).win.zip eskil.exe @zip eskil`date +%Y%m%d`.win.zip eskil.exe |
Changes to src/dirdiff.tcl.
︙ | ︙ | |||
300 301 302 303 304 305 306 | variable color install tree using tablelist::tablelist $win.tree -height 20 \ -movablecolumns no -setgrid no -showseparators yes \ -expandcommand [mymethod expandCmd] \ -collapsecommand [mymethod collapseCmd] \ -fullseparators yes -selectmode none \ -columns {0 "Structure" 0 Size 0 Date 0 Copy 0 Size 0 Date} | | | | 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 | variable color install tree using tablelist::tablelist $win.tree -height 20 \ -movablecolumns no -setgrid no -showseparators yes \ -expandcommand [mymethod expandCmd] \ -collapsecommand [mymethod collapseCmd] \ -fullseparators yes -selectmode none \ -columns {0 "Structure" 0 Size 0 Date 0 Copy 0 Size 0 Date} install vsb using ttk::scrollbar $win.vsb -orient vertical \ -command "$tree yview" install hsb using ttk::scrollbar $win.hsb -orient horizontal \ -command "$tree xview" set AfterId "" set IdleQueue {} $tree configure -yscrollcommand "$vsb set" -xscrollcommand "$hsb set" |
︙ | ︙ |
Changes to src/eskil.tcl.
︙ | ︙ | |||
124 125 126 127 128 129 130 | return } else { puts "Themed Tk not found" exit } } } | < < < < > | | | > | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | return } else { puts "Themed Tk not found" exit } } } # Provide a ttk-friendly toplevel, fixing background and menubar if {[info commands ttk::toplevel] eq ""} { proc ttk::toplevel {w args} { tk::toplevel $w {*}$args place [ttk::frame $w.tilebg] -x 0 -y 0 -relwidth 1 -relheight 1 # Menubar looks out of place on linux. This adjusts the background # Which is enough to make it reasonable. if {[tk windowingsystem] eq "x11"} { set bg [ttk::style configure . -background] option add *Menubutton.background $bg option add *Menu.background $bg } return $w } } ::snit::widgetadaptor ttk::entryX { delegate method * to hull delegate option * to hull |
︙ | ︙ | |||
2279 2280 2281 2282 2283 2284 2285 | $w configure -relief $relief -borderwidth $bw $w.s configure -borderwidth 0 grid $w.s -sticky news if {$scrollx} { $w.s configure -xscrollcommand [list $w.sbx set] | | | | 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 | $w configure -relief $relief -borderwidth $bw $w.s configure -borderwidth 0 grid $w.s -sticky news if {$scrollx} { $w.s configure -xscrollcommand [list $w.sbx set] ttk::scrollbar $w.sbx -orient horizontal -command [list $w.s xview] grid $w.sbx -row 1 -sticky we } if {$scrolly} { $w.s configure -yscrollcommand [list $w.sby set] ttk::scrollbar $w.sby -orient vertical -command [list $w.s yview] grid $w.sby -row 0 -column 1 -sticky ns } grid columnconfigure $w 0 -weight 1 grid rowconfigure $w 0 -weight 1 return $w.s } |
︙ | ︙ | |||
3162 3163 3164 3165 3166 3167 3168 | -font myfont -borderwidth 0 -padx 1 \ -highlightthickness 0 $top.ft1.tt configure -tabstyle wordprocessor tk::frame $top.ft1.f -width 2 -height 2 -background lightgray pack $top.ft1.tl -side left -fill y pack $top.ft1.f -side left -fill y pack $top.ft1.tt -side right -fill both -expand 1 | | | > | > | 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 | -font myfont -borderwidth 0 -padx 1 \ -highlightthickness 0 $top.ft1.tt configure -tabstyle wordprocessor tk::frame $top.ft1.f -width 2 -height 2 -background lightgray pack $top.ft1.tl -side left -fill y pack $top.ft1.f -side left -fill y pack $top.ft1.tt -side right -fill both -expand 1 ttk::scrollbar $top.sby -orient vertical ttk::scrollbar $top.sbx1 -orient horizontal \ -command [list $top.ft1.tt xview] set ::widgets($top,wLine1) $top.ft1.tl set ::widgets($top,wDiff1) $top.ft1.tt ttk::frame $top.ft2 -borderwidth 2 -relief sunken text $top.ft2.tl -height $::Pref(lines) -width 5 -wrap none \ -font myfont -borderwidth 0 -padx 0 -highlightthickness 0 \ -takefocus 0 text $top.ft2.tt -height $::Pref(lines) -width $::Pref(linewidth) -wrap none \ -xscrollcommand [list $top.sbx2 set] \ -font myfont -borderwidth 0 -padx 1 \ -highlightthickness 0 $top.ft2.tt configure -tabstyle wordprocessor tk::frame $top.ft2.f -width 2 -height 2 -background lightgray pack $top.ft2.tl -side left -fill y pack $top.ft2.f -side left -fill y pack $top.ft2.tt -side right -fill both -expand 1 ttk::scrollbar $top.sbx2 -orient horizontal \ -command [list $top.ft2.tt xview] set ::widgets($top,wLine2) $top.ft2.tl set ::widgets($top,wDiff2) $top.ft2.tt commonYScroll $top.sby $top.ft1.tl $top.ft1.tt $top.ft2.tl $top.ft2.tt # Set up a tag for incremental search bindings if {[info procs textSearch::enableSearch] != ""} { textSearch::enableSearch $top.ft1.tt -label ::widgets($top,isearchLabel) |
︙ | ︙ | |||
4501 4502 4503 4504 4505 4506 4507 | close $ch tk_messageBox -icon info -title "Saved" -message \ "Preferences saved to:\n[file nativename $rcfile]" } proc getOptions {} { | > > > | > | 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 | close $ch tk_messageBox -icon info -title "Saved" -message \ "Preferences saved to:\n[file nativename $rcfile]" } proc getOptions {} { if {$::tcl_platform(os) eq "Darwin"} { set ::DefaultPref(fontsize) 10 } else { set ::DefaultPref(fontsize) 8 } # Maybe change to TkFixedFont in 8.5 ? set ::DefaultPref(fontfamily) Courier set ::DefaultPref(ignore) "-b" set ::DefaultPref(nocase) 0 set ::DefaultPref(noempty) 0 set ::DefaultPref(pivot) 100 set ::DefaultPref(nodigit) 0 |
︙ | ︙ |
Changes to src/help.tcl.
︙ | ︙ | |||
236 237 238 239 240 241 242 | set ::dirdiff(leftDir) [file join [pwd] dir1] set ::dirdiff(rightDir) [file join [pwd] dir2] makeDirDiffWin set w [helpWin .ht "Eskil Tutorial"] text $w.t -width 82 -height 35 -yscrollcommand "$w.sb set" | | | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 | set ::dirdiff(leftDir) [file join [pwd] dir1] set ::dirdiff(rightDir) [file join [pwd] dir2] makeDirDiffWin set w [helpWin .ht "Eskil Tutorial"] text $w.t -width 82 -height 35 -yscrollcommand "$w.sb set" ttk::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] |
︙ | ︙ |
Changes to src/merge.tcl.
︙ | ︙ | |||
462 463 464 465 466 467 468 | 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 11 12} -uniform b #grid columnconfigure $w.f {11 13 14} -uniform c text $w.t -width 80 -height 20 -xscrollcommand "$w.sbx set" \ -yscrollcommand "$w.sby set" -font myfont | | | | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 | 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 11 12} -uniform b #grid columnconfigure $w.f {11 13 14} -uniform c text $w.t -width 80 -height 20 -xscrollcommand "$w.sbx set" \ -yscrollcommand "$w.sby set" -font myfont ttk::scrollbar $w.sbx -orient horizontal -command "$w.t xview" ttk::scrollbar $w.sby -orient vertical -command "$w.t yview" bind $w.t <Key-Escape> [list focus $w] ttk::label $w.ls -textvariable ::eskil($top,mergeStatus) addBalloon $w.ls \[[list set "::eskil($top,mergeAncLines)"]\] # Prevent toplevel bindings on keys to fire while in the text widget. |
︙ | ︙ |
Changes to src/rev.tcl.
︙ | ︙ | |||
1441 1442 1443 1444 1445 1446 1447 | proc ViewLog {top filename message} { set w $top.logview destroy $w toplevel $w -padx 3 -pady 3 wm title $w "Log for [file tail $filename]" text $w.t -width 80 -height 15 -yscrollcommand "$w.sby set" -wrap none | | | 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 | proc ViewLog {top filename message} { set w $top.logview destroy $w toplevel $w -padx 3 -pady 3 wm title $w "Log for [file tail $filename]" text $w.t -width 80 -height 15 -yscrollcommand "$w.sby set" -wrap none ttk::scrollbar $w.sby -orient vertical -command "$w.t yview" $w.t insert end $message ttk::button $w.ok -width 10 -text "Dismiss" -command "destroy $w" \ -underline 0 bind $w <Alt-d> [list destroy $w]\;break bind $w <Key-Escape> [list destroy $w]\;break |
︙ | ︙ |