Changeset 1274 for trunk

Timestamp:

Feb 16, 2009, 3:46:55 PM (16 years ago)

Author:

mmc

Message:

• Fixed the automatic bug report system to work with the new nanoHUB.org site. It needed index.php instead of index2.php.

• Added links for "About" and "Questions" into the upper-right corner of the Rappture GUI. I don't really link the way this is, but it will do for now until we can completely redesign the GUI.

Location:

trunk/gui/scripts

Files:

• Makefile.in (modified) (1 diff)
• analyzer.tcl (modified) (5 diffs)
• bugreport.tcl (modified) (2 diffs)
• filexfer.tcl (modified) (2 diffs)
• icons.tcl (modified) (1 diff)
• images/ask.png (added)
• pager.tcl (modified) (3 diffs)

trunk/gui/scripts/Makefile.in

@@ -127 +127 @@
 install_images:
         $(MKDIR_P) $(destdir)/images
-        @for i in $(srcdir)/images/*.gif $(srcdir)/images/*.xbm; do \
+        @for i in $(srcdir)/images/*.gif $(srcdir)/images/*.png $(srcdir)/images/*.xbm; do \
             echo "Installing $$i" ; \
             $(INSTALL) -m 444 $$i $(destdir)/images ; \

trunk/gui/scripts/analyzer.tcl

@@ -97 +97 @@
     pack $itk_interior.simol -fill x
 
-    frame $itk_interior.simol.simbg -borderwidth 0
-    pack $itk_interior.simol.simbg -expand yes -fill both
+    itk_component add simbg {
+        frame $itk_interior.simol.simbg -borderwidth 0
+    } {
+        usual
+        rename -background -simcontrolcolor simControlColor Color
+    }
+    pack $itk_component(simbg) -expand yes -fill both
 
     set simtxt [$tool xml get tool.action.label]
@@ -105 +110 @@
     }
     itk_component add simulate {
-        button $itk_interior.simol.simbg.simulate -text $simtxt \
+        button $itk_component(simbg).simulate -text $simtxt \
             -command [itcl::code $this simulate]
+    } {
+        usual
+        rename -highlightbackground -simcontrolcolor simControlColor Color
     }
     pack $itk_component(simulate) -side left -padx 4 -pady 4
 
+    # if there's a hub url, then add "About" and "Questions" links
+    set app [$_tool xml get tool.id]
+    set url [Rappture::Tool::resources -huburl]
+    if {"" != $url && "" != $app} {
+        itk_component add hubcntls {
+            frame $itk_component(simbg).hubcntls
+        } {
+            usual
+            rename -background -simcontrolcolor simControlColor Color
+        }
+        pack $itk_component(hubcntls) -side right -padx 4
+
+        itk_component add icon {
+            label $itk_component(hubcntls).icon -image [Rappture::icon ask] \
+                -highlightthickness 0
+        } {
+            usual
+            ignore -highlightthickness
+            rename -background -simcontrolcolor simControlColor Color
+        }
+        pack $itk_component(icon) -side left
+
+        itk_component add about {
+            button $itk_component(hubcntls).about -text "About this tool" \
+                -command [list Rappture::filexfer::webpage "$url/tools/$app"]
+        } {
+            usual
+            ignore -font
+            rename -background -simcontrolcolor simControlColor Color
+            rename -highlightbackground -simcontrolcolor simControlColor Color
+        }
+        pack $itk_component(about) -side top -anchor w
+
+        itk_component add questions {
+            button $itk_component(hubcntls).questions -text Questions? \
+                -command [list Rappture::filexfer::webpage "$url/resources/$app/questions"]
+        } {
+            usual
+            ignore -font
+            rename -background -simcontrolcolor simControlColor Color
+            rename -highlightbackground -simcontrolcolor simControlColor Color
+        }
+        pack $itk_component(questions) -side top -anchor w
+    }
+
     itk_component add simstatus {
-        text $itk_interior.simol.simbg.simstatus -borderwidth 0 \
+        text $itk_component(simbg).simstatus -borderwidth 0 \
             -highlightthickness 0 -height 1 -width 1 -wrap none \
             -state disabled
@@ -117 +170 @@
         usual
         ignore -highlightthickness
+        rename -background -simcontrolcolor simControlColor Color
         rename -font -textfont textFont Font
     }
@@ -868 +922 @@
         $itk_interior.simol configure \
             -background $itk_option(-simcontrolactiveoutline)
-        $itk_interior.simol.simbg configure \
-            -background $itk_option(-simcontrolactivebackground)
-        $itk_component(simulate) configure \
-            -highlightbackground $itk_option(-simcontrolactivebackground)
-        $itk_component(simstatus) configure \
-            -background $itk_option(-simcontrolactivebackground)
+        configure -simcontrolcolor $itk_option(-simcontrolactivebackground)
 
         $itk_component(abort) configure -state disabled
@@ -922 +971 @@
         $itk_interior.simol configure \
             -background $itk_option(-simcontroloutline)
-        $itk_interior.simol.simbg configure -background $simcbg
-        $itk_component(simulate) configure -highlightbackground $simcbg
-        $itk_component(simstatus) configure -background $simcbg
+        configure -simcontrolcolor $simcbg
 
         $itk_component(simulate) configure -state disabled

trunk/gui/scripts/bugreport.tcl

@@ -261 +261 @@
     set url [Rappture::Tool::resources -huburl]
     if {[string index $url end] == "/"} {
-        append url "index2.php"
+        append url "index.php"
     } else {
-        append url "/index2.php"
+        append url "/index.php"
     }
 
@@ -272 +272 @@
     }
     upvar #0 $token rval
-    if {[regexp {Ticket #[0-9]* +\(.*?\) +[0-9]+ +times} $rval(body) match]} {
+    set info $rval(body)
+    http::cleanup $token
+
+    if {[regexp {Ticket #[0-9]* +\(.*?\) +[0-9]+ +times} $info match]} {
         return $match
     }
-    error "Report received, but ticket may not have been filed.  Here's the result...\n$rval(body)"
+    error "Report received, but ticket may not have been filed.  Here's the result...\n$info"
 }
 

trunk/gui/scripts/filexfer.tcl

@@ -42 +42 @@
         set path [auto_execok $prog]
         if {"" == $path} {
-            foreach dir {/apps/filexfer/bin /apps/bin} {
+            foreach dir {/apps/bin /apps/filexfer/bin} {
                 set p [file join $dir $prog]
                 if {[file executable $p]} {
@@ -319 +319 @@
     return ""
 }
+
+# ----------------------------------------------------------------------
+# USAGE: Rappture::filexfer::webpage <url>
+#
+# Clients use this to pop up a web page for the specified <url> on
+# the user's desktop.  The <url> should start with http:// or https://.
+# If anything goes wrong, this function beeps.
+# ----------------------------------------------------------------------
+proc Rappture::filexfer::webpage {url} {
+    if {[regexp -nocase {^https?://} $url]} {
+        foreach prog {
+              clientaction
+              /apps/bin/clientaction
+              /apps/xvnc/bin/clientaction
+              ""
+        } {
+            if {"" != [auto_execok $prog]} {
+                break
+            }
+        }
+        if {"" != $prog} {
+            exec $prog url $url &
+            return
+        }
+    }
+    bell
+}

trunk/gui/scripts/icons.tcl

@@ -50 +50 @@
     if {"" != $file} {
         switch -- [file extension $file] {
-            .gif - .jpg {
+            .gif - .jpg - .png {
                 set imh [image create photo -file $file]
             }

trunk/gui/scripts/pager.tcl

@@ -99 +99 @@
     set font [$itk_component(next) cget -font]
     set ht [font metrics $font -linespace]
+    itk_component add breadcrumbarea {
+        frame $itk_interior.bcarea
+    }
     itk_component add breadcrumbs {
-        canvas $itk_interior.breadcrumbs -width 10 -height [expr {$ht+2}]
-    }
+        canvas $itk_component(breadcrumbarea).breadcrumbs \
+            -width 10 -height [expr {$ht+2}]
+    }
+    pack $itk_component(breadcrumbs) -side left -expand yes -fill both \
+        -padx 8 -pady 8
 
     itk_component add line {
@@ -485 +491 @@
             pack $itk_component(controls) -side bottom -fill x -padx 8 -pady 8
             if {[llength $_pages] > 2} {
-                pack $itk_component(breadcrumbs) -side top -fill x \
-                    -padx 8 -pady 8
+                pack $itk_component(breadcrumbarea) -side top -fill x
                 pack $itk_component(line) -side top -fill x
             }
@@ -495 +500 @@
             pack forget $itk_component(controls)
             pack forget $itk_component(line)
-            pack forget $itk_component(breadcrumbs)
+            pack forget $itk_component(breadcrumbarea)
 
             foreach w [pack slaves $itk_component(inside)] {