Changeset b96bc27 in tol

Timestamp:

Jan 23, 2009, 6:01:37 PM (18 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

817b775

Parents:

8e1d5d3

Message:

readonly members appears in grey color

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@467 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tolbase/lib/toltk/tolinspe.tcl (modified) (7 diffs)

tolbase/lib/toltk/tolinspe.tcl

@@ -663 +663 @@
   #puts "InsertChild: args=$args [info level 1]"
   set grammar [lindex $args 0]
-  set name    [lindex $args 1]
+  set name [ lindex $args 1 ]
   set content [lindex $args 2]
   set path    [lindex $args 3]
   set desc    [lindex [lindex $args 4] 0]
 
-  if { ( $gra_parent eq "NameBlock" ) && 
-       [ regexp {(.+::)?_[^.](.*)} $name => p1 p2 ] } {
-    return
-  }
 
   if {[llength [lindex $args end]] >= 2} {
@@ -717 +713 @@
   variable item_data
   variable item_id
+  variable gra_parent
+
   #upvar \#0 ::TolTk::Images Images
+
+  if { $gra_parent eq "NameBlock" } {
+    array set info_member [ FilterNameBlockMember $name ]
+    if { !$info_member(-show) } {
+      return
+    }
+    set name $info_member(-name)
+    set fcolor $info_member(-fcolor)
+  } else {
+    set fcolor "black"
+  }
 
   set brief_cont [TrimContent $grammar $content]
@@ -779 +788 @@
   }
   $ht entry configure $idnew -label $label \
-      -icons [list $icon_grammar $icon_grammar] -data $data
+      -icons [list $icon_grammar $icon_grammar] -data $data \
+       -foreground $fcolor
   set item_data($item_id) [list $content $desc $grammar]
   incr item_id
@@ -1042 +1052 @@
 }
 
+proc ::TolInspector::FilterNameBlockMember { name } {
+  set st_reg [ regexp {(.+::)?(_)?(\.)?(.*)} $name => p1 p2 p3 p4 ]
+  if { !$st_reg } {
+    list -show 1 -fcolor "black" -name $name
+  } elseif { $p2 eq "_" } {
+    if { $p3 eq "." } {
+      # es un miembro de solo lectura
+      list -show 1 -fcolor "gray75" -name "_.$p4"
+    } else {
+      # es un miembro oculto
+      list -show 0
+    }
+  } else {
+    list -show 1 -fcolor "black" -name $p4
+  }
+}
+
 #/////////////////////////////////////////////////////////////////////////////
 proc ::TolInspector::InsertSubset { args } {
@@ -1068 +1095 @@
   variable gra_parent
 
-  if { ( $gra_parent eq "NameBlock" ) && 
-       [ regexp {(.+::)?_[^.](.*)} [lindex $args 1] => p1 p2 ] } {
-    return
-  }
   #puts "InsertSubset, args=$args"
   set grammar [lindex $args 0]
   if {$grammar eq "Set" || $grammar eq "NameBlock"} {
-    if {![ regexp {(.+::)?(.+)} [ lindex $args 1 ] ==> p1 name ] } {
+    
+    if { $gra_parent eq "NameBlock" } {
+      array set info_member [ FilterNameBlockMember [ lindex $args 1 ] ]
+      if { !$info_member(-show) } {
+        return
+      }
+      set name $info_member(-name)
+      set fcolor $info_member(-fcolor)
+    } else {
       set name [ lindex $args 1 ]
-    }
+      set fcolor "black"
+    } 
     set content [lindex $args 2]
     set idx     [lindex $args 5]
@@ -1092 +1124 @@
     set label [file tail $name]
     #puts [list InsertSubset, idx {lindex $args 5} = $idx]
-    set idnew [$blt_tree insert $at_set -label [GetItemName $node_prefix $idx]]
+    set idnew [ $blt_tree insert $at_set \
+                   -label [ GetItemName $node_prefix $idx ] ]
 
     #puts "InsertSubset, node_prefix = $node_prefix"
@@ -1104 +1137 @@
     }
     $ht_tree entry configure $idnew -label $label -button $has_button \
-      -icons [list $icon $icon]
+      -icons [list $icon $icon] -foreground $fcolor 
   }
 }