Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Added balloon help on toolbuttons. Rearranged images. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
0fbbd7316a0cb6c346617635dda4a7cc |
User & Date: | peter.spjuth@gmail.com 2011-05-10 22:40:07.000 |
Context
2011-05-27
| ||
06:09 | Cleanup of global variable usage. check-in: ef2a6449e0 user: peter.spjuth@gmail.com tags: trunk | |
2011-05-10
| ||
22:40 | Added balloon help on toolbuttons. Rearranged images. check-in: 0fbbd7316a user: peter.spjuth@gmail.com tags: trunk | |
21:51 | Added example in document for settings in git and fossil. check-in: 500150bfc8 user: peter.spjuth@gmail.com tags: trunk | |
Changes
Changes to eskil.vfs/lib/psballoon/psballoon.tcl.
︙ | ︙ | |||
66 67 68 69 70 71 72 | set balloon(created) 0 set balloon(pending) 0 } proc psballoon::createBalloon {w mx my} { variable balloon if {$balloon(created) == 0} { | > | > > | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | set balloon(created) 0 set balloon(pending) 0 } proc psballoon::createBalloon {w mx my} { variable balloon if {$balloon(created) == 0} { # Figure out widget's font if {[catch {set font [$w cget -font]}]} { set font [ttk::style lookup [winfo class $w] -font] } set ww [winfo width $w] set ih [winfo height $w] set ix 0 set iy 0 set create 1 set msg $balloon(msg,$w) if {$msg == ""} { |
︙ | ︙ |
Changes to src/dirdiff.tcl.
︙ | ︙ | |||
265 266 267 268 269 270 271 | variable ScheduledRestart 0 variable IdleQueue {} variable IdleQueueArr variable leftMark "" variable rightMark "" variable leftDir "" variable rightDir "" | < < < < < < < < < < < < | 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 | variable ScheduledRestart 0 variable IdleQueue {} variable IdleQueueArr variable leftMark "" variable rightMark "" variable leftDir "" variable rightDir "" constructor {args} { 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 scrollbar $win.vsb -orient vertical \ -command "$tree yview" install hsb using scrollbar $win.hsb -orient horizontal \ -command "$tree xview" set AfterId "" set IdleQueue {} $tree configure -yscrollcommand "$vsb set" -xscrollcommand "$hsb set" $tree columnconfigure 0 -name structure $tree columnconfigure 1 -name leftsize -align right |
︙ | ︙ | |||
393 394 395 396 397 398 399 | set d1 [file tail $leftDir] set d2 [file tail $rightDir] if {$d1 eq $d2} { $tree cellconfigure $topIndex,structure -text $d1 } else { $tree cellconfigure $topIndex,structure -text "$d1 vs $d2" } | | | | | 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 | set d1 [file tail $leftDir] set d2 [file tail $rightDir] if {$d1 eq $d2} { $tree cellconfigure $topIndex,structure -text $d1 } else { $tree cellconfigure $topIndex,structure -text "$d1 vs $d2" } $tree cellconfigure $topIndex,structure -image $::img(open) $tree rowattrib $topIndex type directory $self SetNodeStatus $topIndex empty $tree rowattrib $topIndex leftfull $leftDir $tree rowattrib $topIndex rightfull $rightDir $self UpdateDirNode $topIndex } method expandCmd {tbl row} { if {[$tree childcount $row] != 0} { $tree cellconfigure $row,0 -image $::img(open) } } method collapseCmd {tbl row} { $tree cellconfigure $row,0 -image $::img(clsd) } # Format a time stamp for display proc FormatDate {date} { clock format $date -format "%Y-%m-%d %H:%M:%S" } |
︙ | ︙ | |||
774 775 776 777 778 779 780 | set id [$tree insertchild $node end $values] $tree rowattrib $id type $type $tree rowattrib $id status unknown $tree rowattrib $id leftfull $df1 $tree rowattrib $id rightfull $df2 if {$type ne "directory"} { if {$type eq "link"} { | | | | | 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 | set id [$tree insertchild $node end $values] $tree rowattrib $id type $type $tree rowattrib $id status unknown $tree rowattrib $id leftfull $df1 $tree rowattrib $id rightfull $df2 if {$type ne "directory"} { if {$type eq "link"} { $tree cellconfigure $id,structure -image $::img(link) } else { $tree cellconfigure $id,structure -image $::img(file) $tree cellconfigure $id,command -window [mymethod addCmdCol] } } if {$type eq "directory"} { ## Make it so that this node is openable $tree collapse $id #$tree insertchild $id end dummy ;# a dummy $tree cellconfigure $id,structure -text $name/ $self SetNodeStatus $id empty $self AddNodeToIdle $id $tree cellconfigure $id,structure -image $::img(clsd) } elseif {$size1 == $size2 && \ $time1 == $time2} { $self SetNodeStatus $id equal } elseif {$size1 == ""} { $self SetNodeStatus $id new } elseif {$size2 == ""} { $self SetNodeStatus $id old |
︙ | ︙ | |||
812 813 814 815 816 817 818 | set type [$tree rowattrib $row type] set lf [$tree rowattrib $row leftfull] set rf [$tree rowattrib $row rightfull] set bg [$tbl cget -background] ttk::style configure Apa.TFrame -background $bg ttk::style configure Apa.Toolbutton -background $bg ttk::frame $w -style Apa.TFrame | | | | 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 | set type [$tree rowattrib $row type] set lf [$tree rowattrib $row leftfull] set rf [$tree rowattrib $row rightfull] set bg [$tbl cget -background] ttk::style configure Apa.TFrame -background $bg ttk::style configure Apa.Toolbutton -background $bg ttk::frame $w -style Apa.TFrame ttk::button $w.bl -image $::img(left) -style Apa.Toolbutton \ -command [mymethod CopyFile $row right] ttk::button $w.br -image $::img(right) -style Apa.Toolbutton \ -command [mymethod CopyFile $row left] pack $w.bl $w.br -side left -fill y if {$lf eq ""} { $w.br configure -state disabled } if {$rf eq ""} { $w.bl configure -state disabled |
︙ | ︙ | |||
919 920 921 922 923 924 925 | variable statusVar constructor {args} { eskilRegisterToplevel $win wm title $win "Eskil Dir" wm protocol $win WM_DELETE_WINDOW [list cleanupAndExit $win] | < < < < < < < < | 907 908 909 910 911 912 913 914 915 916 917 918 919 920 | variable statusVar constructor {args} { eskilRegisterToplevel $win wm title $win "Eskil Dir" wm protocol $win WM_DELETE_WINDOW [list cleanupAndExit $win] install tree using DirCompareTree $win.dc \ -leftdirvariable ::dirdiff(leftDir) \ -rightdirvariable ::dirdiff(rightDir) \ -statusvar [myvar statusVar] ttk::frame $win.fe1 ttk::frame $win.fe2 |
︙ | ︙ | |||
999 1000 1001 1002 1003 1004 1005 | } $win.m.md add command -label "Reread Source" -underline 0 \ -command {EskilRereadSource} $win.m.md add separator $win.m.md add command -label "Redraw Window" -command {makeDirDiffWin 1} } | | > | > | > | > | > | 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 | } $win.m.md add command -label "Reread Source" -underline 0 \ -command {EskilRereadSource} $win.m.md add separator $win.m.md add command -label "Redraw Window" -command {makeDirDiffWin 1} } ttk::button $win.bu -image $::img(upup) -command [mymethod UpDir] \ -underline 0 addBalloon $win.bu "Up in both." bind $win <Alt-u> "$win.bu invoke" #catch {font delete myfont} #font create myfont -family $Pref(fontfamily) -size $Pref(fontsize) ttk::entryX $win.e1 -textvariable dirdiff(leftDir) -width 30 ttk::button $win.bu1 -image $::img(up) -command [mymethod UpDir 1] addBalloon $win.bu1 "Up in left." ttk::button $win.bb1 -image $::img(browse) \ -command "[list BrowseDir dirdiff(leftDir) $win.e1] [mymethod DoDirCompare]" addBalloon $win.bb1 "Browse left." after 50 [list after idle [list $win.e1 xview end]] ttk::entryX $win.e2 -textvariable dirdiff(rightDir) -width 30 ttk::button $win.bu2 -image $::img(up) -command [mymethod UpDir 2] addBalloon $win.bu2 "Up in right." ttk::button $win.bb2 -image $::img(browse) \ -command "[list BrowseDir dirdiff(rightDir) $win.e2] [mymethod DoDirCompare]" addBalloon $win.bb2 "Browse right." after 50 [list after idle [list $win.e2 xview end]] bind $win.e1 <Return> [mymethod DoDirCompare] bind $win.e2 <Return> [mymethod DoDirCompare] ttk::label $win.sl -anchor w -textvariable [myvar statusVar] pack $win.bb1 $win.bu1 -in $win.fe1 -side left -pady 1 -ipadx 10 |
︙ | ︙ |
Changes to src/eskil.tcl.
︙ | ︙ | |||
159 160 161 162 163 164 165 166 167 168 169 170 171 172 | } else { $hull xview {*}$args } } } interp alias {} toplevel {} ttk::toplevel } # Debug function to be able to reread the source even when wrapped in a kit. proc EskilRereadSource {} { set this $::eskil(thisScript) # FIXA: Better detection of starkit? | > > > > > > > > > > > > > > > > > > > | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 | } else { $hull xview {*}$args } } } interp alias {} toplevel {} ttk::toplevel # Use demo images from Tablelist set dir $::eskil(thisDir)/../lib/tablelist/demos set ::img(clsd) [image create photo -file [file join $dir clsdFolder.gif]] set ::img(open) [image create photo -file [file join $dir openFolder.gif]] set ::img(file) [image create photo -file [file join $dir file.gif]] # Local images set dir $::eskil(thisDir)/images set ::img(link) [image create photo -file [file join $dir link.gif]] set ::img(left) [image create photo -file [file join $dir arrow_left.gif]] set ::img(right) [image create photo -file [file join $dir arrow_right.gif]] set ::img(browse) [image create photo -file [file join $dir folderopen1.gif]] set ::img(up) [image create photo -file [file join $dir arrow_up.gif]] # Create a double up arrow set ih [image height $::img(up)] set iw [image width $::img(up)] set ::img(upup) [image create photo -height $ih -width [expr {2 * $iw}]] $::img(upup) copy $::img(up) -to 0 0 [expr {2 * $iw - 1}] [expr {$ih - 1}] } # Debug function to be able to reread the source even when wrapped in a kit. proc EskilRereadSource {} { set this $::eskil(thisScript) # FIXA: Better detection of starkit? |
︙ | ︙ |