- Remove ctags support

- Added gitk (gui for git) support
This commit is contained in:
svk 2018-01-22 17:54:18 +03:00
parent fed94c1f9a
commit a803217d10
3 changed files with 18 additions and 39 deletions

View File

@ -7,6 +7,10 @@
0.4.5 0.4.5
22/01/2018
- Remove ctags support
- Added gitk (gui for git) support
11/01/2018 11/01/2018
- Changes color setting dialog into "Setting" - Changes color setting dialog into "Setting"
- Actualizing information into "About" dialog - Actualizing information into "About" dialog
@ -363,5 +367,6 @@ Fixed bug with PageRise function

View File

@ -171,9 +171,9 @@ if {$module(tkdiff) != ""} {
if {$module(tkregexp) != ""} { if {$module(tkregexp) != ""} {
$m add command -label "TkREGEXP" -command {DoModule tkregexp} -font $fontNormal $m add command -label "TkREGEXP" -command {DoModule tkregexp} -font $fontNormal
} }
if {$module(ctags) != ""} { if {$module(gitk) != ""} {
$m add command -label "CTags" -font $fontNormal -command { $m add command -label "Gitk" -font $fontNormal -command {
DoModule ctags DoModule gitk
GetTagList [file join $workDir $activeProject.tags] ;# geting tag list GetTagList [file join $workDir $activeProject.tags] ;# geting tag list
} }
} }
@ -385,3 +385,4 @@ $tree configure -redraw 1
set activeProject "" set activeProject ""
focus -force $tree focus -force $tree

View File

@ -401,23 +401,6 @@ proc GetProj {tree} {
-image [Bitmap::get [file join $imgDir folder.gif]] -image [Bitmap::get [file join $imgDir folder.gif]]
GetFiles [file join $string] $prjName $tree GetFiles [file join $string] $prjName $tree
set dir $string set dir $string
if {$module(ctags) != ""} {
if {[catch {cd $dir}] != 0} {
return ""
}
if {[file exists [file join $workDir $prjName.tags]] == 1} {
GetTagList_ [file join $workDir $prjName.tags] ;# geting tag list
} else {
set curDir [pwd]
set tagFile [file join $workDir $prjName.tags]
set pipe [open "|ctags -R --sort=yes --tcl-types=p -h -l -f $tagFile" "r"]
#fileevent $pipe readable
#fconfigure $pipe -buffering none -blocking no
if {[catch {cd $curDir}] != 0} {
return ""
}
}
}
} }
} }
} }
@ -678,7 +661,7 @@ proc Progress {oper} {
} elseif {$oper == "stop"} { } elseif {$oper == "stop"} {
destroy .frmStatus.frmProgress.lblProgress.progress destroy .frmStatus.frmProgress.lblProgress.progress
} }
# ProgUpdate # ProgUpdate
} }
proc ProgUpdate { } { proc ProgUpdate { } {
global progval global progval
@ -820,7 +803,7 @@ proc Modules {} {
global tcl_platform global tcl_platform
global module tclDir dataDir binDir global module tclDir dataDir binDir
# TkDIFF loading # TkDIFF loading
foreach m {tkcvs tkdiff ctags tkregexp} { foreach m {tkcvs tkdiff gitk tkregexp} {
if {$tcl_platform(platform) == "unix"} { if {$tcl_platform(platform) == "unix"} {
if {$m == "tkregexp"} { if {$m == "tkregexp"} {
set module($m) "[file join $binDir tkregexp.tcl]" set module($m) "[file join $binDir tkregexp.tcl]"
@ -944,22 +927,11 @@ proc DoModule {mod} {
fileevent $pipe readable fileevent $pipe readable
fconfigure $pipe -buffering none -blocking no fconfigure $pipe -buffering none -blocking no
} }
ctags { gitk {
if {[catch {cd $dir}] != 0} { set pipe [open "|$module(gitk)" "r"]
return "" fileevent $pipe readable
fconfigure $pipe -buffering none -blocking no
} }
if {$module(ctags) == ""} {
return
}
set tagFile [file join $workDir $activeProject.tags]
set pipe [open "|ctags -R --sort=yes --tcl-types=p -h -l -f $tagFile" "r"]
#fileevent $pipe readable
#fconfigure $pipe -buffering none -blocking no
if {[catch {cd $curDir}] != 0} {
return ""
}
}
} }
} }
@ -1117,3 +1089,4 @@ proc TextOperation {oper} {