Changeset 3305 for branches/nanovis2/gui/scripts/main.tcl

Timestamp:

Feb 18, 2013, 2:32:14 PM (12 years ago)

Author:

ldelgass

Message:

sync with trunk

Location:

branches/nanovis2

Files:

• . (modified) (1 prop)
• gui/scripts/main.tcl (modified) (4 diffs)

branches/nanovis2/gui/scripts/main.tcl

@@ -16 +16 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2011  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -175 +175 @@
 
 # ----------------------------------------------------------------------
+# START LOGGING
+#
+# If the $RAPPTURE_LOG directory is set to a directory used for
+# logging, then open a log file and start logging.
+# ----------------------------------------------------------------------
+Rappture::Logger::init
+
+# ----------------------------------------------------------------------
 # INITIALIZE THE DESKTOP CONNECTION
 #
@@ -189 +197 @@
 .main configure -title [$tool xml get tool.title]
 wm withdraw .main
+wm protocol .main WM_DELETE_WINDOW {Rappture::Logger::cleanup; exit}
 
 # if the FULLSCREEN variable is set, then nanoHUB wants us to go full screen
@@ -219 +228 @@
     label $f.hubcntls.icon -image [Rappture::icon ask] -highlightthickness 0
     pack $f.hubcntls.icon -side left
-    button $f.hubcntls.about -text "About this tool" \
-        -command [list Rappture::filexfer::webpage "$url/tools/$app"]
+    button $f.hubcntls.about -text "About this tool" -command "
+        [list Rappture::filexfer::webpage $url/tools/$app]
+        Rappture::Logger::log help about
+    "
     pack $f.hubcntls.about -side top -anchor w
-    button $f.hubcntls.questions -text Questions? \
-        -command [list Rappture::filexfer::webpage "$url/resources/$app/questions"]
+    button $f.hubcntls.questions -text Questions? -command "
+        [list Rappture::filexfer::webpage $url/resources/$app/questions]
+        Rappture::Logger::log help questions
+    "
     pack $f.hubcntls.questions -side top -anchor w
 }