Changeset 674 for trunk/gui/scripts

Timestamp:

Apr 19, 2007, 5:38:09 PM (17 years ago)

Author:

mmc

Message:

Fixed sequences so that styles for embedded curves are handled properly.
Fixed the play times for sequences so they are a little slower. This
works better with the frame updates over VNC. Added "select all" to
the menu for string items.

Location:

trunk/gui/scripts

Files:

• sequenceresult.tcl (modified) (4 diffs)
• textentry.tcl (modified) (10 diffs)
• tool.tcl (modified) (1 diff)

trunk/gui/scripts/sequenceresult.tcl

@@ -302 +302 @@
                     }
                     if {[llength $all] > 0} {
-                        set delay [expr {int(ceil(pow($_play(speed)/10.0,2.0)*5))}]
+                        set delay [expr {int(ceil(pow($_play(speed)/10.0+2,2.0)*15))}]
                         set rval [eval Rappture::icon::gif_animate $delay $all]
                     }
@@ -342 +342 @@
 
     # schedule the first frame
-    set delay [expr {int(ceil(pow($_play(speed)/10.0,2.0)*5))}]
+    set delay [expr {int(ceil(pow($_play(speed)/10.0+2,2.0)*15))}]
     set _afterId [after $delay [itcl::code $this _playFrame]]
 }
@@ -492 +492 @@
     goto $_pos
 
-    set delay [expr {int(ceil(pow($_play(speed)/10.0,2.0)*5))}]
+    set delay [expr {int(ceil(pow($_play(speed)/10.0+2,2.0)*15))}]
     set _afterId [after $delay [itcl::code $this _playFrame]]
 }
@@ -515 +515 @@
     if {"" != $_topmost} {
         foreach dataobj [$_topmost value $_pos] {
-            $viewer add $dataobj ""
-        }
-    }
-}
+            set settings "-color autoreset -width 2"
+            if {[catch {$dataobj hints style} style] == 0} {
+                eval lappend settings $style
+            }
+            $viewer add $dataobj $settings
+        }
+    }
+}

trunk/gui/scripts/textentry.tcl

@@ -25 +25 @@
 option add *TextEntry.hintFont \
     -*-helvetica-medium-r-normal-*-*-100-* widgetDefault
-option add *TextEntry.binaryFont \
+option add *TextEntry.codeFont \
     -*-courier-medium-r-normal-*-12-* widgetDefault
 
@@ -242 +242 @@
 
             bind $itk_component(entry) <KeyPress> [itcl::code $this _newValue]
+            bind $itk_component(entry) <Control-KeyPress-a> \
+                "[list $itk_component(entry) selection range 0 end]; break"
 
             itk_component add emenu {
@@ -252 +254 @@
             $itk_component(emenu) add command -label "Paste" -accelerator "^V" \
                 -command [list event generate $itk_component(entry) <<Paste>>]
+            $itk_component(emenu) add command -label "Select All" -accelerator "^A" -command [list $itk_component(entry) selection range 0 end]
             bind $itk_component(entry) <<PopupMenu>> \
                 [itcl::code $this _edit menu emenu %X %Y]
@@ -285 +288 @@
                 rename -background -textbackground textBackground Background
                 rename -foreground -textforeground textForeground Foreground
+                rename -font -codefont codeFont CodeFont
             }
             $itk_component(text) configure \
                 -background $itk_option(-textbackground) \
-                -foreground $itk_option(-textforeground)
+                -foreground $itk_option(-textforeground) \
+                -font $itk_option(-codefont)
             $itk_component(scrollbars) contents $itk_component(text)
 
             bind $itk_component(text) <KeyPress> [itcl::code $this _newValue]
+            bind $itk_component(text) <Control-KeyPress-a> \
+                "[list $itk_component(text) tag add sel 1.0 end]; break"
 
             itk_component add tmenu {
@@ -302 +309 @@
             $itk_component(tmenu) add command -label "Paste" -accelerator "^V" \
                 -command [list event generate $itk_component(text) <<Paste>>]
+            $itk_component(tmenu) add command -label "Select All" -accelerator "^A" -command [list $itk_component(text) tag add sel 1.0 end]
             $itk_component(tmenu) add separator
             $itk_component(tmenu) add command -label "Upload..." \
@@ -341 +349 @@
         set _mode "binary"
         set _value $newval
-        set font [option get $itk_component(hull) binaryFont BinaryFont]
 
         set size [string length $newval]
@@ -366 +373 @@
             if {$len > 1600} {
                 set len 1600
-                set tail "..."
+                set tail "...more..."
             }
 
@@ -400 +407 @@
         set _value ""
         regsub -all "\r" $newval "\n" newval
-        set font [option get $itk_component(hull) binaryFont Font]
     }
 
     if {$_layout == "entry"} {
-        $itk_component(entry) configure -font $font
         $itk_component(entry) configure -state normal
         $itk_component(emenu) entryconfigure "Cut" -state normal
-        $itk_component(emenu) entryconfigure "Copy" -state normal
         $itk_component(emenu) entryconfigure "Paste" -state normal
         $itk_component(entry) delete 0 end
@@ -414 +418 @@
             $itk_component(entry) configure -state disabled
             $itk_component(emenu) entryconfigure "Cut" -state disabled
-            $itk_component(emenu) entryconfigure "Copy" -state disabled
             $itk_component(emenu) entryconfigure "Paste" -state disabled
         }
     } elseif {$_layout == "text"} {
-        $itk_component(text) configure -font $font
         $itk_component(text) configure -state normal
         $itk_component(tmenu) entryconfigure "Cut" -state normal
-        $itk_component(tmenu) entryconfigure "Copy" -state normal
         $itk_component(tmenu) entryconfigure "Paste" -state normal
         $itk_component(text) delete 1.0 end
@@ -432 +433 @@
                 -background $dbg -foreground $dfg
             $itk_component(tmenu) entryconfigure "Cut" -state disabled
-            $itk_component(tmenu) entryconfigure "Copy" -state disabled
             $itk_component(tmenu) entryconfigure "Paste" -state disabled
         } else {

trunk/gui/scripts/tool.tcl

@@ -107 +107 @@
     global errorInfo
 
-    # make sure that we save the proper application name
-    if {"" != $_appname} {
+    #
+    # Make sure that we save the proper application name.
+    # Actually, the best place to get this information is
+    # straight from the "installtool" script, but just in
+    # case we have an older tool, we should insert the
+    # tool name from the resources config file.
+    #
+    if {"" != $_appname && "" == [$_xmlobj get tool.name]} {
         $_xmlobj put tool.name $_appname
     }