Compare commits

...

12 Commits

Author SHA1 Message Date
svkalinin 84795cfb47 Добавлены и исправлены функции отображения меню, панели инструментов, панели файлов 2022-11-18 16:44:55 +03:00
svkalinin 24b7ed6693 Фикс 2022-11-18 16:43:14 +03:00
svkalinin a5416807ee Добавлен параметр statusBarShow - показ строки статуса 2022-11-18 16:43:02 +03:00
svkalinin 39549ef6f7 Добавлены переводы 2022-11-18 16:42:30 +03:00
svkalinin 5c605d6907 Добавлена проверка параметров вызова файл или просто строка 2022-11-18 13:22:29 +03:00
svkalinin e7c1cbbbe1 Новая сборка 2022-11-18 13:13:16 +03:00
svkalinin 35874492b0 Добавлен вывод сообщений об ошибке в диалоге 2022-11-18 13:09:02 +03:00
svkalinin 39683d7439 Добавлено обновления списка файлов в дереве 2022-11-18 13:03:48 +03:00
svkalinin 9ecc9d7301 Добавлена процедура вывода информационного сообщения 2022-11-18 13:03:21 +03:00
svkalinin ac92335ba5 Добавлена команда Git::Reset (git reset _file_) на кнопке в диалоге.
Для отмены 'git add'
2022-11-18 12:40:00 +03:00
svkalinin f1ff64ef6a Добавлена кнопка Обновление в диалог работы с Git 2022-11-18 12:10:11 +03:00
svkalinin ae1a1aaba7 Исправление процедуры поиска наименования функции 2022-11-18 11:43:57 +03:00
12 changed files with 202 additions and 66 deletions

View File

@ -123,3 +123,7 @@
- Fixed Git commit procedure
- Added variable and procedure helper
18/11/2022
- Add Refresh button into Git Dialog
- Fixed FindFunction

View File

@ -36,6 +36,7 @@ locale=$locale
theme=dark
toolBarShow=true
menuShow=true
statusbarShow=true
filesPanelShow=true
filesPanelPlace=left
geometry=1024x768

View File

@ -110,7 +110,6 @@ namespace eval Editor {
puts "$match, $v1, $v2, $v3"
return [list [lindex [split $v2] 0] [lindex [split $v3] 0]]
} else {
puts "FUCK"
return 0
}
}
@ -921,31 +920,23 @@ namespace eval Editor {
}
proc FindFunction {txt findString} {
global nbEditor
puts $findString
set pos "0.0"
# set txt [$nbEditor select].frmText.t
$txt see $pos
set line [lindex [split $pos "."] 0]
set x [lindex [split $pos "."] 1]
# set pos [$txt search -nocase $findString $line.$x end]
set pos [$txt search -nocase -regexp $findString $line.$x end]
set pattern "$findString\\W"
set pos [$txt search -nocase -regexp $pattern $line.$x end]
$txt mark set insert $pos
$txt see $pos
puts $pos
# highlight the found word
set line [lindex [split $pos "."] 0]
# set x [lindex [split $pos "."] 1]
# set x [expr {$x + [string length $findString]}]
$txt tag remove sel 1.0 end
$txt tag add sel $pos $line.end
# #$text tag configure sel -background $editor(selectbg) -foreground $editor(fg)
$txt tag raise sel
focus -force $txt.t
# Position
return 1
}
# "Alexander Dederer (aka Korwin)
# "Alexander Dederer (aka Korwin)
## Search close bracket in editor widget
proc _searchCloseBracket { widget o_bracket c_bracket start_pos end_pos } {
# puts "_searchCloseBracket: $widget $o_bracket $c_bracket $start_pos $end_pos"
@ -1191,7 +1182,7 @@ namespace eval Editor {
set regexpSet ""
set searchAll "-all"
if { [winfo exists $win] } { des`troy $win }
if { [winfo exists $win] } { destroy $win }
toplevel $win
wm transient $win .
wm overrideredirect $win 1

View File

@ -289,6 +289,9 @@ namespace eval FileOper {
}
set parent [Tree::InsertItem $tree $parent $directory "directory" [file tail $directory]]
$tree selection set $parent
foreach i [$tree children $parent] {
$tree delete $i
}
# if {[ $tree item $parent -open] eq "false"} {
# $tree item $parent -open true
# } else {

View File

@ -72,6 +72,7 @@ namespace eval Git {
puts $cmd
puts $pipe
if [regexp -nocase -- {^error:} $pipe match] {
ShowMessage "Command: '$cmd' error" $pipe
return
}
foreach line [split $pipe "\n"] {
@ -80,6 +81,8 @@ namespace eval Git {
# cd $d
.frmStatus.lblGit configure -text "[::msgcat::mc "Branch"]: [Git::Branches current]"
FileOper::ReadFolder $activeProject
if [info exists res] {
return $res
}
@ -107,6 +110,7 @@ namespace eval Git {
}
catch $cmd pipe
if [regexp -nocase -- {^fatal:} $pipe match] {
ShowMessage "Command: '$cmd' error" $pipe
return
}
foreach line [split $pipe "\n"] {
@ -130,6 +134,7 @@ namespace eval Git {
catch $cmd pipe
puts $cmd
if [regexp -nocase -- {^fatal:} $pipe match] {
ShowMessage "Command: '$cmd' error" $pipe
return
}
foreach line [split $pipe "\n"] {
@ -151,6 +156,7 @@ namespace eval Git {
catch $cmd pipe
puts $cmd
if [regexp -nocase -- {^fatal:} $pipe match] {
ShowMessage "Command: '$cmd' error" $pipe
return
}
foreach line [split $pipe "\n"] {
@ -169,6 +175,7 @@ namespace eval Git {
append cmd " $cfgVariables(gitCommand)"
append cmd " commit"
append cmd " -m"
regsub -all {\"|\'} $description {'} description
append cmd " \"$description\""
append cmd " --"
foreach item [$listBox get 0 [$listBox size]] {
@ -183,9 +190,11 @@ namespace eval Git {
}
} else {
puts $cmd
puts $description
catch $cmd pipe
puts $pipe
if [regexp -nocase -- {^fatal:} $pipe match] {
ShowMessage "Command: '$cmd' error" $pipe
return
}
foreach line [split $pipe "\n"] {
@ -258,7 +267,28 @@ namespace eval Git {
return $res
}
# git show --pretty=format:"%h;%ad;%s"
proc Reset {w} {
global activeProject cfgVariables
# puts $values
set selectedItems [$w.body.lCommit curselection]
if {$selectedItems eq ""} {return}
set cmd exec
lappend cmd $cfgVariables(gitCommand)
lappend cmd "reset"
foreach itemNumber [lsort -integer -increasing $selectedItems] {
set fileName [$w.body.lCommit get $itemNumber]
$w.body.lBox insert end $fileName
lappend cmd [file join $activeProject $fileName]
}
foreach itemNumber [lsort -integer -decreasing $selectedItems] {
$w.body.lCommit delete $itemNumber
}
catch $cmd pipe
puts $cmd
$w.body.t delete 1.0 end
}
# git show --pretty=format:"%h;%ad;%s"
proc Show {w} {
global cfgVariables activeProject
set commitString [$w.body.lLog get [$w.body.lLog curselection]]
@ -377,8 +407,13 @@ namespace eval Git {
foreach { line } [Git::Reflog] {
# puts $line
$w.body.lLog insert end $line
}
# End Git commit history
}
focus -force $w.body.lBox
catch {
$w.body.lBox activate 0
$w.body.lBox selection set 0 0
Git::ListBoxPress $w
}
}
proc AddToplevel {lbl img {win_name .auth}} {
@ -531,7 +566,10 @@ namespace eval Git {
ttk::frame $fr.header
set lblText "$activeProject | [::msgcat::mc "Branch"]: [Git::Branches current]"
ttk::label $fr.header.lblGit -text $lblText -justify right
pack $fr.header.lblGit -side right -expand true -fill x
ttk::button $fr.header.btnRefresh -image refresh_11x11 \
-command "Git::DialogUpdate $fr"
pack $fr.header.lblGit -side left -expand true -fill x
pack $fr.header.btnRefresh -side right
pack $fr.header -side top -fill x -padx 3
ttk::frame $fr.body
@ -554,7 +592,8 @@ namespace eval Git {
ttk::button $fr.body.bAdd -image forward_20x20 -compound center \
-command "Git::CommitAdd $fr"
ttk::button $fr.body.bRemove -compound center -image backward_20x20
ttk::button $fr.body.bRemove -compound center -image backward_20x20 \
-command "Git::Reset $fr"
ttk::label $fr.body.lblCommitText -padding {3 3} \
-text "[::msgcat::mc "Commit description"]:"

View File

@ -56,8 +56,8 @@ bind . <Control-K> {
}
bind . <Control-s> {FileOper::Save}
bind . <Control-S> {FileOper::Save}
bind . <Alt-p> ViewFilesTree
bind . <Alt-p> {ViewFilesTree true}
bind . <Button-3> {catch [PopupMenu %X %Y]}
#ttk::style configure TPanedwindow -background blue
#ttk::style configure Sash -sashthickness 5
@ -71,10 +71,17 @@ if [info exists cfgVariables(theme)] {
ttk::frame .frmMenu -border 0 -relief raised
ttk::frame .frmBody -border 0 -relief raised
ttk::frame .frmStatus -border 0 -relief raised
pack .frmMenu -side top -padx 1 -fill x
ttk::frame .frmStatus -border 0 -relief raised
if {$cfgVariables(menuShow) eq "true"} {
pack .frmMenu -side top -padx 1 -fill x
}
pack .frmBody -side top -padx 1 -fill both -expand true
pack .frmStatus -side top -padx 1 -fill x
if {$cfgVariables(statusBarShow) eq "true"} {
pack .frmStatus -side top -padx 1 -fill x
}
# pack .panel -expand true -fill both
# pack propagate .panel false
@ -104,12 +111,19 @@ ttk::menubutton .frmMenu.mnuHelp -text [::msgcat::mc "Help"] -menu .frmMenu.mnuH
GetHelpMenu [menu .frmMenu.mnuHelp.m]
pack .frmMenu.mnuHelp -side right
# PopUP menu
menu .popup
GetFileMenu .popup
GetEditMenu .popup
GetViewMenu .popup
set frmTool [ttk::frame .frmBody.frmTool]
ttk::panedwindow .frmBody.panel -orient horizontal -style TPanedwindow
pack propagate .frmBody.panel false
pack .frmBody.frmTool -side left -fill y
if {$cfgVariables(toolBarShow) eq "true"} {
pack .frmBody.frmTool -side left -fill y
}
pack .frmBody.panel -side left -fill both -expand true
ttk::button $frmTool.btn_tree -command ViewFilesTree -image tree_24x24

View File

@ -6,6 +6,7 @@
######################################################
# Base64 encoded Images library
######################################################
image create photo projman -data {
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
WXMAAAsSAAALEgHS3X78AAAAB3RJTUUH1AsFAhA0bYcHMAAACoFJREFUeNqlV1uMG9UZ/uZiz9ge
@ -1229,18 +1230,36 @@ image create photo key_64x64 -data {
dh5PQV++Po08melyFTqZXF95R/4NG2ENnSFASIsAAAAASUVORK5CYII=
}
image create photo new_14x14 -data {
iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9
kT1Iw0AcxV9TtVoqDlYQcchQHcSCqIijVqEIFUKt0KqDyaUfQpOGJMXFUXAtOPixWHVwcdbVwVUQ
BD9AHJ2cFF2kxP8lhRaxHhz34929x907QKgWmWa1jQGabpvJeExMZ1bEwCuC6EMXRtAhM8uYlaQE
Wo6ve/j4ehflWa3P/Tm61azFAJ9IPMMM0yZeJ57atA3O+8RhVpBV4nPiUZMuSPzIdcXjN855lwWe
GTZTyTniMLGYb2KliVnB1IgniSOqplO+kPZY5bzFWSuWWf2e/IWhrL68xHWag4hjAYuQIEJBGRso
wkaUVp0UC0naj7XwD7h+iVwKuTbAyDGPEjTIrh/8D353a+Umxr2kUAxof3GcjyEgsAvUKo7zfew4
tRPA/wxc6Q1/qQpMf5JeaWiRI6BnG7i4bmjKHnC5A/Q/GbIpu5KfppDLAe9n9E0ZoPcWCK56vdX3
cfoApKirxA1wcAgM5yl7rcW7O5t7+/dMvb8fS2tyl3d3iOIAAAAGYktHRAD/AP8A/6C9p5MAAAAJ
cEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmChUJLR1tQ+CKAAAA90lEQVQoz62SsUoEMRiEv3+N
uwfaiC9hYyuIPsL2e729jYVPYWPnGwjb5imustDqGkklCFffhs3/2+xCPLyI4ECKMDOZ5J/Af8N7
v/TeL/fxbh9hZrcppQXwAqyBlPNVIVTGcTwGLoDDXbJkxMzkJ9OvxhJkHoSq3omIZNyZmbkY40dd
1xsRUTOzqqoe2rZ9dtOVLKW0SCkdzYfVde3MTFTVxRhPZl0I4Rp4+5YAXM5v6vv+XlVd13VPwAbQ
TLvK61gD7/OmaZqbYRhOgU+gB7aZdsyNKe9KRBSwKWm7YyxO1ab1t58jIo8hhKtiHQWcAwfAKzDm
xBfyfGViwB4MCgAAAABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAABhWlDQ1BJQ0MgcHJvZmlsZQAAKJF9
kT1Iw0AcxV9TtVoqDlYQcchQHcSCqIijVqEIFUKt0KqDyaUfQpOGJMXFUXAtOPixWHVwcdbVwVUQ
BD9AHJ2cFF2kxP8lhRaxHhz34929x907QKgWmWa1jQGabpvJeExMZ1bEwCuC6EMXRtAhM8uYlaQE
Wo6ve/j4ehflWa3P/Tm61azFAJ9IPMMM0yZeJ57atA3O+8RhVpBV4nPiUZMuSPzIdcXjN855lwWe
GTZTyTniMLGYb2KliVnB1IgniSOqplO+kPZY5bzFWSuWWf2e/IWhrL68xHWag4hjAYuQIEJBGRso
wkaUVp0UC0naj7XwD7h+iVwKuTbAyDGPEjTIrh/8D353a+Umxr2kUAxof3GcjyEgsAvUKo7zfew4
tRPA/wxc6Q1/qQpMf5JeaWiRI6BnG7i4bmjKHnC5A/Q/GbIpu5KfppDLAe9n9E0ZoPcWCK56vdX3
cfoApKirxA1wcAgM5yl7rcW7O5t7+/dMvb8fS2tyl3d3iOIAAAAGYktHRAD/AP8A/6C9p5MAAAAJ
cEhZcwAADdcAAA3XAUIom3gAAAAHdElNRQfmChUJLR1tQ+CKAAAA90lEQVQoz62SsUoEMRiEv3+N
uwfaiC9hYyuIPsL2e729jYVPYWPnGwjb5imustDqGkklCFffhs3/2+xCPLyI4ECKMDOZ5J/Af8N7
v/TeL/fxbh9hZrcppQXwAqyBlPNVIVTGcTwGLoDDXbJkxMzkJ9OvxhJkHoSq3omIZNyZmbkY40dd
1xsRUTOzqqoe2rZ9dtOVLKW0SCkdzYfVde3MTFTVxRhPZl0I4Rp4+5YAXM5v6vv+XlVd13VPwAbQ
TLvK61gD7/OmaZqbYRhOgU+gB7aZdsyNKe9KRBSwKWm7YyxO1ab1t58jIo8hhKtiHQWcAwfAKzDm
xBfyfGViwB4MCgAAAABJRU5ErkJggg==
}
image create photo refresh_11x11 -data {
iVBORw0KGgoAAAANSUhEUgAAAAsAAAALCAYAAACprHcmAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9
kT1Iw0AcxV9TxaIVQTuIOGSoTlZERR21CkWoEGqFVh1MLv2CJg1Jiouj4Fpw8GOx6uDirKuDqyAI
foA4OjkpukiJ/0sKLWI9OO7Hu3uPu3eAUC0yzWobAzTdNhOxqJhKr4odr+hCLwKYxqjMLGNOkuJo
Ob7u4ePrXYRntT735+hWMxYDfCLxLDNMm3iDeGrTNjjvE4dYXlaJz4lHTLog8SPXFY/fOOdcFnhm
yEwm5olDxGKuiZUmZnlTI54kDquaTvlCymOV8xZnrVhm9XvyFwYz+soy12kOIoZFLEGCCAVlFFCE
jQitOikWErQfbeEfcP0SuRRyFcDIsYASNMiuH/wPfndrZSfGvaRgFGh/cZyPIaBjF6hVHOf72HFq
J4D/GbjSG/5SFZj5JL3S0MJHQM82cHHd0JQ94HIH6H8yZFN2JT9NIZsF3s/om9JA3y3Queb1Vt/H
6QOQpK7iN8DBITCco+z1Fu8ONPf275l6fz/H4XLJ9XN7egAAAAZiS0dEAP8A/wD/oL2nkwAAAAlw
SFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB+YLEgg6DKMFP9AAAAEtSURBVBjTldGxapNxGMXh5/2+
pGCMHUSxQyGIODiIizfQQRfBa2gc+hlQ3LR07SDZFBzy1zGTzu72BryDLlJoEMQhEjSE5HVJoI7+
xnMOhwMnrBmNRrdxFBEPsINzfK7rerhcLs/xJKCU8gif0MFvfMcuWpjiK/aqUsotfMRWZh7iWtM0
N2ez2TaOsY09aGXmq4i4HBFHTdMMN7Om0+m82+3eycyNpBURZ3iXmW9doNfrbS0Wiwner6Wf/oco
pbzGVYiIebvdftnv9/9sAqWUDoYR8a3CIQ5wkJk7+/v783/aIl7gWWZeb100MvN0PB53MCuldDLz
eWYer/e+iVJK4gvu4wqWOMMNXMKv1Wr1eDAYnFR4OplMHlZVdQ9l/dwufmTmh7qu7w4GgxP4C5QM
b3lPIiauAAAAAElFTkSuQmCC
}

View File

@ -69,16 +69,30 @@ proc GetEditMenu {m} {
proc GetViewMenu {m} {
global cfgVariables
$m add command -label [::msgcat::mc "View panel"] -command ViewFilesTree
$m add checkbutton -label [::msgcat::mc "View panel"] -command ViewFilesTree \
-variable cfgVariables(filesPanelShow) -onvalue true -offvalue false \
-accelerator "Alt+P"
menu $m.panelSide
$m add cascade -label [::msgcat::mc "Panel side"] -menu $m.panelSide
$m.panelSide add radiobutton -label [::msgcat::mc "Left"] -variable cfgVariables(filesPanelPlace) -value left
$m.panelSide add radiobutton -label [::msgcat::mc "Right"] -variable cfgVariables(filesPanelPlace) -value right
$m.panelSide add radiobutton -label [::msgcat::mc "Left"] \
-variable cfgVariables(filesPanelPlace) -value left
$m.panelSide add radiobutton -label [::msgcat::mc "Right"] \
-variable cfgVariables(filesPanelPlace) -value right
$m add checkbutton -label [::msgcat::mc "Show the Menu"] -command ViewMenu \
-variable cfgVariables(menuShow) -onvalue true -offvalue false
$m add checkbutton -label [::msgcat::mc "Toolbar"] -command ViewToolBar \
-variable cfgVariables(toolBarShow) -onvalue true -offvalue false
$m add checkbutton -label [::msgcat::mc "Statusbar"] -command ViewStatusBar \
-variable cfgVariables(statusBarShow) -onvalue true -offvalue false
$m add separator
$m add command -label [::msgcat::mc "View line numbers"] -command ViewLineNumbers
# $m add command -label [::msgcat::mc "View line numbers"] \
# -command ViewLineNumbers
$m add checkbutton -label [::msgcat::mc "View line numbers"] \
-variable cfgVariables(lineNumberShow) -onvalue true -offvalue false \
-command ViewLineNumbers
menu $m.editorWrap
$m add cascade -label [::msgcat::mc "Editors word wrapping"] -menu $m.editorWrap
$m.editorWrap add radiobutton -label [::msgcat::mc "None"] -variable cfgVariables(editorWrap) \
@ -104,3 +118,7 @@ proc GetViewMenu {m} {
proc GetHelpMenu {m} {
$m add command -label [::msgcat::mc "About ..."] -command Help::About
}
proc PopupMenu {x y} {
tk_popup .popup $x $y
}

View File

@ -193,6 +193,7 @@
::msgcat::mcset ru "Selected directory" "Директория"
::msgcat::mcset ru "Selection color" "Цвет выделения"
::msgcat::mcset ru "Settings" "Установки"
::msgcat::mcset ru "Statusbar" "Строка статуса"
::msgcat::mcset ru "Show backup files" "Показывать временные файлы"
::msgcat::mcset ru "Show the Menu" "Показывать меню"
::msgcat::mcset ru "Show dot files" "Показывать скрытые файлы"
@ -213,7 +214,7 @@
::msgcat::mcset ru "Variables" "Переменные"
::msgcat::mcset ru "Version" "Версия"
::msgcat::mcset ru "View" "Вид"
::msgcat::mcset ru "View panel" "Показывать дополнительную панель"
::msgcat::mcset ru "View panel" "Показывать панель"
::msgcat::mcset ru "Panel side" "Расположение дополнительной панели"
::msgcat::mcset ru "Left" "Слева"
::msgcat::mcset ru "Right" "Справа"

View File

@ -19,11 +19,18 @@ proc Quit {} {
}
}
proc ViewFilesTree {} {
proc ViewFilesTree {{hotkey "false"}} {
global cfgVariables
if {$cfgVariables(filesPanelShow) eq "true"} {
if {$hotkey eq "true"} {
if {$cfgVariables(filesPanelShow) eq "false"} {
set cfgVariables(filesPanelShow) true
} else {
set cfgVariables(filesPanelShow) false
}
}
if {$cfgVariables(filesPanelShow) eq "false"} {
.frmBody.panel forget .frmBody.frmTree
set cfgVariables(filesPanelShow) false
# set cfgVariables(filesPanelShow) true
} else {
switch $cfgVariables(filesPanelPlace) {
"left" {
@ -36,22 +43,50 @@ proc ViewFilesTree {} {
.frmBody.panel insert 0 .frmBody.frmTree
}
}
set cfgVariables(filesPanelShow) true
# set cfgVariables(filesPanelShow) false
}
}
proc ViewToolBar {} {
global cfgVariables
if {$cfgVariables(toolBarShow) eq "false"} {
pack forget .frmBody.frmTool
} else {
# pack
}
}
proc ViewStatusBar {} {
global cfgVariables
if {$cfgVariables(statusBarShow) eq "false"} {
pack forget .frmStatus
} else {
# pack
}
}
proc ViewMenu {} {
global cfgVariables
if {$cfgVariables(menuShow) eq "false"} {
pack forget .frmMenu
} else {
# pack
}
}
# Enable/Disabled line numbers in editor
proc ViewLineNumbers {} {
global cfgVariables nbEditor
# Changed global settigs
if {$cfgVariables(lineNumberShow) eq "true"} {
set cfgVariables(lineNumberShow) false
} else {
set cfgVariables(lineNumberShow) true
}
# if {$cfgVariables(lineNumberShow) eq "true"} {
# set cfgVariables(lineNumberShow) false
# } else {
# set cfgVariables(lineNumberShow) true
# }
# apply changes for opened tabs
foreach node [$nbEditor tabs] {
$node.frmText.t configure -linemap $cfgVariables(lineNumberShow)
if [winfo exists $node.frmText.t] {
$node.frmText.t configure -linemap $cfgVariables(lineNumberShow)
}
}
}
@ -526,3 +561,13 @@ proc FindInFilesDialog {txt {args ""}} {
}
# $win.lBox focus I001
}
proc ShowMessage {title msg} {
set answer [
tk_messageBox -message $title \
-icon info -type ok -detail $msg
]
switch $answer {
ok {return}
}
}

View File

@ -10,7 +10,7 @@ exec wish "$0" -- "$@"
######################################################
# Version: 2.0.0
# Release: alpha
# Build: 16112022162516
# Build: 18112022164357
######################################################
# определим текущую версию, релиз и т.д.

View File

@ -1084,14 +1084,16 @@ if {$argc > 1} {
puts "Usage: $argv0 <sampleFile>"
} elseif {$argc == 1} {
set filename [lindex $argv 0]
set file [open $filename]
set data [read $file [file size $filename]]
close $file
# memorize location
set regexp::data(v:dir) [file dirname $filename]
set regexp::data(v:file) [file tail $filename]
if [file exists $filename] {
set file [open $filename]
set data [read $file [file size $filename]]
close $file
# memorize location
set regexp::data(v:dir) [file dirname $filename]
set regexp::data(v:file) [file tail $filename]
} else {
set data [lindex $argv 0]
}
regexp::sample:set $data
unset data
}
@ -1366,4 +1368,3 @@ proc make-regexp::make-regexp {words} {