From 472ff86c2b5d57474bd036252eb5d9d11b2b116a Mon Sep 17 00:00:00 2001 From: Sergey Kalinin Date: Thu, 11 Jan 2018 14:42:43 +0300 Subject: [PATCH] - Corrected color settings for all widgets - Change default color scheme --- BUGS | 44 ++++++++-------- CHANGELOG | 4 ++ TODO | 18 ++++--- editor.tcl | 6 ++- help.tcl | 124 ++++++++++++++++++++++---------------------- main.tcl | 3 ++ procedure.tcl | 1 + projman.conf | 49 ++++++++---------- projman.tcl | 32 +++++++++++- settings.tcl | 139 ++++++++++++++++++++++++++------------------------ 10 files changed, 236 insertions(+), 184 deletions(-) diff --git a/BUGS b/BUGS index f467a3b..3edcaf9 100644 --- a/BUGS +++ b/BUGS @@ -5,31 +5,33 @@ # Copyright (c) "CONERO lab", 2002, http://conero.lrn.ru ###################################################### -- Файл проекта, убрать расширение -- Глюки подсветки +- п╓п╟п╧п╩ п©я─п╬п╣п╨я┌п╟, я┐п╠я─п╟я┌я▄ я─п╟я│я┬п╦я─п╣п╫п╦п╣ +- п⌠п╩я▌п╨п╦ п©п╬п╢я│п╡п╣я┌п╨п╦ -* Изменение размера шрифтов для редактора вступает в силу только после -перезагрузки, что не очень-то удобно. +* п≤п╥п╪п╣п╫п╣п╫п╦п╣ я─п╟п╥п╪п╣я─п╟ я┬я─п╦я└я┌п╬п╡ п╢п╩я▐ я─п╣п╢п╟п╨я┌п╬я─п╟ п╡я│я┌я┐п©п╟п╣я┌ п╡ я│п╦п╩я┐ я┌п╬п╩я▄п╨п╬ п©п╬я│п╩п╣ +п©п╣я─п╣п╥п╟пЁя─я┐п╥п╨п╦, я┤я┌п╬ п╫п╣ п╬я┤п╣п╫я▄-я┌п╬ я┐п╢п╬п╠п╫п╬. -* При запуске приходится делать лишнее усилие по открытию root -элемента в TreeView. Сделай это по умолчанию автоматом, плиз. И чтобы -это также работало при команде refresh. +* п÷я─п╦ п╥п╟п©я┐я│п╨п╣ п©я─п╦я┘п╬п╢п╦я┌я│я▐ п╢п╣п╩п╟я┌я▄ п╩п╦я┬п╫п╣п╣ я┐я│п╦п╩п╦п╣ п©п╬ п╬я┌п╨я─я▀я┌п╦я▌ root +я█п╩п╣п╪п╣п╫я┌п╟ п╡ TreeView. п║п╢п╣п╩п╟п╧ я█я┌п╬ п©п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌ п╟п╡я┌п╬п╪п╟я┌п╬п╪, п©п╩п╦п╥. п≤ я┤я┌п╬п╠я▀ +я█я┌п╬ я┌п╟п╨п╤п╣ я─п╟п╠п╬я┌п╟п╩п╬ п©я─п╦ п╨п╬п╪п╟п╫п╢п╣ refresh. -* Есть refresh для TreeView хорошо бы тогда чтобы он или другая -функция обновляла syntax hightlight, а то когда большие куски -ставляешь кода и он их не рассчвечивает неудобно. +* п∙я│я┌я▄ refresh п╢п╩я▐ TreeView я┘п╬я─п╬я┬п╬ п╠я▀ я┌п╬пЁп╢п╟ я┤я┌п╬п╠я▀ п╬п╫ п╦п╩п╦ п╢я─я┐пЁп╟я▐ +я└я┐п╫п╨я├п╦я▐ п╬п╠п╫п╬п╡п╩я▐п╩п╟ syntax hightlight, п╟ я┌п╬ п╨п╬пЁп╢п╟ п╠п╬п╩я▄я┬п╦п╣ п╨я┐я│п╨п╦ +я│я┌п╟п╡п╩я▐п╣я┬я▄ п╨п╬п╢п╟ п╦ п╬п╫ п╦я┘ п╫п╣ я─п╟я│я│я┤п╡п╣я┤п╦п╡п╟п╣я┌ п╫п╣я┐п╢п╬п╠п╫п╬. + +* п÷я─п╦ п╡п╡п╬п╢п╣ я┌п╣п╨я│я┌п╟ п╣я│п╩п╦ п╡п╡п╣я│я┌п╦ proc, я┌п╬ я┌п╡п╬п╧ я─п╣п╢п╟п╨я┌п╬я─ п©п╬п╢я│я┌п╟п╡п╦я┌ +п╟п╡я┌п╬п╪п╟я┌п╬п╪ я│п╨п╬п╠п╨п╦. п▓п╬п╬п╠я┴п╣-я┌п╬ я█я┌п╬ п╫п╣ п╬я┤п╣п╫я▄ п©я─п╟п╡п╦п╩я▄п╫п╬, п╨ п©я─п╦п╪п╣я─я┐ я▐ +я│я┌п╟п╡п╩я▌ п©п╬я│п╩п╣ я└я┐п╫п╨я├п╦п╦ п╨п╬п╪п╪п╣п╫я┌п╟я─п╦п╧ п╡п╦п╢п╟ } ;# proc testFunct +п≤ п╡п╬я┌ я┌я┐я┌ п╬п╫ п╡я│я┌п╟п╡п╩я▐п╣я┌ п╫п╣ п╫я┐п╤п╫я▀п╣ п╪п╫п╣ я│п╣п╧я┤п╟я│ п╨п╬п╡я▀я┤п╨п╦. п÷п╬ п╦п╢п╣п╦ п╫п╟п╢п╬ п╡ +balloon п╬п╨п╫п╣ п©п╬п╨п╟п╥п╟я┌я▄ я└п╬я─п╪п╟я┌ я█я┌п╬п╧ п╨п╬п╪п╟п╫п╢я▀ (я┌п╟п╨п╤п╣ п╢п╩я▐ п╡я│п╣ п╬я│я┌п╟п╩я▄п╫я▀я┘). +п÷п╬я│п╪п╬я┌я─п╦ п╨п╟п╨ я█я┌п╬ я│п╢п╣п╩п╟п╫п╬ п╡ VisualBasic п╡п╣я─я│п╦п╦ > 4. п░ я┌п╟п╨ п╣я│я┌я▄ п╣я┴п╣ +п╬п╢п╦п╫ п╠п╟пЁ. п∙я│п╩п╦ я┐ п╪п╣п╫я▐ п©п╣я─п╣п╢ п╨п╬п╪п╟п╫п╢п╬п╧ proc я│я┌п╬я▐я┌ п©я─п╬п╠п╣п╩я▀, я┌п╬ я┌п╬я┤п╫п╬ +я┌п╟п╨п╬п╣ п╤п╣ п╦я┘ п╨п╬п╩п╦я┤п╣я│я┌п╡п╬ п╢п╬п╩п╤п╫п╬ я│я┌п╬я▐я┌я▄ п╦ п©п╬я│п╩п╣ п©п╬я│п╩п╣п╢п╫п╣п╧ п╥п╟п╨я─я▀п╡п╟я▌я┴п╣п╧ +я│п╨п╬п╠п╨п╬п╧ п╦п╫п╟я┤п╣ п╡я│п╣ я└п╬я─п╪п╟я┌п╦я─п╬п╡п╟п╫п╦п╣ п╣п╢п╦я┌ п╦ п╫п╟п╢п╬ п©я─п╟п╡п╦я┌я▄ я─я┐я┤п╨п╟п╪п╦. + +- п÷я─п╦ я┐я│я┌п╟п╫п╬п╡п╨п╦ п©п╣я─п╣п╪п╣п╫п╫п╬п╧ editor(wrap) п╥п╫п╟я┤п╣п╫п╦я▐ none п╫п╟ п╢п╩п╦п╫п╫я▀я┘ я│я┌я─п╬п╨п╟я┘ п©я─п╦ п©п╬я▐п╡п╩п╣п╫п╦п╦п╦ п╫п╦п╤п╫п╣пЁп╬ я│п╨я─п╬п╩п╠п╟я─п╟ п╫п╟п╠п╩я▌п╢п╟п╣я┌я│я▐ пЁп╩я▌п╨ п©п╬п╨п╟ п╫п╣ п╬п╠я┼я▐я│п╫п╦п╪я▀п╧ :( +п║п╨я─п╬п╩ п╠п╟я─ п╫п╟я┤п╦п╫п╟п╣я┌ п╪п╣я─я├п╟я┌я▄ (я┌п╬ п©п╬я▐п╡п╦я┌я▄я│я▐ я┌п╬ п╦я│я┤п╣п╥п╫п╣я┌) -* При вводе текста если ввести proc, то твой редактор подставит -автоматом скобки. Вообще-то это не очень правильно, к примеру я -ставлю после функции комментарий вида } ;# proc testFunct -И вот тут он вставляет не нужные мне сейчас ковычки. По идеи надо в -balloon окне показать формат этой команды (также для все остальных). -Посмотри как это сделано в VisualBasic версии > 4. А так есть еще -один баг. Если у меня перед командой proc стоят пробелы, то точно -такое же их количество должно стоять и после последней закрывающей -скобкой иначе все форматирование едит и надо править ручками. -- При установки переменной editor(wrap) значения none на длинных строках при появлениии нижнего скролбара наблюдается глюк пока не объяснимый :( -Скрол бар начинает мерцать (то появиться то исчезнет) diff --git a/CHANGELOG b/CHANGELOG index 102e277..95174b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,8 @@ 11/01/2018 - Changes color setting dialog into "Setting" - Actualizing information into "About" dialog +- Corrected color settings for all widgets +- Change default color scheme 0.4.4 @@ -356,6 +358,8 @@ Fixed bug with PageRise function + + diff --git a/TODO b/TODO index f8ccfd6..64f34c3 100644 --- a/TODO +++ b/TODO @@ -14,11 +14,11 @@ -- on/off highligttning -- on/off - Add color scheme -- Переключение закладок с помощью Alt+> Alt+< -- перед первой фукнцией возможность перейти в начало документа, а после последней на конец -документа -- В статусбаре самый последнее поле (правое) где тест file saved уж -больно большое для таких кратких сообщений. +- п÷п╣я─п╣п╨п╩я▌я┤п╣п╫п╦п╣ п╥п╟п╨п╩п╟п╢п╬п╨ я│ п©п╬п╪п╬я┴я▄я▌ Alt+> Alt+< +- п©п╣я─п╣п╢ п©п╣я─п╡п╬п╧ я└я┐п╨п╫я├п╦п╣п╧ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п©п╣я─п╣п╧я┌п╦ п╡ п╫п╟я┤п╟п╩п╬ п╢п╬п╨я┐п╪п╣п╫я┌п╟, п╟ п©п╬я│п╩п╣ п©п╬я│п╩п╣п╢п╫п╣п╧ п╫п╟ п╨п╬п╫п╣я├ +п╢п╬п╨я┐п╪п╣п╫я┌п╟ +- п▓ я│я┌п╟я┌я┐я│п╠п╟я─п╣ я│п╟п╪я▀п╧ п©п╬я│п╩п╣п╢п╫п╣п╣ п©п╬п╩п╣ (п©я─п╟п╡п╬п╣) пЁп╢п╣ я┌п╣я│я┌ file saved я┐п╤ +п╠п╬п╩я▄п╫п╬ п╠п╬п╩я▄я┬п╬п╣ п╢п╩я▐ я┌п╟п╨п╦я┘ п╨я─п╟я┌п╨п╦я┘ я│п╬п╬п╠я┴п╣п╫п╦п╧. - Edit Window split 2. An package managers system independed files @@ -67,9 +67,9 @@ 11. Multiplatform featuring - Windows printing -фолдинг -поддержка frink (автоформаттер) -нумерация строк +я└п╬п╩п╢п╦п╫пЁ +п©п╬п╢п╢п╣я─п╤п╨п╟ frink (п╟п╡я┌п╬я└п╬я─п╪п╟я┌я┌п╣я─) +п╫я┐п╪п╣я─п╟я├п╦я▐ я│я┌я─п╬п╨ @@ -80,3 +80,5 @@ + + diff --git a/editor.tcl b/editor.tcl index d96f2ed..c72d9c6 100644 --- a/editor.tcl +++ b/editor.tcl @@ -673,6 +673,8 @@ proc BraceHighLight {text} { # _searchCloseBracket $text \{ \} insert end] } + + ## NOTEBOOK PAGE SWITCHER ## ## NOTEBOOK PAGE SWITCHER ## proc PageTab {key} { @@ -932,7 +934,7 @@ proc EditFile {node fileName} { close $file $w.text mark set insert 0.0 $w.text see insert - $w.text tag configure lightBracket -background #000000 -foreground #00feff + $w.text tag configure lightBracket -background #000000 -foreground #00ffff # key bindings # set text $w.text @@ -1134,3 +1136,5 @@ proc SelectAll {text} { #################################### GetOp + + diff --git a/help.tcl b/help.tcl index 362c05c..afac26c 100644 --- a/help.tcl +++ b/help.tcl @@ -123,7 +123,7 @@ proc SearchWord {word} { } ## GETTING CONTENT FROM FILES ## proc GetContent {file} { - global docDir hlpNoteBook fontNormal sourceEncode + global docDir hlpNoteBook fontNormal sourceEncode editor $hlpNoteBook raise [$hlpNoteBook page 0] set node [$hlpNoteBook raise] if {$node != ""} { @@ -201,7 +201,7 @@ proc LinkCallback_ {w url} { ## MAIN HELP WINDOW ## proc TopLevelHelp {} { global fontNormal fontBold hlpTree hlpNoteBook nBookTree homeDir docDir lstSearch w frmSrchList - global imgDir + global imgDir color editor set w .help set w_exist [winfo exists $w] if !$w_exist { @@ -236,7 +236,7 @@ proc TopLevelHelp {} { $w.frmTool.btnRefresh configure -image imgRefresh $w.frmTool.btnPrint configure -image imgPrint pack $w.frmTool.btnBack $w.frmTool.btnForward $w.frmTool.btnRefresh $w.frmTool.btnPrint\ - -side left -fill x + -side left -fill x set frmCat [frame $w.frmBody.frmCat -border 1 -relief sunken] @@ -244,7 +244,7 @@ proc TopLevelHelp {} { set frmWork [frame $w.frmBody.frmWork -border 1 -relief sunken] pack $frmWork -side left -fill both -expand true - set nBookTree [NoteBook $frmCat.nBookTree -font $fontNormal] + set nBookTree [NoteBook $frmCat.nBookTree -font $fontNormal -bg $editor(bg) -fg $editor(fg)] pack $nBookTree -fill both -expand true -padx 2 -pady 2 set frmTreeNb [$nBookTree insert end hlpTree -text "[::msgcat::mc "Contents"]"] set frmSearch [$nBookTree insert end hlpSearch -text "[::msgcat::mc "Search"]"] @@ -253,64 +253,64 @@ proc TopLevelHelp {} { set frmScrlX [frame $frmTreeNb.frmScrlX -border 0 -relief sunken] set frmTree [frame $frmTreeNb.frmTree -border 1 -relief sunken] set hlpTree [Tree $frmTree.tree \ - -relief sunken -borderwidth 1 -width 20 -highlightthickness 0\ - -redraw 0 -dropenabled 1 -dragenabled 1 -dragevent 3 \ - -yscrollcommand {.help.frmBody.frmCat.nBookTree.fhlpTree.frmTree.scrlY set} \ - -xscrollcommand {.help.frmBody.frmCat.nBookTree.fhlpTree.frmScrlX.scrlX set} \ - -background "#d3d3d3" -selectbackground "#55c4d1" \ - -droptypes { + -relief sunken -borderwidth 1 -width 20 -highlightthickness 0\ + -redraw 0 -dropenabled 1 -dragenabled 1 -dragevent 3 \ + -yscrollcommand {.help.frmBody.frmCat.nBookTree.fhlpTree.frmTree.scrlY set} \ + -xscrollcommand {.help.frmBody.frmCat.nBookTree.fhlpTree.frmScrlX.scrlX set} \ + -selectbackground "#55c4d1" \ + -droptypes { TREE_NODE {copy {} move {} link {}} LISTBOX_ITEM {copy {} move {} link {}} } -opencmd "" -closecmd ""] - pack $frmTree -side top -fill y -expand true - pack $frmScrlX -side top -fill x - - scrollbar $frmTree.scrlY -command {$hlpTree yview} \ - -borderwidth {1} -width {10} -takefocus 0 - pack $hlpTree $frmTree.scrlY -side left -fill y - - scrollbar $frmScrlX.scrlX -command {$hlpTree xview} \ - -orient horizontal -borderwidth {1} -width {10} -takefocus 0 - pack $frmScrlX.scrlX -fill x -expand true - - set frmSrchList [frame $frmSearch.frmScrhList -border 0 -relief sunken] - set frmSrchEnt [frame $frmSearch.frmScrhEnt -border 0 -relief sunken] - set frmSrchScrollX [frame $frmSearch.frmScrhScrollX -border 0 -relief sunken] - pack $frmSrchEnt -side top -fill x - pack $frmSrchList -side top -fill both -expand true - pack $frmSrchScrollX -side top -fill x - - entry $frmSrchEnt.entSearch - set lstSearch [listbox $frmSrchList.lstSearch -font $fontNormal\ - -yscrollcommand\ - {.help.frmBody.frmCat.nBookTree.fhlpSearch.frmScrhList.scrListY set}\ - -xscrollcommand\ - {.help.frmBody.frmCat.nBookTree.fhlpSearch.frmScrhScrollX.scrListX set}\ - -selectmode single -selectbackground #55c4d1\ - -selectborderwidth 0] - scrollbar $frmSrchList.scrListY -command\ - {$frmSrchList.lstSearch yview} -borderwidth {1} -width {10} -takefocus 0 - - pack $frmSrchEnt.entSearch -side top -fill x -expand true - - pack $frmSrchList.lstSearch -side left -fill both -expand true - pack $frmSrchList.scrListY -side left -fill y - - scrollbar $frmSrchScrollX.scrListX -orient horizontal -command\ - {$frmSrchList.lstSearch xview} -borderwidth {1} -width {10} -takefocus 0 - pack $frmSrchScrollX.scrListX -fill x -# $hlpTree bindText [puts %k] -# $hlpTree bindText [puts %k] -# bind $frmTree {$frmSrchList.lstSearch xview} - # $hlpTree bindText "HlpTreeDoubleClick [$hlpTree selection get]" - # $hlpTree bindImage "HlpTreeDoubleClick [$hlpTree selection get]" - $hlpTree bindText "HlpTreeOneClick [$hlpTree selection get]" - $hlpTree bindImage "HlpTreeOneClick [$hlpTree selection get]" - bind .help "destroy .help" - -# bind $frmSrchEnt.entSearch \ -# {SearchWord [Text .help.frmBody.frmCat.nBookTree.fhlpSearch.frmScrhEnt.entSearch]} + pack $frmTree -side top -fill y -expand true + pack $frmScrlX -side top -fill x + + scrollbar $frmTree.scrlY -command {$hlpTree yview} \ + -borderwidth {1} -width {10} -takefocus 0 + pack $hlpTree $frmTree.scrlY -side left -fill y + + scrollbar $frmScrlX.scrlX -command {$hlpTree xview} \ + -orient horizontal -borderwidth {1} -width {10} -takefocus 0 + pack $frmScrlX.scrlX -fill x -expand true + + set frmSrchList [frame $frmSearch.frmScrhList -border 0 -relief sunken] + set frmSrchEnt [frame $frmSearch.frmScrhEnt -border 0 -relief sunken] + set frmSrchScrollX [frame $frmSearch.frmScrhScrollX -border 0 -relief sunken] + pack $frmSrchEnt -side top -fill x + pack $frmSrchList -side top -fill both -expand true + pack $frmSrchScrollX -side top -fill x + + entry $frmSrchEnt.entSearch + set lstSearch [listbox $frmSrchList.lstSearch -font $fontNormal\ + -yscrollcommand\ + {.help.frmBody.frmCat.nBookTree.fhlpSearch.frmScrhList.scrListY set}\ + -xscrollcommand\ + {.help.frmBody.frmCat.nBookTree.fhlpSearch.frmScrhScrollX.scrListX set}\ + -selectmode single -selectbackground #55c4d1\ + -selectborderwidth 0] + scrollbar $frmSrchList.scrListY -command\ + {$frmSrchList.lstSearch yview} -borderwidth {1} -width {10} -takefocus 0 + + pack $frmSrchEnt.entSearch -side top -fill x -expand true + + pack $frmSrchList.lstSearch -side left -fill both -expand true + pack $frmSrchList.scrListY -side left -fill y + + scrollbar $frmSrchScrollX.scrListX -orient horizontal -command\ + {$frmSrchList.lstSearch xview} -borderwidth {1} -width {10} -takefocus 0 + pack $frmSrchScrollX.scrListX -fill x + # $hlpTree bindText [puts %k] + # $hlpTree bindText [puts %k] + # bind $frmTree {$frmSrchList.lstSearch xview} + # $hlpTree bindText "HlpTreeDoubleClick [$hlpTree selection get]" + # $hlpTree bindImage "HlpTreeDoubleClick [$hlpTree selection get]" + $hlpTree bindText "HlpTreeOneClick [$hlpTree selection get]" + $hlpTree bindImage "HlpTreeOneClick [$hlpTree selection get]" + bind .help "destroy .help" + + # bind $frmSrchEnt.entSearch \ + # {SearchWord [Text .help.frmBody.frmCat.nBookTree.fhlpSearch.frmScrhEnt.entSearch]} #bind $w exit #bind $frmTree {TreeClick [$hlpTree selection get]} @@ -321,11 +321,11 @@ proc TopLevelHelp {} { bind $frmTree.tree.c "$hlpTree xview scroll -2 units" bind $frmTree.tree.c "$hlpTree xview scroll 2 units" - set hlpNoteBook [NoteBook $frmWork.hlpNoteBook -font $fontNormal] + set hlpNoteBook [NoteBook $frmWork.hlpNoteBook -font $fontNormal -bg $editor(bg) -fg $editor(fg)] pack $hlpNoteBook -fill both -expand true -padx 2 -pady 2 GetTOC } - + } ################################################## @@ -354,6 +354,10 @@ proc TopLevelHelp {} { + + + + diff --git a/main.tcl b/main.tcl index 8800f5a..af21c34 100644 --- a/main.tcl +++ b/main.tcl @@ -387,3 +387,6 @@ focus -force $tree + + + diff --git a/procedure.tcl b/procedure.tcl index 3e2ac08..a215dc2 100644 --- a/procedure.tcl +++ b/procedure.tcl @@ -1114,3 +1114,4 @@ proc TextOperation {oper} { + diff --git a/projman.conf b/projman.conf index df43f6b..526bd59 100644 --- a/projman.conf +++ b/projman.conf @@ -1,10 +1,12 @@ ########################################################### # TCL/Tk Project Manager # -# version 0.0.1 # +# version 0.3.8 # # # # Copyright (c) "CONERO lab", 2001, http://conero.lrn.ru # # Authors: Sergey Kalinin (aka BanZaj) banzaj@lrn.ru # ########################################################### +# Modification date: п╖я┌ я▐п╫п╡ 11 10:38:33 MSK 2018 +########################################################### # Normal Font set fontNormal "helvetica 10 normal roman" @@ -13,64 +15,57 @@ set fontBold "helvetica 10 bold roman" # ToolBar on/off (Yes/No) set toolBar "Yes" +set backUpFileShow "No" set backUpFileCreate "No" set backUpFileDelete "No" -set backUpFileShow "No" - -set autoFormat "Yes" +# Don't edit this line # Directorys Settings # set projDir "$env(HOME)/projects/tcl" set rpmDir "$workDir/rpm" set tgzDir "$workDir/tgz" - # File mask # set rpmNamed "projectName-version-release" set tgzNamed "projectName-version-release" # Locale setting set locale "en" +set autoFormat "Yes" -## EDITOR INTERFACE SETTINGS ## # Editor Font # set editor(font) "courier 10 normal roman" # Editor Bold Font # set editor(fontBold) "courier 10 bold roman" # background color # -set editor(bg) "#dbdbdb" +set editor(bg) "#333333" # foreground color # -set editor(fg) "#000000" +set editor(fg) "#cccccc" # selection background color # -set editor(selectbg) "#55c4d1" +set editor(selectbg) "#10a410a410a4" # NoteBook title normal font color # set editor(nbNormal) "#000000" # NoteBook title modify font color # -set editor(nbModify) "#0021ff" +set editor(nbModify) "#ffff5d705d70" # selection border width # set editor(selectBorder) "0" # Editor wraping # # must be: none, word or char set editor(wrap) "word" - ## SOURCE CODE HIGHLIGTNING ## -set color(procName) "#0021ff" -set color(keyWord) "#0000a8" -set color(param) "#6a0082" -set color(subParam) "#008282" -set color(comments) "#9b9b9b" -set color(var) "#e50000" -set color(string) "#168400" -set color(brace) "#d33434" +set color(procName) "#00ffff" +set color(keyWord) "#0000ce149c9e" +set color(param) "#d5547f71d9d9" +set color(subParam) "#d5547f71d9d9" +set color(comments) "#000000" +set color(var) "#30a489cdffff" +set color(string) "#9ae199540000" +set color(brace) "#d9d93f2d3f2d" +set color(bracequad) "#ffff75c2fe9d" set color(braceBG) "#000000" set color(braceFG) "#43ff00" -set color(bracequad) "#990099" -set color(percent) "#a500c6" -set color(bindKey) "#a500c6" +set color(percent) "#ffff00" +set color(bindKey) "#ffffaa3df9fe" set color(label) "#c9c9c9" set color(sixFG) "#ff0000" set color(sixBG) "#ffdbdb" -set color(sql) "#620095" - - - - +set color(sql) "#ffff828f0000" diff --git a/projman.tcl b/projman.tcl index ca0d3ea..b794b51 100755 --- a/projman.tcl +++ b/projman.tcl @@ -97,8 +97,38 @@ foreach file [lsort [glob -nocomplain [file join $hlDir *.tcl]]] { puts "Loaded highlight module $file" } -set editor(selectBorder) "0" +#set editor(selectBorder) "0" #option add *tree.foreground red widgetDefault +# Set colors for widgets +option add *Frame.background $editor(bg) startupFile +option add *Scrollableframe.background $editor(bg) startupFile +option add *Scrolledwindow.background $editor(bg) startupFile +option add *Button.foreground $editor(fg) startupFile +option add *Button.background $editor(bg) startupFile +option add *Entry.foreground $editor(fg) startupFile +option add *Entry.background $editor(bg) startupFile +option add *Label.foreground $editor(fg) startupFile +option add *Label.background $editor(bg) interactive +option add *Checkbox.foreground $editor(fg) startupFile +option add *Checkbox.background $editor(bg) startupFile +option add *Checkbutton.foreground $editor(fg) startupFile +option add *Checkbutton.background $editor(bg) startupFile +option add *Combobox.foreground $editor(fg) startupFile +option add *Combobox.background $editor(bg) startupFile +option add *Text.foreground $editor(fg) startupFile +option add *Text.background $editor(bg) startupFile +option add *Tree.background $editor(bg) startupFile +option add *Tree.foreground $editor(fg) startupFile +option add *scrollbar.background $editor(bg) startupFile +option add *Canvas.background $editor(bg) startupFile +option add *Canvas.foreground $editor(fg) startupFile +option add *Node.foreground $editor(fg) startupFile +option add *NoteBook.bg $editor(bg) startupFile +option add *NoteBook.fg $editor(fg) startupFile +option add *Listbox.foreground $editor(fg) startupFile +option add *Listbox.background $editor(bg) startupFile +option add *Scrollbar.background $editor(bg) startupFile + diff --git a/settings.tcl b/settings.tcl index fbac3cf..bfcdd11 100644 --- a/settings.tcl +++ b/settings.tcl @@ -23,15 +23,16 @@ proc Settings {} { # wm resizable $w 0 0 wm geometry $w 464x450+0+0 wm transient $w . - frame $w.frmMain -borderwidth 1 + frame $w.frmMain -borderwidth 1 -bg $editor(bg) pack $w.frmMain -side top -fill both -expand 1 - frame $w.frmBtn -borderwidth 1 + frame $w.frmBtn -borderwidth 1 -bg $editor(bg) pack $w.frmBtn -side top -fill x - set nb [NoteBook $w.frmMain.noteBook -font $fontBold -side top] + set nb [NoteBook $w.frmMain.noteBook -font $fontBold -side top -bg $editor(bg) -fg $editor(fg)] pack $nb -fill both -expand true -padx 2 -pady 2 - button $w.frmBtn.btnFind -text [::msgcat::mc "Save"] -font $fontNormal -width 12 -relief groove\ + button $w.frmBtn.btnFind -text [::msgcat::mc "Save"] -font $fontNormal -width 12 -relief groove \ + -bg $editor(bg) -fg $editor(fg) \ -command { file copy -force [file join $workDir projman.conf] [file join $workDir projman.conf.old] set file [open [file join $workDir projman.conf] w] @@ -128,24 +129,24 @@ proc Settings {} { destroy .pref } button $w.frmBtn.btnCancel -text [::msgcat::mc "Close"] -relief groove -width 12\ - -font $fontNormal -command "destroy $w" + -font $fontNormal -command "destroy $w" -bg $editor(bg) -fg $editor(fg) pack $w.frmBtn.btnFind $w.frmBtn.btnCancel -fill x -padx 2 -pady 2 -side left ################## MAIN PREF ########################## set main [$nb insert end main -text "[::msgcat::mc "Main"]"] - set scrwin [ScrolledWindow $main.scrwin -relief groove -bd 2] + set scrwin [ScrolledWindow $main.scrwin -relief groove -bd 2 -bg $editor(bg)] #pack $scrwin -fill both -expand true - set scrfrm [ScrollableFrame $main.frm] + set scrfrm [ScrollableFrame $main.frm -bg $editor(bg)] pack $scrwin -fill both -expand true pack $scrfrm -fill both -expand true $scrwin setwidget $scrfrm set main [$scrfrm getframe] - set frm_1 [frame $main.frmFontNormal] + set frm_1 [frame $main.frmFontNormal -bg $editor(bg)] label $frm_1.lblFontNormal -text [::msgcat::mc "Font normal"] -width 30\ - -anchor w -font $fontNormal + -anchor w -font $fontNormal -fg $editor(fg) -bg $editor(bg) entry $frm_1.txtFontNormal button $frm_1.btnFontNormal -borderwidth {1} -font $fontNormal \ -command {SelectFontDlg $fontNormal $main.frmFontNormal.txtFontNormal} \ @@ -154,8 +155,9 @@ proc Settings {} { pack $frm_1.txtFontNormal -side left -fill x -expand true pack $frm_1.btnFontNormal -side left - set frm_2 [frame $main.frmFontBold] - label $frm_2.lblFontBold -text [::msgcat::mc "Font bold"] -width 30 -anchor w -font $fontNormal + set frm_2 [frame $main.frmFontBold -bg $editor(bg)] + label $frm_2.lblFontBold -text [::msgcat::mc "Font bold"] -width 30 -anchor w \ + -font $fontNormal -fg $editor(fg) -bg $editor(bg) entry $frm_2.txtFontBold button $frm_2.btnFontBold -borderwidth {1} -font $fontNormal \ -command {SelectFontDlg $fontBold $main.frmFontBold.txtFontBold} \ @@ -164,17 +166,19 @@ proc Settings {} { pack $frm_2.txtFontBold -side left -fill x -expand true pack $frm_2.btnFontBold -side left - set frm_3 [frame $main.frmToolBar] - label $frm_3.lblToolBar -text [::msgcat::mc "Toolbar"] -width 30 -anchor w -font $fontNormal + set frm_3 [frame $main.frmToolBar -bg $editor(bg)] + label $frm_3.lblToolBar -text [::msgcat::mc "Toolbar"] -width 30 -anchor w \ + -font $fontNormal -fg $editor(fg) -bg $editor(bg) checkbutton $frm_3.chkToolBar -text "" -variable toolBar \ - -font $fontNormal -onvalue true -offvalue false + -font $fontNormal -onvalue true -offvalue false -bg $editor(bg) pack $frm_3.lblToolBar -side left pack $frm_3.chkToolBar -side left - set frm_4 [frame $main.frmProjDir] - label $frm_4.lblProjDir -text [::msgcat::mc "Projects"] -width 30 -anchor w -font $fontNormal - entry $frm_4.txtProjDir - button $frm_4.btnProjDir -borderwidth {1} -font $fontNormal \ + set frm_4 [frame $main.frmProjDir -bg $editor(bg)] + label $frm_4.lblProjDir -text [::msgcat::mc "Projects"] -width 30 -anchor w \ + -font $fontNormal -fg $editor(fg) -bg $editor(bg) + entry $frm_4.txtProjDir -bg $editor(bg) + button $frm_4.btnProjDir -borderwidth {1} -font $fontNormal -bg $editor(bg)\ -image [Bitmap::get [file join $imgDir folder.gif]]\ -command { InsertEnt $main.frmProjDir.txtProjDir [SelectDir $projDir] @@ -183,20 +187,21 @@ proc Settings {} { pack $frm_4.txtProjDir -side left -fill x -expand true pack $frm_4.btnProjDir -side left - set frm_5 [frame $main.frmLocale] + set frm_5 [frame $main.frmLocale -bg $editor(bg)] label $frm_5.lblLocale -text [::msgcat::mc "Interface language"]\ - -width 30 -anchor w -font $fontNormal - set combo [ComboBox $frm_5.txtLocale\ + -width 30 -anchor w -font $fontNormal -fg $editor(fg) -bg $editor(bg) + set combo [ComboBox $frm_5.txtLocale \ -textvariable localeSet -command "puts 123"\ -selectbackground "#55c4d1" -selectborderwidth 0\ -values [GetLocale]] pack $frm_5.lblLocale -side left pack $frm_5.txtLocale -side left -fill x -expand true - set frm_6 [frame $main.frmRpmDir] - label $frm_6.lblRpmDir -text [::msgcat::mc "RPM dir"] -width 30 -anchor w -font $fontNormal - entry $frm_6.txtRpmDir - button $frm_6.btnRpmDir -borderwidth {1} -font $fontNormal \ + set frm_6 [frame $main.frmRpmDir -bg $editor(bg)] + label $frm_6.lblRpmDir -text [::msgcat::mc "RPM dir"] -width 30 -anchor w \ + -font $fontNormal -fg $editor(fg) -bg $editor(bg) + entry $frm_6.txtRpmDir -fg $editor(fg) -bg $editor(bg) + button $frm_6.btnRpmDir -borderwidth {1} -font $fontNormal -bg $editor(bg) \ -image [Bitmap::get [file join $imgDir folder.gif]]\ -command { InsertEnt $main.frmRpmDir.txtRpmDir [SelectDir $workDir] @@ -205,8 +210,8 @@ proc Settings {} { pack $frm_6.txtRpmDir -side left -fill x -expand true pack $frm_6.btnRpmDir -side left - set frm_7 [frame $main.frmTgzDir] - label $frm_7.lblTgzDir -text [::msgcat::mc "TGZ dir"] -width 30 -anchor w -font $fontNormal + set frm_7 [frame $main.frmTgzDir -bg $editor(bg)] + label $frm_7.lblTgzDir -text [::msgcat::mc "TGZ dir"] -width 30 -anchor w -font $fontNormal -fg $editor(fg) entry $frm_7.txtTgzDir button $frm_7.btnTgzDir -borderwidth {1} -font $fontNormal \ -image [Bitmap::get [file join $imgDir folder.gif]]\ @@ -217,39 +222,39 @@ proc Settings {} { pack $frm_7.txtTgzDir -side left -fill x -expand true pack $frm_7.btnTgzDir -side left - set frm_8 [frame $main.frmRpmNamed] + set frm_8 [frame $main.frmRpmNamed -bg $editor(bg)] label $frm_8.lblRpmNamed -text [::msgcat::mc "RPM file mask"] -width 30 -anchor w\ - -font $fontNormal - entry $frm_8.txtRpmNamed + -font $fontNormal -fg $editor(fg) + entry $frm_8.txtRpmNamed pack $frm_8.lblRpmNamed -side left pack $frm_8.txtRpmNamed -side left -fill x -expand true - set frm_9 [frame $main.frmTgzNamed] + set frm_9 [frame $main.frmTgzNamed -bg $editor(bg)] label $frm_9.lblTgzNamed -text [::msgcat::mc "TGZ file mask"] -width 30 -anchor w\ - -font $fontNormal + -font $fontNormal -fg $editor(fg) entry $frm_9.txtTgzNamed pack $frm_9.lblTgzNamed -side left pack $frm_9.txtTgzNamed -side left -fill x -expand true - set frm_10 [frame $main.frmBackUpCreate] + set frm_10 [frame $main.frmBackUpCreate -bg $editor(bg)] label $frm_10.lblBackUpCreate -text [::msgcat::mc "Create backup files"]\ - -width 30 -anchor w -font $fontNormal + -width 30 -anchor w -font $fontNormal -fg $editor(fg) checkbutton $frm_10.chkBackUpCreate -text "" -variable backUpCreate \ -font $fontNormal -onvalue true -offvalue false pack $frm_10.lblBackUpCreate -side left pack $frm_10.chkBackUpCreate -side left - set frm_11 [frame $main.frmBackUpShow] + set frm_11 [frame $main.frmBackUpShow -bg $editor(bg)] label $frm_11.lblBackUpShow -text [::msgcat::mc "Show backup files"]\ - -width 30 -anchor w -font $fontNormal + -width 30 -anchor w -font $fontNormal -fg $editor(fg) checkbutton $frm_11.chkBackUpShow -text "" -variable backUpShow \ -font $fontNormal -onvalue true -offvalue false pack $frm_11.lblBackUpShow -side left pack $frm_11.chkBackUpShow -side left - set frm_12 [frame $main.frmBackUpDel] + set frm_12 [frame $main.frmBackUpDel -bg $editor(bg)] label $frm_12.lblBackUpDel -text [::msgcat::mc "Delete backup files"]\ - -width 30 -anchor w -font $fontNormal + -width 30 -anchor w -font $fontNormal -fg $editor(fg) checkbutton $frm_12.chkBackUpDel -text "" -variable backUpDel \ -font $fontNormal -onvalue true -offvalue false pack $frm_12.lblBackUpDel -side left @@ -261,15 +266,15 @@ proc Settings {} { #################### EDITOR PREF ######################### set editFrm [$nb insert end editor -text "[::msgcat::mc "Editor"]"] - set scrwin [ScrolledWindow $editFrm.scrwin -relief groove -bd 2] - set scrfrm [ScrollableFrame $editFrm.frm] + set scrwin [ScrolledWindow $editFrm.scrwin -relief groove -bd 2 -bg $editor(bg)] + set scrfrm [ScrollableFrame $editFrm.frm -bg $editor(bg)] pack $scrwin -fill both -expand true pack $scrfrm -fill both -expand true $scrwin setwidget $scrfrm set editFrm [$scrfrm getframe] - set frm_13 [frame $editFrm.frmEditorFont] + set frm_13 [frame $editFrm.frmEditorFont -bg $editor(bg)] label $frm_13.lblEditorFont -text [::msgcat::mc "Editor font"] -width 30\ -anchor w -font $fontNormal entry $frm_13.txtEditorFont @@ -280,7 +285,7 @@ proc Settings {} { pack $frm_13.txtEditorFont -side left -fill x -expand true pack $frm_13.btnEditorFont -side left - set frm_14 [frame $editFrm.frmEditorFontBold] + set frm_14 [frame $editFrm.frmEditorFontBold -bg $editor(bg)] label $frm_14.lblEditorFontBold -text [::msgcat::mc "Editor font bold"]\ -width 30 -anchor w -font $fontNormal entry $frm_14.txtEditorFontBold button $frm_14.btnEditorFontBold -borderwidth {1} -font $fontNormal \ @@ -290,7 +295,7 @@ proc Settings {} { pack $frm_14.txtEditorFontBold -side left -fill x -expand true pack $frm_14.btnEditorFontBold -side left - set frm_21 [frame $editFrm.frmColorEditBG] + set frm_21 [frame $editFrm.frmColorEditBG -bg $editor(bg)] label $frm_21.lblColorEditBG -text [::msgcat::mc "Editor background"]\ -width 30 -anchor w -font $fontNormal entry $frm_21.txtColorEditBG @@ -304,7 +309,7 @@ proc Settings {} { pack $frm_21.txtColorEditBG -side left -fill x -expand true pack $frm_21.btnColorEditBG -side left - set frm_22 [frame $editFrm.frmColorEditFG] + set frm_22 [frame $editFrm.frmColorEditFG -bg $editor(bg)] label $frm_22.lblColorEditFG -text [::msgcat::mc "Editor foreground"]\ -width 30 -anchor w -font $fontNormal entry $frm_22.txtColorEditFG @@ -318,7 +323,7 @@ proc Settings {} { pack $frm_22.txtColorEditFG -side left -fill x -expand true pack $frm_22.btnColorEditFG -side left - set frm_15 [frame $editFrm.frmAutoFormat] + set frm_15 [frame $editFrm.frmAutoFormat -bg $editor(bg)] label $frm_15.lblAutoFormat -text [::msgcat::mc "Text autoformat"]\ -width 30 -anchor w -font $fontNormal checkbutton $frm_15.chkAutoFormat -text "" -variable autoFormat \ @@ -328,7 +333,7 @@ proc Settings {} { set wrapList [list none word char] - set frm_28 [frame $editFrm.frmWrap] + set frm_28 [frame $editFrm.frmWrap -bg $editor(bg)] label $frm_28.lblWrap -text [::msgcat::mc "Word wrapping"]\ -width 30 -anchor w -font $fontNormal set combo2 [ComboBox $frm_28.txtWrap\ @@ -338,7 +343,7 @@ proc Settings {} { pack $frm_28.lblWrap -side left pack $combo2 -side left - set frm_16 [frame $editFrm.frmColorProc] + set frm_16 [frame $editFrm.frmColorProc -bg $editor(bg)] label $frm_16.lblColorProc -text [::msgcat::mc "Procedure name"]\ -width 30 -anchor w -font $fontNormal entry $frm_16.txtColorProc -background $editor(bg) @@ -350,7 +355,7 @@ proc Settings {} { pack $frm_16.txtColorProc -side left -fill x -expand true pack $frm_16.btnColorProc -side left - set frm_17 [frame $editFrm.frmColorKeyWord] + set frm_17 [frame $editFrm.frmColorKeyWord -bg $editor(bg)] label $frm_17.lblColorKeyWord -text [::msgcat::mc "Operators"]\ -width 30 -anchor w -font $fontNormal entry $frm_17.txtColorKeyWord -background $editor(bg) @@ -362,7 +367,7 @@ proc Settings {} { pack $frm_17.txtColorKeyWord -side left -fill x -expand true pack $frm_17.btnColorKeyWord -side left - set frm_35 [frame $editFrm.frmColorParam] + set frm_35 [frame $editFrm.frmColorParam -bg $editor(bg)] label $frm_35.lblColorParam -text [::msgcat::mc "Parameters"]\ -width 30 -anchor w -font $fontNormal entry $frm_35.txtColorParam -background $editor(bg) @@ -374,7 +379,7 @@ proc Settings {} { pack $frm_35.txtColorParam -side left -fill x -expand true pack $frm_35.btnColorParam -side left - set frm_36 [frame $editFrm.frmColorSubParam] + set frm_36 [frame $editFrm.frmColorSubParam -bg $editor(bg)] label $frm_36.lblColorSubParam -text [::msgcat::mc "Subparameters"]\ -width 30 -anchor w -font $fontNormal entry $frm_36.txtColorSubParam -background $editor(bg) @@ -386,7 +391,7 @@ proc Settings {} { pack $frm_36.txtColorSubParam -side left -fill x -expand true pack $frm_36.btnColorSubParam -side left - set frm_18 [frame $editFrm.frmColorComments] + set frm_18 [frame $editFrm.frmColorComments -bg $editor(bg)] label $frm_18.lblColorComments -text [::msgcat::mc "Comments"]\ -width 30 -anchor w -font $fontNormal entry $frm_18.txtColorComments -background $editor(bg) @@ -398,7 +403,7 @@ proc Settings {} { pack $frm_18.txtColorComments -side left -fill x -expand true pack $frm_18.btnColorComments -side left - set frm_19 [frame $editFrm.frmColorVar] + set frm_19 [frame $editFrm.frmColorVar -bg $editor(bg)] label $frm_19.lblColorVar -text [::msgcat::mc "Variables"]\ -width 30 -anchor w -font $fontNormal entry $frm_19.txtColorVar -background $editor(bg) @@ -410,7 +415,7 @@ proc Settings {} { pack $frm_19.txtColorVar -side left -fill x -expand true pack $frm_19.btnColorVar -side left - set frm_20 [frame $editFrm.frmColorString] + set frm_20 [frame $editFrm.frmColorString -bg $editor(bg)] label $frm_20.lblColorString -text [::msgcat::mc "Quote string"]\ -width 30 -anchor w -font $fontNormal entry $frm_20.txtColorString -background $editor(bg) @@ -422,7 +427,7 @@ proc Settings {} { pack $frm_20.txtColorString -side left -fill x -expand true pack $frm_20.btnColorString -side left - set frm_23 [frame $editFrm.frmColorBrace] + set frm_23 [frame $editFrm.frmColorBrace -bg $editor(bg)] label $frm_23.lblColorBrace -text [::msgcat::mc "Braces"]\ -width 30 -anchor w -font $fontNormal entry $frm_23.txtColorBrace -background $editor(bg) @@ -434,7 +439,7 @@ proc Settings {} { pack $frm_23.txtColorBrace -side left -fill x -expand true pack $frm_23.btnColorBrace -side left - set frm_24 [frame $editFrm.frmColorBraceBG] + set frm_24 [frame $editFrm.frmColorBraceBG -bg $editor(bg)] label $frm_24.lblColorBraceBG -text [::msgcat::mc "Braces background"]\ -width 30 -anchor w -font $fontNormal entry $frm_24.txtColorBraceBG -background $editor(bg) @@ -449,7 +454,7 @@ proc Settings {} { pack $frm_24.txtColorBraceBG -side left -fill x -expand true pack $frm_24.btnColorBraceBG -side left - set frm_25 [frame $editFrm.frmColorBraceFG] + set frm_25 [frame $editFrm.frmColorBraceFG -bg $editor(bg)] label $frm_25.lblColorBraceFG -text [::msgcat::mc "Braces foreground"]\ -width 30 -anchor w -font $fontNormal entry $frm_25.txtColorBraceFG -background $color(braceBG) @@ -461,7 +466,7 @@ proc Settings {} { pack $frm_25.txtColorBraceFG -side left -fill x -expand true pack $frm_25.btnColorBraceFG -side left - set frm_26 [frame $editFrm.frmColorPercent] + set frm_26 [frame $editFrm.frmColorPercent -bg $editor(bg)] label $frm_26.lblColorPercent -text [::msgcat::mc "Percent \%"]\ -width 30 -anchor w -font $fontNormal entry $frm_26.txtColorPercent -background $editor(bg) @@ -473,7 +478,7 @@ proc Settings {} { pack $frm_26.txtColorPercent -side left -fill x -expand true pack $frm_26.btnColorPercent -side left - set frm_27 [frame $editFrm.frmColorBindKey] + set frm_27 [frame $editFrm.frmColorBindKey -bg $editor(bg)] label $frm_27.lblColorBindKey -text [::msgcat::mc "Key bindings "]\ -width 30 -anchor w -font $fontNormal entry $frm_27.txtColorBindKey -background $editor(bg) @@ -485,7 +490,7 @@ proc Settings {} { pack $frm_27.txtColorBindKey -side left -fill x -expand true pack $frm_27.btnColorBindKey -side left - set frm_32 [frame $editFrm.frmColorSelectBG] + set frm_32 [frame $editFrm.frmColorSelectBG -bg $editor(bg)] label $frm_32.lblColorSelectBG -text [::msgcat::mc "Selection color"]\ -width 30 -anchor w -font $fontNormal entry $frm_32.txtColorSelectBG -background $editor(bg) @@ -497,7 +502,7 @@ proc Settings {} { pack $frm_32.txtColorSelectBG -side left -fill x -expand true pack $frm_32.btnColorSelectBG -side left - set frm_33 [frame $editFrm.frmColorNbNormal] + set frm_33 [frame $editFrm.frmColorNbNormal -bg $editor(bg)] label $frm_33.lblColorNbNormal -text [::msgcat::mc "Title normal"]\ -width 30 -anchor w -font $fontNormal entry $frm_33.txtColorNbNormal -background $editor(bg) @@ -509,7 +514,7 @@ proc Settings {} { pack $frm_33.txtColorNbNormal -side left -fill x -expand true pack $frm_33.btnColorNbNormal -side left - set frm_34 [frame $editFrm.frmColorNbModify] + set frm_34 [frame $editFrm.frmColorNbModify -bg $editor(bg)] label $frm_34.lblColorNbModify -text [::msgcat::mc "Title modify"]\ -width 30 -anchor w -font $fontNormal entry $frm_34.txtColorNbModify -background $editor(bg) @@ -521,7 +526,7 @@ proc Settings {} { pack $frm_34.txtColorNbModify -side left -fill x -expand true pack $frm_34.btnColorNbModify -side left - set frm_37 [frame $editFrm.frmColorLabel] + set frm_37 [frame $editFrm.frmColorLabel -bg $editor(bg)] label $frm_37.lblColorLabel -text [::msgcat::mc "Label"]\ -width 30 -anchor w -font $fontNormal entry $frm_37.txtColorLabel -background $editor(bg) @@ -533,7 +538,7 @@ proc Settings {} { pack $frm_37.txtColorLabel -side left -fill x -expand true pack $frm_37.btnColorLabel -side left - set frm_38 [frame $editFrm.frmColorSixFG] + set frm_38 [frame $editFrm.frmColorSixFG -bg $editor(bg)] label $frm_38.lblColorSixFG -text [::msgcat::mc "Six pos. foreground"]\ -width 30 -anchor w -font $fontNormal entry $frm_38.txtColorSixFG -background $editor(bg) @@ -545,7 +550,7 @@ proc Settings {} { pack $frm_38.txtColorSixFG -side left -fill x -expand true pack $frm_38.btnColorSixFG -side left - set frm_39 [frame $editFrm.frmColorSixBG] + set frm_39 [frame $editFrm.frmColorSixBG -bg $editor(bg)] label $frm_39.lblColorSixBG -text [::msgcat::mc "Six pos. background"]\ -width 30 -anchor w -font $fontNormal entry $frm_39.txtColorSixBG -background $editor(bg) @@ -557,7 +562,7 @@ proc Settings {} { pack $frm_39.txtColorSixBG -side left -fill x -expand true pack $frm_39.btnColorSixBG -side left - set frm_40 [frame $editFrm.frmColorSQL] + set frm_40 [frame $editFrm.frmColorSQL -bg $editor(bg)] label $frm_40.lblColorSQL -text [::msgcat::mc "SQL commands"]\ -width 30 -anchor w -font $fontNormal entry $frm_40.txtColorSQL -background $editor(bg) @@ -569,7 +574,7 @@ proc Settings {} { pack $frm_40.txtColorSQL -side left -fill x -expand true pack $frm_40.btnColorSQL -side left - set frm_41 [frame $editFrm.frmColorBraceQuad] + set frm_41 [frame $editFrm.frmColorBraceQuad -bg $editor(bg)] label $frm_41.lblColorBraceQuad -text [::msgcat::mc "Quad braces"]\ -width 30 -anchor w -font $fontNormal entry $frm_41.txtColorBraceQuad -background $editor(bg) @@ -858,3 +863,5 @@ proc SaveSettings {} { $noteBook raise [$noteBook page end] } + +