From a985948febfab96405ac3d282eddd9c1e6a47b8a Mon Sep 17 00:00:00 2001 From: Sergey Kalinin Date: Tue, 6 Mar 2018 14:55:22 +0300 Subject: [PATCH] Some GUI change --- lib/main.tcl | 16 +++++++--------- lib/toolbar.tcl | 9 ++++----- lib/tree.tcl | 1 + projman.tcl | 1 + 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/lib/main.tcl b/lib/main.tcl index 6587cb5..9e0645f 100644 --- a/lib/main.tcl +++ b/lib/main.tcl @@ -115,9 +115,9 @@ wm overrideredirect . 0 wm positionfrom . user #wm resizable . 0 0 -frame .frmMenu -border 1 -relief raised -background $editor(bg) -frame .frmTool -border 1 -relief raised -background $editor(bg) -frame .frmBody -border 1 -relief raised -background $editor(bg) +frame .frmMenu -border 1 -relief raised -background $editor(bg) -highlightthickness 0 +frame .frmTool -border 1 -relief raised -background $editor(bg) -highlightthickness 0 +frame .frmBody -border 1 -relief raised -background $editor(bg) -highlightthickness 0 frame .frmStatus -border 1 -relief sunken -bg $editor(bg) if {[info exists menuShow]==1 && $menuShow eq "Yes"} { pack .frmMenu -side top -padx 1 -fill x @@ -210,10 +210,10 @@ pack $frm6.lblOvwrt -fill x ########## PROJECT-FILE-FUNCTION TREE ################## #set frmCat [frame .frmBody.frmCat -border 1 -relief sunken -bg $editor(bg)] -set frmCat [frame .frmBody.frmCat -border 0 -relief flat] +set frmCat [frame .frmBody.frmCat -border 0 -relief flat -highlightthickness 0] pack $frmCat -side left -fill y -fill both #set frmWork [frame .frmBody.frmWork -border 1 -relief sunken -bg $editor(bg)] -set frmWork [frame .frmBody.frmWork -border 0 -relief flat] +set frmWork [frame .frmBody.frmWork -border 0 -relief flat -highlightthickness 0] pack $frmWork -side left -fill both -expand true ## CREATE PANE ## @@ -222,7 +222,7 @@ pane::create .frmBody.frmCat .frmBody.frmWork -percent 0.20 # NoteBook - Projects and Files #################### WORKING AREA #################### set noteBookFiles [NoteBook $frmCat.noteBook -font $fontNormal -side top -bg $editor(bg) -fg $editor(fg) \ --activebackground $editor(bg) -activeforeground $editor(fg) ] +-activebackground $editor(bg) -activeforeground $editor(fg)] pack $noteBookFiles -fill both -expand true -padx 2 -pady 2 set nbProjects [$noteBookFiles insert end projects -text [::msgcat::mc "Projects"] \ -activebackground $editor(bg) -activeforeground $editor(fg)] @@ -232,7 +232,7 @@ set nbFiles [$noteBookFiles insert end files -text [::msgcat::mc "Files"] \ # Create FileTree #FileTree::create $nbFiles -set frmTreeFiles [ScrolledWindow $nbFiles.frmTreeFiles -bd 0 -bg $editor(bg) -background $editor(bg) ] +set frmTreeFiles [ScrolledWindow $nbFiles.frmTreeFiles -bd 0 -bg $editor(bg) -background $editor(bg)] set treeFiles [ Tree $frmTreeFiles.treeFiles \ @@ -367,5 +367,3 @@ if {[info exists workingProject]} { } } - - diff --git a/lib/toolbar.tcl b/lib/toolbar.tcl index 6bc38d1..e064826 100644 --- a/lib/toolbar.tcl +++ b/lib/toolbar.tcl @@ -13,7 +13,7 @@ proc Separator {} { global sepIndex editor - set f [frame .frmTool.separator$sepIndex -width 10 -border 1 \ + set f [frame .frmTool.separator$sepIndex -width 15 -border 1 \ -background $editor(bg) -relief raised] incr sepIndex 1 return $f @@ -31,7 +31,7 @@ proc CreateToolBar {} { add_toolbar_button $bboxFile printer.png {PrintDialog} [::msgcat::mc "Print ..."] add_toolbar_button $bboxFile close.png {FileDialog $tree close} [::msgcat::mc "Close"] - set bboxEdit [ButtonBox .frmTool.bboxEdit -spacing 0 -padx 1 -pady 1 -bg $editor(bg)] + set bboxEdit [ButtonBox .frmTool.bboxEdit -spacing 0 -padx 5 -pady 1 -bg $editor(bg)] add_toolbar_button $bboxEdit copy.png {TextOperation copy} [::msgcat::mc "Copy into clipboard"] add_toolbar_button $bboxEdit cut.png {TextOperation cut} [::msgcat::mc "Cut into clipboard"] add_toolbar_button $bboxEdit paste.png {TextOperation paste} [::msgcat::mc "Paste from clipboard"] @@ -47,7 +47,7 @@ proc CreateToolBar {} { set bboxHelp [ButtonBox .frmTool.bboxHelp -spacing 0 -padx 1 -pady 1 -bg $editor(bg)] add_toolbar_button $bboxHelp help.png {ShowHelp} [::msgcat::mc "Help"] # GoTo field - set frm [frame .frmTool.frmGoto -bg $editor(bg)] + set frm [frame .frmTool.frmGoto -bg $editor(bg) -border 0 ] GoToLineButton $frm pack $bboxFile [Separator] $bboxEdit [Separator] $bboxProj [Separator] $bboxHelp [Separator] $frm -side left -anchor w @@ -91,11 +91,10 @@ proc GoToLineButton {w} { label $w.text -text [::msgcat::mc "Line number"] -font $fontNormal \ -bg $editor(bg) -fg $editor(fg) entry $w.entGoTo -width 6 -validate key -validatecommand "ValidNumber %W %P" \ - -bg $editor(bg) -fg $editor(fg) + -bg $editor(bg) -fg $editor(fg) -relief sunken -border 1 -highlightthickness 0 pack $w.text $w.entGoTo -side left -padx 2 -pady 2 bind $w.entGoTo "+ToolBarGoToLineNumber $w" balloon $w.entGoTo set [::msgcat::mc "Goto line"] } - diff --git a/lib/tree.tcl b/lib/tree.tcl index bc6b82c..d833a5e 100644 --- a/lib/tree.tcl +++ b/lib/tree.tcl @@ -344,3 +344,4 @@ proc FileNotePageRaise {nb s} { + diff --git a/projman.tcl b/projman.tcl index 07dd3b6..267c928 100755 --- a/projman.tcl +++ b/projman.tcl @@ -171,3 +171,4 @@ option add *Dialog.msg.background $editor(bg) # option add *Entry.highlightBackground $bg userDefault # option add *Text.HighlightThickness 2 userDefault # option add *Entry.HighlightThickness 1 userDefault +