Eskil

Check-in [4267fcad4a]
Login

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

Overview
Comment:Support more areas for file drop.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4267fcad4a66b639cf85ee2229e8936f1b8a07d2
User & Date: peter 2017-02-04 20:18:57.065
Context
2017-02-04
21:38
Moved preprocess code to separate source file check-in: eb19798847 user: peter tags: trunk
20:18
Support more areas for file drop. check-in: 4267fcad4a user: peter tags: trunk
2017-01-31
20:46
Typo check-in: 4dcdb859d0 user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to Changes.



1
2
3
4
5
6
7



2017-01-31
 Made --query work again; lost in option reorganisation.

2017-01-12
 Added -gz flag to compare compressed files.

2016-09-04
>
>
>







1
2
3
4
5
6
7
8
9
10
2017-02-04
 Support more areas for file drop.

2017-01-31
 Made --query work again; lost in option reorganisation.

2017-01-12
 Added -gz flag to compare compressed files.

2016-09-04
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
 Compress printed PDF.

2015-10-14
 Page break between files when printing in patch mode.

2015-10-12
 Use tablelist 5.14 that includes -colorizecommand, for table diff.
  
2015-07-02
 Printing followed by redo diff closed Eskil. Fixed this.

2015-06-02
 Made a patched version of tablelist for table diff. Patch stored in src dir.
 Table diff works reasonable now








|







68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
 Compress printed PDF.

2015-10-14
 Page break between files when printing in patch mode.

2015-10-12
 Use tablelist 5.14 that includes -colorizecommand, for table diff.

2015-07-02
 Printing followed by redo diff closed Eskil. Fixed this.

2015-06-02
 Made a patched version of tablelist for table diff. Patch stored in src dir.
 Table diff works reasonable now

159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
 Added a font fallback in psballon. [0ff6d72ab9]

2014-01-24
 Bumped revision to 2.6.5

2014-01-24
 Include tclkit.ico and tclkit.inf in kit, to get info on Windows.
       
2014-01-11
 Detect Subversion 1.7 working copy where .svn is just in the top.

2013-09-28
 Support direct print in patch mode. [6bce349e95]

2013-09-28







|







162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
 Added a font fallback in psballon. [0ff6d72ab9]

2014-01-24
 Bumped revision to 2.6.5

2014-01-24
 Include tclkit.ico and tclkit.inf in kit, to get info on Windows.

2014-01-11
 Detect Subversion 1.7 working copy where .svn is just in the top.

2013-09-28
 Support direct print in patch mode. [6bce349e95]

2013-09-28
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
2012-02-17
 Improved plugin viewer.

2012-02-14
 Include added files when using -review with Fossil.

2012-02-07
 Fixed bug where extra lines showed when displaying only diffs (no context). 

Release 2.6.1

2011-11-01
  Fixed bug where copy button in directory diff picked the wrong file.
  Use a custom Toolbutton layout to get a small toolbutton in directory diff.








|







244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
2012-02-17
 Improved plugin viewer.

2012-02-14
 Include added files when using -review with Fossil.

2012-02-07
 Fixed bug where extra lines showed when displaying only diffs (no context).

Release 2.6.1

2011-11-01
  Fixed bug where copy button in directory diff picked the wrong file.
  Use a custom Toolbutton layout to get a small toolbutton in directory diff.

295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
 Added three-way merge. Cmd line options -a and -fine.

2011-04-24
 Added basic GUI for plugin selection.

2011-04-22
 Merging did not work properly if alignment was used. [Bug 9925]
 
2011-04-11
 Support files and revisions with -review in Fossil.
 Support revisions with -review in Git.
 New DiffUtil has a fallback to pure Tcl LCS.

2011-04-05
 Added -pluginlist option.







|







298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
 Added three-way merge. Cmd line options -a and -fine.

2011-04-24
 Added basic GUI for plugin selection.

2011-04-22
 Merging did not work properly if alignment was used. [Bug 9925]

2011-04-11
 Support files and revisions with -review in Fossil.
 Support revisions with -review in Git.
 New DiffUtil has a fallback to pure Tcl LCS.

2011-04-05
 Added -pluginlist option.
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
 Kits are mounted readonly.

2007-01-29
 Finished dirdiff filters. [FR 3040]

2007-01-28
 Started on dirdiff filters.
 Added dirdiff preferences dialog. 

2007-01-09
 Document --query flag. [FR 3027]
 Smarter save in merge. [FR 2957]

2007-01-07
 Added commit button for CVS. [FR 2780]







|







456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
 Kits are mounted readonly.

2007-01-29
 Finished dirdiff filters. [FR 3040]

2007-01-28
 Started on dirdiff filters.
 Added dirdiff preferences dialog.

2007-01-09
 Document --query flag. [FR 3027]
 Smarter save in merge. [FR 2957]

2007-01-07
 Added commit button for CVS. [FR 2780]
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571

2004-06-30
 Full -r support for ClearCase.

2004-06-24
 Added simple -r support to ClearCase diff.
 Support ignore case in block matching.
 
Release 2.0.4

2004-06-17
 Added ignore case option.

2004-06-16
 Improved alignment handling a bit. Mark alignment row with an underline.







|







560
561
562
563
564
565
566
567
568
569
570
571
572
573
574

2004-06-30
 Full -r support for ClearCase.

2004-06-24
 Added simple -r support to ClearCase diff.
 Support ignore case in block matching.

Release 2.0.4

2004-06-17
 Added ignore case option.

2004-06-16
 Improved alignment handling a bit. Mark alignment row with an underline.
606
607
608
609
610
611
612
613
614
615
616
617
618

Release 2.0.1

2004-02-10
 Added preferences for width and height.
 Added Tools menu to directory diff window.
 Made it simpler to save a conflict in the same file.
 
2004-02-05
 Stopped Tk from interfering with the command line.

2004-01-30
 Release 2.0







|





609
610
611
612
613
614
615
616
617
618
619
620
621

Release 2.0.1

2004-02-10
 Added preferences for width and height.
 Added Tools menu to directory diff window.
 Made it simpler to save a conflict in the same file.

2004-02-05
 Stopped Tk from interfering with the command line.

2004-01-30
 Release 2.0
Changes to src/eskil.tcl.
2345
2346
2347
2348
2349
2350
2351











2352
2353
2354
2355
2356
2357


2358
2359
2360
2361
2362
2363
2364
# File drop using TkDnd
proc fileDrop {top side files} {
    # FIXA: Maybe single drop during rev mode should stay in rev mode?
    # Dropping two files mean set both
    if {[llength $files] >= 2} {
        set leftFile [lindex $files 0]
        set rightFile [lindex $files 1]











    } elseif {$side eq "left"} {
        set leftFile [lindex $files 0]
        set rightFile ""
    } else {
        set leftFile ""
        set rightFile [lindex $files 0]


    }
    if {$leftFile ne ""} {
        set ::eskil($top,leftDir) [file dirname $leftFile]
        set ::eskil($top,leftFile) $leftFile
        set ::eskil($top,leftLabel) $leftFile
        set ::eskil($top,leftOK) 1
        set ::eskil($top,mode) ""







>
>
>
>
>
>
>
>
>
>
>
|
|
|
|
|
|
>
>







2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
# File drop using TkDnd
proc fileDrop {top side files} {
    # FIXA: Maybe single drop during rev mode should stay in rev mode?
    # Dropping two files mean set both
    if {[llength $files] >= 2} {
        set leftFile [lindex $files 0]
        set rightFile [lindex $files 1]
    } else {
        if {$side eq "any"} {
            # Dropped outside the text widgets. Try to be clever.
            if {![info exists ::eskil($top,lastDrop)]} {
                set side left
            } elseif {$::eskil($top,lastDrop) eq "left"} {
                set side right
            } else {
                set side left
            }
        }
        if {$side eq "left"} {
            set leftFile [lindex $files 0]
            set rightFile ""
        } else {
            set leftFile ""
            set rightFile [lindex $files 0]
        }
        set ::eskil($top,lastDrop) $side
    }
    if {$leftFile ne ""} {
        set ::eskil($top,leftDir) [file dirname $leftFile]
        set ::eskil($top,leftFile) $leftFile
        set ::eskil($top,leftLabel) $leftFile
        set ::eskil($top,leftOK) 1
        set ::eskil($top,mode) ""
3386
3387
3388
3389
3390
3391
3392


3393

3394
3395
3396
3397
3398
3399
3400
        if {[info procs textSearch::enableSearch] != ""} {
            textSearch::enableSearch $top.ft1.tt -label ::widgets($top,isearchLabel)
            textSearch::enableSearch $top.ft2.tt -label ::widgets($top,isearchLabel)
        }

        # Set up file dropping in text windows if TkDnd is available
        if {![catch {package require tkdnd}]} {


            dnd bindtarget $top.ft1.tt text/uri-list <Drop> "fileDrop $top left %D"

            dnd bindtarget $top.ft2.tt text/uri-list <Drop> "fileDrop $top right %D"
        }

        # FIXA: verify that this label is ok after Tile migration
        ttk::label $top.ls -width 1 \
                -textvariable ::widgets($top,isearchLabel)
        addBalloon $top.ls "Incremental search indicator"







>
>

>







3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
        if {[info procs textSearch::enableSearch] != ""} {
            textSearch::enableSearch $top.ft1.tt -label ::widgets($top,isearchLabel)
            textSearch::enableSearch $top.ft2.tt -label ::widgets($top,isearchLabel)
        }

        # Set up file dropping in text windows if TkDnd is available
        if {![catch {package require tkdnd}]} {
            dnd bindtarget $top text/uri-list <Drop> "fileDrop $top any %D"
            dnd bindtarget $top.ft1.tl text/uri-list <Drop> "fileDrop $top left %D"
            dnd bindtarget $top.ft1.tt text/uri-list <Drop> "fileDrop $top left %D"
            dnd bindtarget $top.ft2.tl text/uri-list <Drop> "fileDrop $top right %D"
            dnd bindtarget $top.ft2.tt text/uri-list <Drop> "fileDrop $top right %D"
        }

        # FIXA: verify that this label is ok after Tile migration
        ttk::label $top.ls -width 1 \
                -textvariable ::widgets($top,isearchLabel)
        addBalloon $top.ls "Incremental search indicator"