Changeset 5121 for branches/uq/gui/scripts/drawing.tcl

Timestamp:

Mar 11, 2015 10:26:15 AM (9 years ago)

Author:

dkearney

Message:

merging updates from 1.3 branch

looks like this branch originally came from the 1.3 branch and then had some
additions from the 1.4-pre branch and then a sync from the 1.3 branch. to get
this branch updated, I am reverting r4797 (additions from 1.4-pre branch),
reverting r4798 (additions from 1.3 branch), then merging in updates from 1.3
branch.

I fixed merge conflicts for the following files:

gui/scripts/gauge.tcl
gui/scripts/main.tcl
gui/scripts/tool.tcl
lang/tcl/scripts/task.tcl

Location:

branches/uq

Files:

• . (modified) (1 prop)
• gui/scripts/drawing.tcl (modified) (1 diff)

branches/uq/gui/scripts/drawing.tcl

@@ -129 +129 @@
         }
     }
+    foreach {key path} {
+        toolid          tool.id
+        toolname        tool.name
+        toolcommand     tool.execute
+        tooltitle       tool.title
+        toolrevision    tool.version.application.revision
+    } {
+        set str [$_xmlobj get $path]
+        if { "" != $str } {
+            set _hints($key) $str
+        }
+    }
 }