svk/projman
svk/projman
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Changes color setting dialog into Setting. Actualizing information into About dialog

Browse Source
This commit is contained in:
Sergey Kalinin 2018-01-11 11:04:41 +03:00
parent d12f2b8fc0
commit 9be552e424
13 changed files with 62 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -5,6 +5,12 @@
# Author: Sergey Kalinin (aka BanZaj) banzaj@lrn.ru # Author: Sergey Kalinin (aka BanZaj) banzaj@lrn.ru
######################################################### #########################################################
0.4.5
11/01/2018
- Changes color setting dialog into "Setting"
- Actualizing information into "About" dialog
0.4.4 0.4.4
19/10/2015 19/10/2015
@ -350,5 +356,6 @@ Fixed bug with PageRise function

3
editor.tcl
View File

@ -880,7 +880,7 @@ proc EditFile {node fileName} {
text $w.text\ text $w.text\
-relief sunken -wrap $editor(wrap) -highlightthickness 0 -undo 1 -font $editor(font)\ -relief sunken -wrap $editor(wrap) -highlightthickness 0 -undo 1 -font $editor(font)\
-selectborderwidth 0 -selectbackground #55c4d1 -width 10 -background $editor(bg) -foreground $editor(fg) -selectborderwidth 0 -selectbackground $editor(selectbg) -width 10 -background $editor(bg) -foreground $editor(fg)
pack $w.text -side left -fill both -expand true pack $w.text -side left -fill both -expand true
$scrwin setwidget $w.text $scrwin setwidget $w.text
@ -1157,5 +1157,6 @@ GetOp

3
help.tcl
View File

@ -135,7 +135,7 @@ proc GetContent {file} {
fconfigure $file -encoding binary fconfigure $file -encoding binary
while {[gets $file line]>=0} { while {[gets $file line]>=0} {
# if {$line == ""} { # if {$line == ""} {
# set html "<h1>Файл $file не содержит данных</h1>" # set html "<h1>æÁÊÌ $file ÎÅ ÓÏÄÅÒÖÉÔ ÄÁÎÎÙÈ</h1>"
# } # }
set line [encoding convertfrom $sourceEncode $line] set line [encoding convertfrom $sourceEncode $line]
if {[regexp -nocase "<title>.+\</title>" $line a]} { if {[regexp -nocase "<title>.+\</title>" $line a]} {
@ -358,5 +358,6 @@ proc TopLevelHelp {} {

3
install.tcl
View File

@ -8,7 +8,7 @@
########################################################### ###########################################################
## SETTING VARIABLES AND DIRECTORYES ## ## SETTING VARIABLES AND DIRECTORYES ##
set ver "0.3.8" set ver "0.4.5"
set imgDir img set imgDir img
set msgDir msgs set msgDir msgs
set docDir hlp set docDir hlp
@ -392,3 +392,4 @@ proc SetVarLang {lang} {

32
main.tcl
View File

@ -139,10 +139,10 @@ proc GetMenu {m} {
$m add command -label [::msgcat::mc "Replace"] -command ReplaceDialog -font $fontNormal\ $m add command -label [::msgcat::mc "Replace"] -command ReplaceDialog -font $fontNormal\
-accelerator "Ctrl+R" -accelerator "Ctrl+R"
$m add cascade -label [::msgcat::mc "Encode"] -menu $m.encode -font $fontNormal $m add cascade -label [::msgcat::mc "Encode"] -menu $m.encode -font $fontNormal
set me [menu $m.encode -bg $editor(bg) -fg $editor(fg)] set me [menu $m.encode -bg $editor(bg) -fg $editor(fg)]
$me add command -label [::msgcat::mc "KOI8-R"] -command {TextEncode koi8-r} -font $fontNormal $me add command -label [::msgcat::mc "KOI8-R"] -command {TextEncode koi8-r} -font $fontNormal
$me add command -label [::msgcat::mc "CP1251"] -command {TextEncode cp1251} -font $fontNormal $me add command -label [::msgcat::mc "CP1251"] -command {TextEncode cp1251} -font $fontNormal
$me add command -label [::msgcat::mc "CP866"] -command {TextEncode cp866} -font $fontNormal $me add command -label [::msgcat::mc "CP866"] -command {TextEncode cp866} -font $fontNormal
} }
GetMenu [menu .frmMenu.mnuEdit.m -bg $editor(bg) -fg $editor(fg)];# main edit menu GetMenu [menu .frmMenu.mnuEdit.m -bg $editor(bg) -fg $editor(fg)];# main edit menu
GetMenu [menu .popMnuEdit -bg $editor(bg) -fg $editor(fg)] ;# pop-up edit menu GetMenu [menu .popMnuEdit -bg $editor(bg) -fg $editor(fg)] ;# pop-up edit menu
@ -290,7 +290,7 @@ global tree noteBook
set tree [Tree $frmTree.tree \ set tree [Tree $frmTree.tree \
-relief sunken -borderwidth 1 -width 5 -height 5 -highlightthickness 1\ -relief sunken -borderwidth 1 -width 5 -height 5 -highlightthickness 1\
-redraw 0 -dropenabled 1 -dragenabled 1 -dragevent 3 \ -redraw 0 -dropenabled 1 -dragenabled 1 -dragevent 3 \
-background $editor(bg) -selectbackground "#55c4d1" \ -background $editor(bg) -selectbackground $editor(selectbg) -selectforeground white\
-droptypes { -droptypes {
TREE_NODE {copy {} move {} link {}} TREE_NODE {copy {} move {} link {}}
LISTBOX_ITEM {copy {} move {} link {}} LISTBOX_ITEM {copy {} move {} link {}}
@ -355,8 +355,6 @@ proc PopupMenuTab {menu x y} {
tk_popup $menu $x $y tk_popup $menu $x $y
} }
bind $frmTree.tree.c <Button-3> {catch [PopupMenuTree %X %Y]} bind $frmTree.tree.c <Button-3> {catch [PopupMenuTree %X %Y]}
######### DEDERER: bind Wheel Scroll ################## ######### DEDERER: bind Wheel Scroll ##################
@ -389,23 +387,3 @@ focus -force $tree

1
pane.tcl
View File

@ -97,3 +97,4 @@ namespace eval pane {

39
procedure.tcl
View File

@ -440,11 +440,11 @@ proc AboutDialog {} {
frame $w.frmlbl -borderwidth 2 -relief ridge frame $w.frmlbl -borderwidth 2 -relief ridge
label $w.frmlbl.lblVersion -text "[::msgcat::mc Version] $ver" label $w.frmlbl.lblVersion -text "[::msgcat::mc Version] $ver"
label $w.frmlbl.lblCompany -text "Copyright: Sergey Kalinin, 2001-2015" label $w.frmlbl.lblCompany -text "License: GPL"
label $w.frmlbl.lblAuthorName -text "[::msgcat::mc Author]: Sergey Kalinin" label $w.frmlbl.lblAuthorName -text "[::msgcat::mc Author]: Sergey Kalinin"
label $w.frmlbl.lblEmail -text "[::msgcat::mc E-mail]: banzaj28@gmail.com" label $w.frmlbl.lblEmail -text "[::msgcat::mc E-mail]: banzaj28@gmail.com"
label $w.frmlbl.lblWWW -fg black \ label $w.frmlbl.lblWWW -fg black \
-text "[::msgcat::mc "Home page"]:" -text "[::msgcat::mc "Home page"]: https://bitbucket.org/svk28/projman/ , https://nuk-svk.ru"
pack $w.frmlbl.lblVersion $w.frmlbl.lblCompany $w.frmlbl.lblAuthorName \ pack $w.frmlbl.lblVersion $w.frmlbl.lblCompany $w.frmlbl.lblAuthorName \
$w.frmlbl.lblEmail $w.frmlbl.lblWWW -side top -padx 5 $w.frmlbl.lblEmail $w.frmlbl.lblWWW -side top -padx 5
@ -471,15 +471,15 @@ proc AboutDialog {} {
bind $w <Escape> "$noteBook delete about" bind $w <Escape> "$noteBook delete about"
bind $w <Return> {$noteBook delete about} bind $w <Return> {$noteBook delete about}
# #
bind $w.frmlbl.lblWWW <Enter> { #bind $w.frmlbl.lblWWW <Enter> {
.frmBody.frmWork.noteBook.fabout.frmlbl.lblWWW configure -fg blue -cursor hand1 # .frmBody.frmWork.noteBook.fabout.frmlbl.lblWWW configure -fg blue -cursor hand1
LabelUpdate .frmStatus.frmHelp.lblHelp "Goto http://conero.lrn.ru" # LabelUpdate .frmStatus.frmHelp.lblHelp "Goto http://conero.lrn.ru"
} #}
bind $w.frmlbl.lblWWW <Leave> { #bind $w.frmlbl.lblWWW <Leave> {
.frmBody.frmWork.noteBook.fabout.frmlbl.lblWWW configure -fg black # .frmBody.frmWork.noteBook.fabout.frmlbl.lblWWW configure -fg black
LabelUpdate .frmStatus.frmHelp.lblHelp "" # LabelUpdate .frmStatus.frmHelp.lblHelp ""
} #}
bind $w.frmlbl.lblWWW <ButtonRelease-1> {GoToURL "http://conero.lrn.ru"} #bind $w.frmlbl.lblWWW <ButtonRelease-1> {GoToURL "http://conero.lrn.ru"}
# #
bind $w.frmlbl.lblEmail <Enter> { bind $w.frmlbl.lblEmail <Enter> {
.frmBody.frmWork.noteBook.fabout.frmlbl.lblEmail configure -fg blue -cursor hand1 .frmBody.frmWork.noteBook.fabout.frmlbl.lblEmail configure -fg blue -cursor hand1
@ -489,7 +489,7 @@ proc AboutDialog {} {
.frmBody.frmWork.noteBook.fabout.frmlbl.lblEmail configure -fg black .frmBody.frmWork.noteBook.fabout.frmlbl.lblEmail configure -fg black
LabelUpdate .frmStatus.frmHelp.lblHelp "" LabelUpdate .frmStatus.frmHelp.lblHelp ""
} }
bind $w.frmlbl.lblEmail <ButtonRelease-1> {SendEmail "http://conero.lrn.ru"} #bind $w.frmlbl.lblEmail <ButtonRelease-1> {SendEmail "http://conero.lrn.ru"}
$noteBook raise about $noteBook raise about
@ -822,6 +822,10 @@ proc Modules {} {
# TkDIFF loading # TkDIFF loading
foreach m {tkcvs tkdiff ctags tkregexp} { foreach m {tkcvs tkdiff ctags tkregexp} {
if {$tcl_platform(platform) == "unix"} { if {$tcl_platform(platform) == "unix"} {
if {$m == "tkregexp"} {
set module($m) "[file join $binDir tkregexp.tcl]"
break
}
set string [exec whereis $m] set string [exec whereis $m]
scan $string "%s%s" v module($m) scan $string "%s%s" v module($m)
if {[info exists module($m)] && [file isdirectory $module($m)] == 0} { if {[info exists module($m)] && [file isdirectory $module($m)] == 0} {
@ -829,14 +833,6 @@ proc Modules {} {
} else { } else {
set module($m) "" set module($m) ""
} }
} elseif {$tcl_platform(platform) == "mac"} {
set module($m) ""
} elseif {$tcl_platform(platform) == "windows"} {
if {$m == "tkregexp"} {
set module($m) "[file join $binDir tkregexp.tcl]"
} else {
set module($m) ""
}
} }
} }
} }
@ -1115,3 +1111,6 @@ proc TextOperation {oper} {

2
projects.tcl
View File

@ -11,6 +11,7 @@ proc NewProjDialog {type} {
set w .newProj set w .newProj
# destroy the find window if it already exists # destroy the find window if it already exists
if {[winfo exists $w]} { if {[winfo exists $w]} {
destroy $w destroy $w
} }
@ -903,3 +904,4 @@ proc InsertTitle {newFile type} {
close $pipe close $pipe
} }

1
projman.conf
View File

@ -73,3 +73,4 @@ set color(sql) "#620095"

4
projman.tcl Normal file → Executable file
View File

@ -8,7 +8,7 @@
########################################################### ###########################################################
########## VERSION INFORMATION ########## ########## VERSION INFORMATION ##########
set ver "0.3.8" set ver "0.4.5"
package require BWidget package require BWidget
package require msgcat package require msgcat
@ -24,6 +24,7 @@ if {[file exists $env(HOME)/projects/tcl/projman]==1} {
set imgDir "[file join $env(HOME) projects tcl projman img]" set imgDir "[file join $env(HOME) projects tcl projman img]"
set msgDir "[file join $env(HOME) projects tcl projman msgs]" set msgDir "[file join $env(HOME) projects tcl projman msgs]"
set hlDir "[file join $env(HOME) projects tcl projman highlight]" set hlDir "[file join $env(HOME) projects tcl projman highlight]"
set binDir "[file join $env(HOME) projects tcl projman]"
} else { } else {
set binDir [file join $rootDir bin] set binDir [file join $rootDir bin]
set dataDir [file join $rootDir share projman] set dataDir [file join $rootDir share projman]
@ -98,5 +99,6 @@ foreach file [lsort [glob -nocomplain [file join $hlDir *.tcl]]] {
set editor(selectBorder) "0" set editor(selectBorder) "0"
#option add *tree.foreground red widgetDefault

44
settings.tcl
View File

@ -635,23 +635,23 @@ proc ConfigureEnt {col} {
global editor color global editor color
global main editFrm network global main editFrm network
$editFrm.frmColorEditFG.txtColorEditFG configure -background $col $editFrm.frmColorEditFG.txtColorEditFG configure -background $col
$editFrm.frmColorProc.txtColorProc configure -background $col $editFrm.frmColorProc.txtColorProc configure -background $col -fg $color(procName)
$editFrm.frmColorKeyWord.txtColorKeyWord configure -background $col $editFrm.frmColorKeyWord.txtColorKeyWord configure -background $col -fg $color(keyWord)
$editFrm.frmColorParam.txtColorParam configure -background $col $editFrm.frmColorParam.txtColorParam configure -background $col -fg $color(param)
$editFrm.frmColorSubParam.txtColorSubParam configure -background $col $editFrm.frmColorSubParam.txtColorSubParam configure -background $col -fg $color(subParam)
$editFrm.frmColorComments.txtColorComments configure -background $col $editFrm.frmColorComments.txtColorComments configure -background $col -fg $color(comments)
$editFrm.frmColorVar.txtColorVar configure -background $col $editFrm.frmColorVar.txtColorVar configure -background $col -fg $color(var)
$editFrm.frmColorString.txtColorString configure -background $col $editFrm.frmColorString.txtColorString configure -background $col -fg $color(string)
$editFrm.frmColorBrace.txtColorBrace configure -background $col $editFrm.frmColorBrace.txtColorBrace configure -background $col -fg $color(brace)
$editFrm.frmColorBraceQuad.txtColorBraceQuad configure -background $col $editFrm.frmColorBraceQuad.txtColorBraceQuad configure -background $col -fg $color(bracequad)
$editFrm.frmColorBraceBG.txtColorBraceBG configure -background $col $editFrm.frmColorBraceBG.txtColorBraceBG configure -background $col -fg $color(braceBG)
$editFrm.frmColorBraceFG.txtColorBraceFG configure -background $col $editFrm.frmColorBraceFG.txtColorBraceFG configure -background $col -fg $color(braceFG)
$editFrm.frmColorPercent.txtColorPercent configure -background $col $editFrm.frmColorPercent.txtColorPercent configure -background $col -fg $color(percent)
$editFrm.frmColorBindKey.txtColorBindKey configure -background $col $editFrm.frmColorBindKey.txtColorBindKey configure -background $col -fg $color(bindKey)
$editFrm.frmColorLabel.txtColorLabel configure -background $col $editFrm.frmColorLabel.txtColorLabel configure -background $col -fg $color(label)
$editFrm.frmColorSixFG.txtColorSixFG configure -background $col $editFrm.frmColorSixFG.txtColorSixFG configure -background $col -fg $color(sixFG)
$editFrm.frmColorSixBG.txtColorSixBG configure -background $col $editFrm.frmColorSixBG.txtColorSixBG configure -background $col -fg $color(sixBG)
$editFrm.frmColorSQL.txtColorSQL configure -background $col $editFrm.frmColorSQL.txtColorSQL configure -background $col -fg $color(sql)
} }
## READ CONFIG FILE ## ## READ CONFIG FILE ##
@ -858,13 +858,3 @@ proc SaveSettings {} {
$noteBook raise [$noteBook page end] $noteBook raise [$noteBook page end]
} }

1
supertext.tcl
View File

@ -384,3 +384,4 @@ proc supertext::text_index {w i} {

0
tkregexp.tcl Normal file → Executable file
View File