Improve reading of legacy mask files and allow mask comments starting with -

Author: whelanh

tcl/windows/tree.tcl

@@ -453,7 +453,7 @@ proc ::tree::displayLines { baseNumber moves } {
       set hasPositionComment 1
       set firstLine [ lindex [split $posComment "\n"] 0 ]
       $w.f.tl insert end "$firstLine\n" [ list bluefg tagtooltip_poscomment ]
-      ::utils::tooltip::Set $w.f.tl -tag tagtooltip_poscomment $posComment
+      ::utils::tooltip::Set $w.f.tl -tag tagtooltip_poscomment -- $posComment
       $w.f.tl tag bind tagtooltip_poscomment <Double-Button-1> "::tree::mask::addComment"
     }
   }
@@ -521,7 +521,7 @@ proc ::tree::displayLines { baseNumber moves } {
       if {$comment != ""} {
         set firstLine [ lindex [split $comment "\n"] 0 ]
         $w.f.tl insert end " $firstLine" tagtooltip$i
-        ::utils::tooltip::Set $w.f.tl -tag tagtooltip$i $comment
+        ::utils::tooltip::Set $w.f.tl -tag tagtooltip$i -- $comment
         $w.f.tl tag bind tagtooltip$i <Double-Button-1> "::tree::mask::addComment $move"
       }
     }
@@ -580,7 +580,7 @@ proc ::tree::displayLines { baseNumber moves } {
       set comment [lindex $m 3]
       set firstLine [ lindex [split $comment "\n"] 0 ]
       $w.f.tl insert end " $firstLine\n" tagtooltip$idx
-      ::utils::tooltip::Set $w.f.tl -tag tagtooltip$idx $comment
+      ::utils::tooltip::Set $w.f.tl -tag tagtooltip$idx -- $comment
 
       # Bind right button to popup a contextual menu:
       $w.f.tl tag bind tagclick$idx <ButtonPress-$::MB3> "::tree::mask::contextMenu $w.f.tl  [lindex $m 0] %x %y %X %Y ; break"
@@ -1620,6 +1620,14 @@ proc ::tree::mask::getImage { move nmr } {
   set loc [expr 4 + $nmr]
   set img [lindex $moves $idxm $loc]
   if {$img == ""} { set img tb_empty }
+  if {[string match "::tree::mask::image*" $img]} {
+    set type [string range $img 19 end]
+    if {[info exists ::tree::mask::marker2image($type)]} {
+        set img $::tree::mask::marker2image($type)
+    } else {
+        set img tb_empty
+    }
+  }
   return $img
 }