Eskil

Check-in [a165dd464b]
Login

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

Overview
Comment:Ctrl-E to enable Edit Mode. Do not ask about overwriting in Edit Mode. Hidden preference to turn it on.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a165dd464bf243b3692011fabd05b303f57f602a44a3794f0cd1effc4148bf87
User & Date: peter 2019-07-05 11:48:43.329
Context
2019-08-21
23:00
Regenerated usage check-in: a74aa3b7ee user: peter tags: trunk
2019-07-05
11:48
Ctrl-E to enable Edit Mode. Do not ask about overwriting in Edit Mode. Hidden preference to turn it on. check-in: a165dd464b user: peter tags: trunk
11:34
Added -subst command line, to acces PreProcess Subst function. check-in: 65a2768e2e user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to Changes. 
1


2
3
4
5
6
7
8

2019-07-05


 Added -subst command line, to acces PreProcess Subst function.

2019-06-12
 Better SVN commit, when added directories are included.

2019-03-12
 Auto-open prefix group dialog.


>
>








1
2
3
4
5
6
7
8
9
10

2019-07-05
 Ctrl-E to enable Edit Mode.
 Do not ask about overwriting in Edit Mode. Hidden preference to turn it on.
 Added -subst command line, to acces PreProcess Subst function.

2019-06-12
 Better SVN commit, when added directories are included.

2019-03-12
 Auto-open prefix group dialog.
︙︙
Changes to htdocs/changes.wiki. 
1
2
3
4
5
6
7

8
9
10
11
12
13
14

<title>Changes</title>

Upcoming changes (not yet released):

  *  TBW
  *  Added -subst command line, to acces PreProcess Subst function.
  *  Better SVN commit, handling added directories.


Changes in v2.8.4 (2019-02-06):

  *  Commit dialog includes a selection of files, for partial commit.
  *  Better support for multiple files and directories with -review.
  *  Added save-reload option in edit mode.
  *  Bug-fix with deleted files in GIT directory diff.








>








1
2
3
4
5
6
7
8
9
10
11
12
13
14
15

<title>Changes</title>

Upcoming changes (not yet released):

  *  TBW
  *  Added -subst command line, to acces PreProcess Subst function.
  *  Better SVN commit, handling added directories.
  *  Ctrl-E to enable Edit Mode.

Changes in v2.8.4 (2019-02-06):

  *  Commit dialog includes a selection of files, for partial commit.
  *  Better support for multiple files and directories with -review.
  *  Added save-reload option in edit mode.
  *  Bug-fix with deleted files in GIT directory diff.
︙︙
Changes to src/eskil.tcl.
︙︙
2117
2118
2119
2120
2121
2122
2123


2124
2125
2126
2127

2128
2129
2130
2131
2132
2133
2134

        set fileName $::eskil($top,rightFile)
        set trans $::eskil($top,righttranslation)
    }

    set w $::widgets($top,wDiff$side)

    # Confirm dialog


    set apa [tk_messageBox -parent $top -icon question \
            -title "Overwrite file" -type yesnocancel -message \
            "Overwriting file [file tail $fileName]\nDo you want to\
            create a backup copy ?"]

    if {$apa eq "yes"} {
        set backup [file rootname $fileName].bak
        if {[catch {file copy -force $fileName $backup} result]} {
            tk_messageBox -parent $top -icon error \
                    -title "File error" -type ok -message \
                    "Error creating backup file $backup:\n$result"
            return








>
>
|
|
|
|
>








2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137

        set fileName $::eskil($top,rightFile)
        set trans $::eskil($top,righttranslation)
    }

    set w $::widgets($top,wDiff$side)

    # Confirm dialog
    set apa no
    if {$::Pref(askOverwrite)} {
        set apa [tk_messageBox -parent $top -icon question \
                -title "Overwrite file" -type yesnocancel -message \
                "Overwriting file [file tail $fileName]\nDo you want to\
                create a backup copy ?"]
    }
    if {$apa eq "yes"} {
        set backup [file rootname $fileName].bak
        if {[catch {file copy -force $fileName $backup} result]} {
            tk_messageBox -parent $top -icon error \
                    -title "File error" -type ok -message \
                    "Error creating backup file $backup:\n$result"
            return
︙︙
3310
3311
3312
3313
3314
3315
3316
3317
3318

3319
3320
3321
3322
3323
3324
3325

            -command makeClipDiffWin
    $top.m.mt add command -label "Fourway Diff" -underline 0 \
            -command makeFourWayWin
    $top.m.mt add command -label "Table Diff" -underline 0 \
            -command [list makeDiffWin $top -table]
    $top.m.mt add command -label "Merge" -underline 0 \
            -command [list makeMergeWin $top] -state disabled
    $top.m.mt add command -label "Edit Mode" -underline 0 \
            -command [list allowEdit $top] -state disabled

    $top.m.mt add command -label "Paste Patch" -underline 0 \
            -command [list doPastePatch $top]
    $top.m.mt add command -label "Clear Align" \
            -command [list clearAlign $top] -state disabled
    set ::widgets($top,enableAlignCmd) [list \
            $top.m.mt entryconfigure "Clear Align" -state normal]
    set ::widgets($top,disableAlignCmd) [list \








|

>








3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329

            -command makeClipDiffWin
    $top.m.mt add command -label "Fourway Diff" -underline 0 \
            -command makeFourWayWin
    $top.m.mt add command -label "Table Diff" -underline 0 \
            -command [list makeDiffWin $top -table]
    $top.m.mt add command -label "Merge" -underline 0 \
            -command [list makeMergeWin $top] -state disabled
    $top.m.mt add command -label "Edit Mode" -underline 0 -accelerator Ctrl-E \
            -command [list allowEdit $top] -state disabled
    bind $top <Control-Key-E> [list allowEdit $top]
    $top.m.mt add command -label "Paste Patch" -underline 0 \
            -command [list doPastePatch $top]
    $top.m.mt add command -label "Clear Align" \
            -command [list clearAlign $top] -state disabled
    set ::widgets($top,enableAlignCmd) [list \
            $top.m.mt entryconfigure "Clear Align" -state normal]
    set ::widgets($top,disableAlignCmd) [list \
︙︙
Changes to src/startup.tcl.
︙︙
1257
1258
1259
1260
1261
1262
1263

1264
1265
1266
1267
1268
1269
1270

    set ::DefaultPref(marklast) 1
    set ::DefaultPref(linewidth) 80
    set ::DefaultPref(lines) 60
    set ::DefaultPref(editor) "" ;# Not settable in GUI yet
    set ::DefaultPref(preprocessn) {}
    set ::DefaultPref(toolbar) 0
    set ::DefaultPref(wideMap) 0 ;# Not settable in GUI yet


    # Print options
    set ::DefaultPref(printHeaderSize) 10
    set ::DefaultPref(printCharsPerLine) 80
    set ::DefaultPref(printPaper) a4
    set ::DefaultPref(printColorChange) "1.0 0.7 0.7"
    set ::DefaultPref(printColorNew1)   "0.7 1.0 0.7"








>








1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271

    set ::DefaultPref(marklast) 1
    set ::DefaultPref(linewidth) 80
    set ::DefaultPref(lines) 60
    set ::DefaultPref(editor) "" ;# Not settable in GUI yet
    set ::DefaultPref(preprocessn) {}
    set ::DefaultPref(toolbar) 0
    set ::DefaultPref(wideMap) 0 ;# Not settable in GUI yet
    set ::DefaultPref(askOverwrite) 0 ;# Not settable in GUI yet

    # Print options
    set ::DefaultPref(printHeaderSize) 10
    set ::DefaultPref(printCharsPerLine) 80
    set ::DefaultPref(printPaper) a4
    set ::DefaultPref(printColorChange) "1.0 0.7 0.7"
    set ::DefaultPref(printColorNew1)   "0.7 1.0 0.7"
︙︙