Eskil

Check-in [28e18ffbb8]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Added arrow images to directory diff
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | table-list
Files: files | file ages | folders
SHA1: 28e18ffbb8b87ed5155a05e5bc8278f73943b8e8
User & Date: peter.spjuth@gmail.com 2011-05-05 22:09:56.000
Context
2011-05-05
22:18
Use my tablelist check-in: 4702fd1691 user: peter.spjuth@gmail.com tags: table-list
22:09
Added arrow images to directory diff check-in: 28e18ffbb8 user: peter.spjuth@gmail.com tags: table-list
2011-05-03
23:56
Added command column in dirdiff window check-in: 1f4057c700 user: peter.spjuth@gmail.com tags: table-list
Changes
Unified Diff Ignore Whitespace Patch
Changes to Makefile.
︙︙
35
36
37
38
39
40
41


42
43
44
45
46
47
48


#----------------------------------------------------------------
# Setup symbolic links from the VFS to the real files
#----------------------------------------------------------------

eskil.vfs/src/eskil.tcl:
	@cd eskil.vfs/src ; for i in $(SRCFILES); do ln -fs ../../$$i ; done


eskil.vfs/examples:
	cd eskil.vfs ; ln -s ../examples
eskil.vfs/doc:
	cd eskil.vfs ; ln -s ../doc
eskil.vfs/plugins:
	cd eskil.vfs ; ln -s ../plugins
eskil.vfs/COPYING:








>
>








35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50


#----------------------------------------------------------------
# Setup symbolic links from the VFS to the real files
#----------------------------------------------------------------

eskil.vfs/src/eskil.tcl:
	@cd eskil.vfs/src ; for i in $(SRCFILES); do ln -fs ../../$$i ; done
eskil.vfs/src/images:
	@cd eskil.vfs/src ; ln -fs ../../src/images
eskil.vfs/examples:
	cd eskil.vfs ; ln -s ../examples
eskil.vfs/doc:
	cd eskil.vfs ; ln -s ../doc
eskil.vfs/plugins:
	cd eskil.vfs ; ln -s ../plugins
eskil.vfs/COPYING:
︙︙
75
76
77
78
79
80
81

82
83
84
85
86
87
88

	cd eskil.vfs/lib ; mkdir struct
	cd eskil.vfs/lib/struct ; ln -s $(STRUCT)/pkgIndex.tcl
	cd eskil.vfs/lib/struct ; ln -s $(STRUCT)/list.tcl
eskil.vfs/lib/cmdline:
	cd eskil.vfs/lib ; ln -s $(CMDLINE) cmdline

links: eskil.vfs/src/eskil.tcl \

	eskil.vfs/examples\
	eskil.vfs/doc\
	eskil.vfs/plugins\
	eskil.vfs/COPYING\
	eskil.vfs/lib/griffin\
	eskil.vfs/lib/style\
	eskil.vfs/lib/textsearch\








>








77
78
79
80
81
82
83
84
85
86
87
88
89
90
91

	cd eskil.vfs/lib ; mkdir struct
	cd eskil.vfs/lib/struct ; ln -s $(STRUCT)/pkgIndex.tcl
	cd eskil.vfs/lib/struct ; ln -s $(STRUCT)/list.tcl
eskil.vfs/lib/cmdline:
	cd eskil.vfs/lib ; ln -s $(CMDLINE) cmdline

links: eskil.vfs/src/eskil.tcl \
	eskil.vfs/src/images \
	eskil.vfs/examples\
	eskil.vfs/doc\
	eskil.vfs/plugins\
	eskil.vfs/COPYING\
	eskil.vfs/lib/griffin\
	eskil.vfs/lib/style\
	eskil.vfs/lib/textsearch\
︙︙
Changes to src/dirdiff.tcl.
︙︙
262
263
264
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


    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 \
                -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"
        #puts "Theme [tablelist::getCurrentTheme]"
        #puts "Style [ttk::style configure .]"

        # 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]]
        # FIXA: arrow images

        set img(left) [image create photo mapleft -width 10 -height 8]
        set img(right) [image create photo mapright -width 10 -height 8]

        set AfterId ""
        set IdleQueue {}

        $tree configure -yscrollcommand "$vsb set" -xscrollcommand "$hsb set"

        $tree columnconfigure 0 -name structure








|





<
<






|
>
|
|








262
263
264
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


    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"



        # 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]]
        # Arrow images
        set dir $::eskil(thisDir)/images
        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 AfterId ""
        set IdleQueue {}

        $tree configure -yscrollcommand "$vsb set" -xscrollcommand "$hsb set"

        $tree columnconfigure 0 -name structure
︙︙
791
792
793
794
795
796
797





798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815

816

817
818
819
820
821
822
823

        }
        return [$tree rowattrib $id status]
    }

    method addCmdCol {tbl row col w} {
        set status [$tree rowattrib $row status]
        set type   [$tree rowattrib $row type]





        ttk::frame $w
        if 1 {
            ttk::button $w.bl -image $img(left) -style Toolbutton \
                    -command [mymethod CopyFile $row right]
            ttk::button $w.br -image $img(right) -style Toolbutton \
                    -command [mymethod CopyFile $row left]
        } elseif 1 {
            ttk::button $w.bl -text "<" -style Toolbutton \
                    -command [mymethod CopyFile $row right]
            ttk::button $w.br -text ">" -style Toolbutton \
                    -command [mymethod CopyFile $row left]
        } else {
            ttk::label $w.bl -text "<"
            bind $w.bl <Button-1> [mymethod CopyFile $row right]
            ttk::label $w.br -text ">"
            bind $w.br <Button-1> [mymethod CopyFile $row left]
        }
        pack $w.bl $w.br -side left -fill y

        pack $w.bl -padx {0 1}

    }

    # Compare two directories.
    method CompareDirs {dir1 dir2 node} {
        global Pref
        if {$dir1 eq ""} {
            set files1 {}








>
>
>
>
>
|
<
|
|
|
|
<
<
<
|
<
|
<
<
|
<

<
>
|
>








790
791
792
793
794
795
796
797
798
799
800
801
802

803
804
805
806



807

808


809

810

811
812
813
814
815
816
817
818
819
820

        }
        return [$tree rowattrib $id status]
    }

    method addCmdCol {tbl row col w} {
        set status [$tree rowattrib $row status]
        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
        }
    }

    # Compare two directories.
    method CompareDirs {dir1 dir2 node} {
        global Pref
        if {$dir1 eq ""} {
            set files1 {}
︙︙
Added src/images/arrow_left.gif.

cannot compute difference between binary files

Added src/images/arrow_right.gif.

cannot compute difference between binary files