Index: tolbase/lib/byswidget/blistboxplus/blistboxplus.tcl =================================================================== --- tolbase/lib/byswidget/blistboxplus/blistboxplus.tcl (revision ffeacdcc7b99b98454707efff02a44ee5a5d5655) +++ tolbase/lib/byswidget/blistboxplus/blistboxplus.tcl (revision 6dc91d2178e41f6ffdbc9dbfbee3b7d48fd148ca) @@ -77,4 +77,9 @@ option -iniconfig "" + #@O treeview options + option -exportselection false + option -linewidth 1 ;# unused + option -selectbackground "unused" + variable _listbox variable menu @@ -96,11 +101,9 @@ # #/////////////////////////////////////////////////////////////////////////// - debug_init debug_msg "install listbox ..." - if {0} { - return + if {1} { #@T install _listbox using ::blt::treeview $win.lb -hideroot yes \ -activeicons "" -icons {} -selectmode multiple \ @@ -108,10 +111,13 @@ -highlightthickness 0 -borderwidth 1 -selectborderwidth 1 \ -nofocusselectbackground grey -font {Arial 9} -flat yes + install _listbox using ::wtree $win.lb -table 0 -filter no \ + -background white -showroot 0 -selectmode extended -showheader 1 \ + -highlightbackground gray75 -highlightcolor black \ + -highlightthickness 0 -font {Arial 9} } else { set _listbox [::wtree $win.lb -table 0 -filter no \ -background white -showroot 0 -selectmode extended -showheader 1 \ -highlightbackground gray75 -highlightcolor black \ - -highlightthickness 0 -font {Arial 9} \ - -columns [::TolInspector::LNodeDef] ] + -highlightthickness 0 -font {Arial 9}] #@T set _listbox [::blt::treeview $win.lb -hideroot yes \ -activeicons "" -icons {} -selectmode multiple \ @@ -125,11 +131,11 @@ install menu using menu $win.m -tearoff 0 - install xbar using scrollbar $win.sbh -orient horizontal \ + #@!scroll install xbar using scrollbar $win.sbh -orient horizontal \ -command "$win xview" - install ybar using scrollbar $win.sbv -orient vertical \ + #@!scroll install ybar using scrollbar $win.sbv -orient vertical \ -command "$win yview" #bindtags is modified to make possible to associate binds to self - bindtags $_listbox [linsert [bindtags $_listbox] 2 $win] + $_listbox configure -bindtags [list $self Blistboxplus] #@T! $_listbox style configure text -bg white @@ -161,11 +167,11 @@ #pack grid $_listbox -row 0 -column 0 -sticky news - grid $ybar -row 0 -column 1 -sticky ns - grid $xbar -row 1 -column 0 -sticky ew + #@!scroll grid $ybar -row 0 -column 1 -sticky ns + #@!scroll grid $xbar -row 1 -column 0 -sticky ew grid columnconfigure $self 0 -weight 1 grid rowconfigure $self 0 -weight 1 - ::autoscroll::autoscroll $ybar - ::autoscroll::autoscroll $xbar + #@!scroll ::autoscroll::autoscroll $ybar + #@!scroll ::autoscroll::autoscroll $xbar debug_msg "voy a pillarte: antes de _ReadIni" $self _ReadIni @@ -206,8 +212,9 @@ set lstx [list [list image -label Icon -tags Icon] ] foreach col $lst { + #set colx [list text -label [msgcat::mc $col] -tags $col] set colx [list text -label $col -tags $col] lappend lstx $colx } - Tolcon_Trace "lstx $lstx" + #@! Tolcon_Trace "lstx $lstx" $_listbox configure -columns $lstx @@ -240,6 +247,7 @@ onconfigure -showtitles { bool } { set options(-showtitles) $bool - $_listbox configure -showtitles $bool - $_listbox show + #@O $_listbox configure -showtitles $bool + $_listbox configure -showheader $bool + #@O! $_listbox show } @@ -263,5 +271,6 @@ set cols [$self column names] foreach col $cols { - $self column configure $col -title [mc [lindex $titles $c] ] + #@O $self column configure $col -title [mc [lindex $titles $c] ] + $_listbox column configure $col -text [mc [lindex $titles $c] ] incr c 1 } @@ -299,4 +308,5 @@ set options(-selectmode) $mode } + $_listbox configure -selectmode $options(-selectmode) } @@ -318,4 +328,39 @@ } } + + onconfigure -exportselection { bool } { + if { $bool } { + error "\[blistboxplus\] option -exportselection should be 'no'" + } + } + + #/////////////////////////////////////////////////////////////////////////// + method show { args } { + #/////////////////////////////////////////////////////////////////////////// + error "\[blistboxplus\] method show unimplemented" + } + + #/////////////////////////////////////////////////////////////////////////// + method hide { args } { + #/////////////////////////////////////////////////////////////////////////// + error "\[blistboxplus\] method hide unimplemented" + } + + #/////////////////////////////////////////////////////////////////////////// + method sort { args } { + #/////////////////////////////////////////////////////////////////////////// + if { [lindex $args 1] eq "configure" } { + if { [lindex $args 2] eq "-column" } { + return [$self _SortByColumn [lindex $args 3]] + } else { + return + } + } elseif { [lindex $args 1] eq "auto" } { + #@O! Nothing to do ?? + return + } else { + return + } + } #/////////////////////////////////////////////////////////////////////////// @@ -371,30 +416,17 @@ -command "$self _LoadFromFile" } - # bindings - #@T $self bind all +[list $self _OnControlKey $self %K %k] - #@T $self bind all "lbDeleteSelection $self" - #@T $self bind all "$self _OpenWR" - #@T $self bind all "$self addPrevious" - #@T $self bind all "$self addNext" - #@T $self bind all "$self previous" - #@T $self bind all "$self next" - #@T $self bind all "$self first" - #@T $self bind all "$self last" - #@T $self bind all "$self addAllPrevious" - #@T $self bind all "$self addAllNext" - #@T $self bind all +[list focus -force %W] - - bind $_listbox.frameTree.t +[list $self _OnControlKey $self %K %k] - bind $_listbox.frameTree.t "lbDeleteSelection $self" - bind $_listbox.frameTree.t "$self _OpenWR" - bind $_listbox.frameTree.t "$self addPrevious" - bind $_listbox.frameTree.t "$self addNext" - bind $_listbox.frameTree.t "$self previous" - bind $_listbox.frameTree.t "$self next" - bind $_listbox.frameTree.t "$self first" - bind $_listbox.frameTree.t "$self last" - bind $_listbox.frameTree.t "$self addAllPrevious" - bind $_listbox.frameTree.t "$self addAllNext" - bind $_listbox.frameTree.t +[list focus -force %W] + # bindings + bind $_listbox +[list $self _OnControlKey $self %K %k] + bind $_listbox "lbDeleteSelection $self" + bind $_listbox "$self _OpenWR" + bind $_listbox "$self addPrevious" + bind $_listbox "$self addNext" + bind $_listbox "$self previous" + bind $_listbox "$self next" + bind $_listbox "$self first" + bind $_listbox "$self last" + bind $_listbox "$self addAllPrevious" + bind $_listbox "$self addAllNext" + bind $_listbox +[list focus -force %W] } @@ -631,5 +663,4 @@ if { ![ catch { set fd [open $filNam r] } msgerr] } { while { [gets $fd line ] >= 0} { - Tolcon_Trace "adding $line" $self add $line } @@ -650,4 +681,7 @@ #/////////////////////////////////////////////////////////////////////////// + #@O! + return [$_listbox SortbyColumn $_listbox $col] + set numofel [$self size] set lst [list] @@ -870,5 +904,4 @@ # #/////////////////////////////////////////////////////////////////////////// - Tolcon_Trace "insert pos: $pos args: $args" if { [lindex $args 0] eq "cols" } { set cols [lindex $args 1] @@ -963,5 +996,4 @@ # #/////////////////////////////////////////////////////////////////////////// - Tolcon_Trace "get ids: $ids cols: $cols" if { $ids eq "" } { #@T! return [lrange [$self find] 1 end] @@ -997,7 +1029,5 @@ } - if { [llength $ids] eq 1 } { - Tolcon_Trace "get result: $result" - Tolcon_Trace "get result0: [lindex $result 0]" + if { [llength $ids] eq 1 } { return [lindex $result 0] } @@ -1017,5 +1047,4 @@ # #/////////////////////////////////////////////////////////////////////////// - Tolcon_Trace "set id: $id data: $data cols: $cols" if { "$cols" eq "" } { set cols [$self column names] @@ -1269,8 +1298,4 @@ # #/////////////////////////////////////////////////////////////////////////// - #@T! if { [lindex $args 0] eq "names" } { - #@T! return [lrange [$_listbox column names] 1 end] - #@T! } - #@T! return [eval $_listbox column $args] if { [lindex $args 0] eq "names" } { set names {} @@ -1279,6 +1304,9 @@ } return $names - } - return [eval $_listbox column id $args] + } elseif { [lindex $args 0] eq "configure" } { + return [eval $_listbox column $args] + } else { + return [eval $_listbox column id $args] + } } Index: tolbase/lib/toltk/tolbase.tcl =================================================================== --- tolbase/lib/toltk/tolbase.tcl (revision ffeacdcc7b99b98454707efff02a44ee5a5d5655) +++ tolbase/lib/toltk/tolbase.tcl (revision 6dc91d2178e41f6ffdbc9dbfbee3b7d48fd148ca) @@ -186,6 +186,6 @@ $tab2 configure -borderwidth 2 -background \#d9d9d9 $tab3 configure -borderwidth 2 -background \#d9d9d9 - set sw2 [ScrolledWindow $tab2.sw -scrollbar none] - set sw3 [ScrolledWindow $tab3.sw -scrollbar none] + set sw2 [ScrolledWindow $tab2.sw -auto both] + set sw3 [ScrolledWindow $tab3.sw -auto both] set widgets(tabset,info) $sw3 Index: tolbase/lib/toltk/tolinspe__wtree2.tcl =================================================================== --- tolbase/lib/toltk/tolinspe__wtree2.tcl (revision ffeacdcc7b99b98454707efff02a44ee5a5d5655) +++ tolbase/lib/toltk/tolinspe__wtree2.tcl (revision 6dc91d2178e41f6ffdbc9dbfbee3b7d48fd148ca) @@ -558,6 +558,6 @@ # label of object showed in the tree - set objName [$wt_tree item text Name] - set object [$wt_tree item text Reference] + set objName [$wt_tree item text $index Name] + set object [$wt_tree item text $index Reference] if {$InRootFiles} { Index: tolbase/lib/toltk/tolprj.tcl =================================================================== --- tolbase/lib/toltk/tolprj.tcl (revision ffeacdcc7b99b98454707efff02a44ee5a5d5655) +++ tolbase/lib/toltk/tolprj.tcl (revision 6dc91d2178e41f6ffdbc9dbfbee3b7d48fd148ca) @@ -408,4 +408,5 @@ set tv [::wtree $f.sw.t -table 0 -filter no \ -background white -showroot 1 -selectmode single -showheader 0 \ + -selectcommand "::TolProject::SelectProc $this" \ -highlightbackground gray75 -highlightcolor black \ -highlightthickness 0 -font $toltk_options(fonts,Label) \ @@ -425,6 +426,5 @@ $tv column configure "range 1 end" -visible no $tv column configure first -expand yes -weight 1 - $tv column configure all -itembackground "" - $tv notify bind $tv "::TolProject::SelectProc $this" + $tv column configure all -itembackground "" $f.sw setwidget $f.sw.t @@ -441,24 +441,15 @@ grid columnconfigure $f 0 -weight 1 - - bind $tv.frameTree.t [list ::TolProject::OnControlKey $this %K %k] - - bind $tv.frameTree.t "::focus $tv" - - bind $tv.frameTree.t +[list ::TolProject::PostVariable $this %X %Y] - - set prevBind [bind $tv.frameTree.t ] - set newBind "[lrange $prevBind 0 [expr [llength $prevBind]-3]] ; mdidoc disableglobalraise ; ::TolProject::OpenNodeIfTerminal $this ; break" - #@ mdidoc disableglobalraise y break parece que cumplen el mismo cometido - bind $tv.frameTree.t $newBind - - set prevBind [bind $tv.frameTree.t ] - set newBind "[lrange $prevBind 0 [expr [llength $prevBind]-3]] ; ::TolProject::OpenNodeIfTerminal $this ; break" - bind $tv.frameTree.t $newBind - - bind $tv.frameTree.t +[list ::TolProject::NodeActiveAttributes $this] - bind $tv.frameTree.t +[list ::TolProject::DeleteActiveNode $this] - bind $tv.frameTree.t "::TolProject::CompileActiveNode $this ; break" - bind $tv.frameTree.t "::TolProject::DecompileActiveNode $this ; break" + bind $tv [list ::TolProject::OnControlKey $this %K %k] + bind $tv "::focus $tv" + bind $tv +[list ::TolProject::PostVariable $this %X %Y] + + bind $tv "mdidoc disableglobalraise ; ::TolProject::OpenNodeIfTerminal $this" + bind $tv "::TolProject::OpenNodeIfTerminal $this" + + bind $tv +[list ::TolProject::NodeActiveAttributes $this] + bind $tv +[list ::TolProject::DeleteActiveNode $this] + bind $tv "::TolProject::CompileActiveNode $this ; break" + bind $tv "::TolProject::DecompileActiveNode $this ; break" set data(mainMenu) [menu $tv.m -tearoff 0] Index: tolbase/lib/wtree/wtree.tcl =================================================================== --- tolbase/lib/wtree/wtree.tcl (revision ffeacdcc7b99b98454707efff02a44ee5a5d5655) +++ tolbase/lib/wtree/wtree.tcl (revision 6dc91d2178e41f6ffdbc9dbfbee3b7d48fd148ca) @@ -80,4 +80,10 @@ -default "" -configuremethod "_conf-columnfilter" + option -bindtags \ + -default "" -configuremethod "_conf-bindtags" + + option -selectcommand \ + -default "" -configuremethod "_conf-selectcommand" + variable tree variable vscrollbar @@ -265,4 +271,12 @@ $t item sort root $order -column $column -dictionary + } + + method focus { itemid } { + if { $itemid eq "" } { + $self item id active + } else { + $self activate $itemid + } } @@ -314,4 +328,6 @@ -showrootbutton no -showbuttons yes -showlines yes \ -scrollmargin 16 -xscrolldelay "500 50" -yscrolldelay "500 50" + + bindtags $tree [linsert [bindtags $tree] 0 $win Wtree] $tree notify install <> @@ -702,4 +718,16 @@ } } + + method _conf-bindtags { _ addtags } { + set options(-bindtags) $addtags + bindtags $self [concat $addtags [bindtags $self]] + bindtags $tree [concat $addtags [bindtags $tree]] + } + + method _conf-selectcommand { _ cmd } { + set options(-selectcommand) $cmd + if { $cmd eq "" } return + $self notify bind $self $cmd + } # @@ -742,5 +770,5 @@ array set opts [ lrange $col_spec 1 end ] set colID [ $tree column create \ - -text [ msgcat::mc $opts(-label) ] \ + -text $opts(-label) \ -image $opts(-image) \ -itembackground "\#e0e8f0 {}" \