Changeset 6103 for branches/1.5

Timestamp:

Mar 4, 2016, 8:21:03 AM (9 years ago)

Author:

gah

Message:

fix help menu with phases

Location:

branches/1.5/gui/scripts

Files:

• analyzer.tcl (modified) (5 diffs)
• main.tcl (modified) (2 diffs)

branches/1.5/gui/scripts/analyzer.tcl

@@ -68 +68 @@
     public method clear {{xmlobj "all"}}
     public method download {option args}
+    public method buildMenu { w url appName }
 
     protected method _plot {args}
@@ -104 +105 @@
     private variable _wait_uq 0
 
-    private method BuildMenu { url }
     private method BuildSimulationTable { w }
     private method Cancel {}
@@ -201 +201 @@
     }
     pack $itk_component(help) -side left
-    BuildMenu $url
+    buildMenu $itk_component(help).menu $url $_appName
     
     if 0 {
@@ -1559 +1559 @@
 # Build Help menu 
 #
-itcl::body Rappture::Analyzer::BuildMenu { url } {
-    set m $itk_component(help).menu 
-    itk_component add helpmenu {
-        menu $itk_component(help).menu \
-            -tearoff 0 \
-            -postcommand [itcl::code $this PostMenu]
-    } {
-        ignore -tearoff
-    }
-    if { $_appName == "" || $url == "" } {
+itcl::body Rappture::Analyzer::buildMenu { m url appName } {
+    menu $m \
+        -tearoff 0 \
+        -postcommand [itcl::code $this PostMenu]
+    if { $appName == "" || $url == "" } {
         set state disabled
     } else {
@@ -1574 +1569 @@
     }
     $m add command -label "About this tool" \
-        -command [list Rappture::filexfer::webpage "$url/tools/$_appName"] \
+        -command [list Rappture::filexfer::webpage "$url/tools/$appName"] \
         -state $state
     $m add command -label "Questions?" \

branches/1.5/gui/scripts/main.tcl

@@ -261 +261 @@
 
 #
-# Add a place for about/questions in the breadcrumbs area of this pager.
+# Add a place for menu button in the breadcrumbs area of this pager.
 #
 set app [string trim [$tool xml get tool.id]]
 set url [Rappture::Tool::resources -huburl]
-if 0 {
-# The be elimimated with the menu changes
-if { "" != $url && "" != $app } {
-    set f [$win.pager component breadcrumbarea]
-    frame $f.hubcntls
-    pack $f.hubcntls -side right -padx 4
-    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]
-        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]
-        Rappture::Logger::log help questions
-    "
-    pack $f.hubcntls.questions -side top -anchor w
-}
-}
-
-set f [$win.pager component breadcrumbarea]
-frame $f.hubcntls
-pack $f.hubcntls -side right -padx 4
-label $f.hubcntls.icon -image [Rappture::icon ask] -highlightthickness 0
-pack $f.hubcntls.icon -side left
-button $f.hubcntls.about \
-    -text "About this tool" \
-    -state disabled \
-    -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? \
-    -state disabled \
-    -command "
-        [list Rappture::filexfer::webpage $url/resources/$app/questions]
-        Rappture::Logger::log help questions
-    "
-pack $f.hubcntls.questions -side top -anchor w
-if { $url != "" && $app != "" } {
-    $f.hubcntls.about configure -state normal
-    $f.hubcntls.questions configure -state normal
-}
+set crumbs [$win.pager component breadcrumbarea]
+frame $crumbs.hubcntls
+pack $crumbs.hubcntls -side right -padx 4
+
+set m $crumbs.hubcntls.help.menu
+menubutton $crumbs.hubcntls.help \
+    -image [Rappture::icon hamburger_menu] \
+    -highlightthickness 0 \
+    -menu $m
+pack $crumbs.hubcntls.help -side top -anchor w
 
 #
@@ -369 +333 @@
 
 $tool notify add analyzer * [list $f.analyze reset]
+$f.analyze buildMenu $m $url $app
+
 
 # ----------------------------------------------------------------------