Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | More ttk adjustments. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
9ebd7c4f7f27dfa8b3b7556a86ed44c8 |
User & Date: | peter 2008-03-04 07:21:00.000 |
Context
2008-03-05
| ||
18:43 | Support for Bazaar. check-in: 38a2c9009a user: peter tags: trunk | |
2008-03-04
| ||
07:21 | More ttk adjustments. check-in: 9ebd7c4f7f user: peter tags: trunk | |
2008-02-21
| ||
06:38 | Updated email address check-in: 803932a2c1 user: peter tags: trunk | |
Changes
Changes to src/eskil.tcl.
︙ | ︙ | |||
35 36 37 38 39 40 41 | # 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 | | | 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 ::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} |
︙ | ︙ | |||
2199 2200 2201 2202 2203 2204 2205 | if {[llength $data(1)] == 0 && [llength $data(2)] == 0} return set font [$::widgets($top,wDiff1) cget -font] set wx $X set wy [expr {$Y + 4}] destroy $top.balloon | | | | | 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 | if {[llength $data(1)] == 0 && [llength $data(2)] == 0} return set font [$::widgets($top,wDiff1) cget -font] set wx $X set wy [expr {$Y + 4}] destroy $top.balloon toplevel $top.balloon -background black wm withdraw $top.balloon wm overrideredirect $top.balloon 1 set wid 0 foreach x {1 2} { text $top.balloon.t$x -relief flat -font $font -background \#ffffcc \ -foreground black -padx 2 -pady 0 -height 1 -wrap word $top.balloon.t$x tag configure new1 -foreground $Pref(colornew1) \ -background $Pref(bgnew1) $top.balloon.t$x tag configure change -foreground $Pref(colorchange) \ -background $Pref(bgchange) $top.balloon.t$x tag configure new2 -foreground $Pref(colornew2) \ -background $Pref(bgnew2) pack $top.balloon.t$x -side "top" -padx 1 -pady 1 -fill both -expand 1 |
︙ | ︙ | |||
2446 2447 2448 2449 2450 2451 2452 | ttk::frame $top.f grid $top.f -row 0 -columnspan 4 -sticky nws lappend ::widgets(toolbars) $top.f if {!$::Pref(toolbar)} { grid remove $top.f } | < < < < < | 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 | ttk::frame $top.f grid $top.f -row 0 -columnspan 4 -sticky nws lappend ::widgets(toolbars) $top.f if {!$::Pref(toolbar)} { grid remove $top.f } menu $top.m $top configure -menu $top.m $top.m add cascade -label "File" -underline 0 -menu $top.m.mf menu $top.m.mf $top.m.mf add command -label "Redo Diff" -underline 5 \ -command [list redoDiff $top] -state disabled |
︙ | ︙ | |||
2643 2644 2645 2646 2647 2648 2649 | -font myfont -borderwidth 0 -padx 0 -highlightthickness 0 \ -takefocus 0 text $top.ft1.tt -height $Pref(lines) -width $Pref(linewidth) -wrap none \ -xscrollcommand [list $top.sbx1 set] \ -font myfont -borderwidth 0 -padx 1 \ -highlightthickness 0 catch {$top.ft1.tt configure -tabstyle wordprocessor} ;# 8.5 | | | | 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 | -font myfont -borderwidth 0 -padx 0 -highlightthickness 0 \ -takefocus 0 text $top.ft1.tt -height $Pref(lines) -width $Pref(linewidth) -wrap none \ -xscrollcommand [list $top.sbx1 set] \ -font myfont -borderwidth 0 -padx 1 \ -highlightthickness 0 catch {$top.ft1.tt configure -tabstyle wordprocessor} ;# 8.5 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 scrollbar $top.sby -orient vertical 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 catch {$top.ft2.tt configure -tabstyle wordprocessor} ;# 8.5 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 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 |
︙ | ︙ | |||
3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 | "Preferences saved to:\n[file nativename $rcfile]" } proc getOptions {} { global Pref set Pref(fontsize) 8 set Pref(fontfamily) Courier set Pref(ignore) "-b" set Pref(nocase) 0 set Pref(nodigit) 0 set Pref(parse) 2 set Pref(lineparsewords) 0 set Pref(colorchange) red | > | 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 | "Preferences saved to:\n[file nativename $rcfile]" } proc getOptions {} { global Pref set Pref(fontsize) 8 # Maybe change to TkFixedFont in 8.5 ? set Pref(fontfamily) Courier set Pref(ignore) "-b" set Pref(nocase) 0 set Pref(nodigit) 0 set Pref(parse) 2 set Pref(lineparsewords) 0 set Pref(colorchange) red |
︙ | ︙ |
Changes to src/help.tcl.
︙ | ︙ | |||
37 38 39 40 41 42 43 | wm title $top.nui "" ttk::label $top.nui.l -image nuisance pack $top.nui.l wm protocol $top.nui WM_DELETE_WINDOW [list destroy $top.nui2 $top.nui] update destroy $top.nui2 | | | | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | wm title $top.nui "" ttk::label $top.nui.l -image nuisance pack $top.nui.l wm protocol $top.nui WM_DELETE_WINDOW [list destroy $top.nui2 $top.nui] update destroy $top.nui2 toplevel $top.nui2 -background yellow wm transient $top.nui2 $top.nui wm overrideredirect $top.nui2 1 wm title $top.nui2 "" ttk::label $top.nui2.l -text "$str\nDo you want help?" -justify left \ -background yellow button $top.nui2.b -text "No, get out of my face!" \ -command [list destroy $top.nui2 $top.nui] -background yellow pack $top.nui2.l $top.nui2.b -side "top" -fill x wm geometry $top.nui2 +[expr {405 + [winfo width $top.nui]}]+400 } # A simple window for displaying e.g. help. # Returns the frame where things can be put. proc helpWin {w title} { |
︙ | ︙ | |||
74 75 76 77 78 79 80 | proc makeAboutWin {} { global diffver set w [helpWin .ab "About Eskil"] set bg [ttk::style configure . -background] text $w.t -width 45 -height 11 -wrap none -relief flat \ | | | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | proc makeAboutWin {} { global diffver set w [helpWin .ab "About Eskil"] set bg [ttk::style configure . -background] text $w.t -width 45 -height 11 -wrap none -relief flat \ -background $bg pack $w.t -side top -expand y -fill both $w.t insert end "A graphical frontend to diff\n\n" $w.t insert end "$diffver\n\n" $w.t insert end "Made by Peter Spjuth\n" $w.t insert end "E-Mail: peter.spjuth@gmail.com\n" $w.t insert end "\nURL: http://eskil.berlios.de\n" |
︙ | ︙ |
Changes to src/map.tcl.
︙ | ︙ | |||
27 28 29 30 31 32 33 | set w $top.c_map if {$Pref(wideMap)} { set width 20 } else { set width 6 } | > | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | set w $top.c_map if {$Pref(wideMap)} { set width 20 } else { set width 6 } canvas $w -width $width -borderwidth 0 -selectborderwidth 0 \ -highlightthickness 0 set map [image create photo map$top] $w create image 0 0 -anchor nw -image $map bind $w <Destroy> [list image delete $map] bind $w <Configure> [list drawMap $top %h] bind $w <Button-2> [list ThumbMap $top %y] |
︙ | ︙ |