Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Added basic GUI for plugin selection. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
dbf293e7d22daaa1fc1b9162bd6b290a |
User & Date: | peter.spjuth@gmail.com 2011-04-24 15:58:16.000 |
Context
2011-04-24
| ||
16:06 | Bug fix in last commit. check-in: 3b774c1269 user: peter.spjuth@gmail.com tags: trunk | |
15:58 | Added basic GUI for plugin selection. check-in: dbf293e7d2 user: peter.spjuth@gmail.com tags: trunk | |
2011-04-22
| ||
00:10 | Merging did not work properly if alignement was used. [Bug 9925] check-in: 20eadc24c4 user: peter.spjuth@gmail.com tags: trunk | |
Changes
Changes to Changes.
1 2 3 4 5 6 7 | 2011-04-22 Merging did not work properly if alignement 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. | > > > | 1 2 3 4 5 6 7 8 9 10 | 2011-04-24 Added basic GUI for plugin selection. 2011-04-22 Merging did not work properly if alignement 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. |
︙ | ︙ |
Changes to src/eskil.tcl.
︙ | ︙ | |||
2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 | $top.m add cascade -label "Options" -underline 0 -menu $top.m.mo menu $top.m.mo $top.m.mo add cascade -label "Font" -underline 0 -menu $top.m.mo.f $top.m.mo add cascade -label "Ignore" -underline 0 -menu $top.m.mo.i $top.m.mo add command -label "Preprocess..." -underline 0 \ -command [list EditPrefRegsub $top] $top.m.mo add cascade -label "Parse" -underline 1 -menu $top.m.mo.p $top.m.mo add command -label "Colours..." -underline 0 -command makePrefWin $top.m.mo add cascade -label "Context" -underline 1 -menu $top.m.mo.c $top.m.mo add separator $top.m.mo add checkbutton -label "Toolbar" -variable ::Pref(toolbar) $top.m.mo add separator $top.m.mo add command -label "Save default" \ | > > | 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 | $top.m add cascade -label "Options" -underline 0 -menu $top.m.mo menu $top.m.mo $top.m.mo add cascade -label "Font" -underline 0 -menu $top.m.mo.f $top.m.mo add cascade -label "Ignore" -underline 0 -menu $top.m.mo.i $top.m.mo add command -label "Preprocess..." -underline 0 \ -command [list EditPrefRegsub $top] $top.m.mo add command -label "Plugins..." -underline 1 \ -command [list EditPrefPlugins $top] $top.m.mo add cascade -label "Parse" -underline 1 -menu $top.m.mo.p $top.m.mo add command -label "Colours..." -underline 0 -command makePrefWin $top.m.mo add cascade -label "Context" -underline 1 -menu $top.m.mo.c $top.m.mo add separator $top.m.mo add checkbutton -label "Toolbar" -variable ::Pref(toolbar) $top.m.mo add separator $top.m.mo add command -label "Save default" \ |
︙ | ︙ | |||
3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 | set pinterp [createPluginInterp $plugin $plugininfo] if {$pinterp eq ""} { puts "Bad plugin: $plugin" printPlugins exit } set opts(plugin) $pinterp } # Do we start in clip diff mode? if {$doclip} { return [makeClipDiffWin] } | > > | 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 | set pinterp [createPluginInterp $plugin $plugininfo] if {$pinterp eq ""} { puts "Bad plugin: $plugin" printPlugins exit } set opts(plugin) $pinterp set opts(pluginname) $plugin set opts(plugininfo) $plugininfo } # Do we start in clip diff mode? if {$doclip} { return [makeClipDiffWin] } |
︙ | ︙ |
Changes to src/plugin.tcl.
︙ | ︙ | |||
86 87 88 89 90 91 92 | return } set ch [open $src] puts -nonewline [read $ch] close $ch } | | > | | > > > > > > > > > > > > > | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | return } set ch [open $src] puts -nonewline [read $ch] close $ch } proc listPlugins {} { set dirs [PluginSearchPath] foreach dir $dirs { set files [glob -nocomplain [file join $dir *.tcl]] foreach file $files { set file [file normalize $file] if {[info exists done($file)]} continue if {![file exists $file]} continue if {![file isfile $file]} continue if {![file readable $file]} continue set done($file) 1 set ch [open $file r] set data [read $ch 200] close $ch if {[regexp {^\#\#Eskil Plugin :(.*?)(\n|$)} $data -> descr]} { set result([file rootname [file tail $file]]) $descr } } } return [array get result] } proc printPlugins {} { set plugins [listPlugins] if {[llength $plugins] == 0} { puts "No plugins found." return } puts "Available plugins:" foreach {plugin descr} $plugins { puts "Plugin \"$plugin\" : $descr" } } proc preparePlugin {top} { #FIXA: plugin miffo disallowEdit $top $::diff($top,plugin) eval [list array set ::Pref [array get ::Pref]] set out1 [tmpFile] |
︙ | ︙ | |||
164 165 166 167 168 169 170 | if {[info exists ::diff($top,rightFileBak)]} { set ::diff($top,rightFile) $::diff($top,rightFileBak) } unset -nocomplain \ ::diff($top,leftFileBak) ::diff($top,rightFileBak) \ ::diff($top,leftFileDiff) ::diff($top,rightFileDiff) } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 | if {[info exists ::diff($top,rightFileBak)]} { set ::diff($top,rightFile) $::diff($top,rightFileBak) } unset -nocomplain \ ::diff($top,leftFileBak) ::diff($top,rightFileBak) \ ::diff($top,leftFileDiff) ::diff($top,rightFileDiff) } # GUI for plugin selection proc EditPrefPlugins {top} { set w $top.prefplugin # Create window destroy $w toplevel $w -padx 3 -pady 3 ttk::frame $w._bg place $w._bg -x 0 -y 0 -relwidth 1.0 -relheight 1.0 -border outside wm title $w "Preferences: Plugins" set plugins [listPlugins] if {[llength $plugins] == 0} { grid [ttk::label $w.l -text "No plugins found."] - -padx 3 -pady 3 } if {![info exists ::diff($top,pluginname)]} { set ::diff($top,pluginname) "" } if {![info exists ::diff($top,plugininfo)]} { set ::diff($top,plugininfo) "" } set ::diff($top,edit,pluginname) $::diff($top,pluginname) set ::diff($top,edit,plugininfo) $::diff($top,plugininfo) set t 0 foreach {plugin descr} $plugins { ttk::radiobutton $w.rb$t -variable ::diff($top,edit,pluginname) -value $plugin -text $plugin ttk::label $w.l$t -text $descr -anchor w grid $w.rb$t $w.l$t -sticky we -padx 3 -pady 3 incr t } ttk::radiobutton $w.rb$t -variable ::diff($top,edit,pluginname) -value "" -text "No Plugin" grid $w.rb$t -sticky we -padx 3 -pady 3 ttk::label $w.li -text "Info" -anchor w ttk::entry $w.ei -textvariable ::diff($top,edit,plugininfo) grid $w.li $w.ei -sticky we -padx 3 -pady 3 ttk::frame $w.fb -padding 3 ttk::button $w.fb.b1 -text "Ok" -command [list EditPrefPluginsOk $top $w] ttk::button $w.fb.b2 -text "Cancel" -command [list destroy $w] set ::widgets($top,prefPluginsOk) $w.fb.b1 grid $w.fb.b1 x $w.fb.b2 -sticky we grid columnconfigure $w.fb {0 2} -uniform a grid columnconfigure $w.fb 1 -weight 1 grid $w.fb - -sticky we grid columnconfigure $w 1 -weight 1 } proc EditPrefPluginsOk {top w} { destroy $w set ::diff($top,pluginname) $::diff($top,edit,pluginname) set ::diff($top,plugininfo) $::diff($top,edit,plugininfo) if {$::diff($top,pluginname) ne ""} { set pinterp [createPluginInterp ::diff($top,pluginname) ::diff($top,plugininfo)] } else { set pinterp "" } set ::diff($top,plugin) $pinterp } |