Changeset 139

Timestamp:

Dec 4, 2009 5:01:03 PM (13 years ago)

Author:

toby

Message:

# on 2000/05/17 18:45:27, toby did:
new option: allow a separate window for DISAGL
remove most underlines from menu options
provide keyboard accelerators for selected menu options
N.B. note new mechanism in gsasmenu.tcl for keyboard accelerators
use yellow highlight for active button on button bar

File:

• trunk/expgui (modified) (11 diffs, 3 props)

trunk/expgui

@@ -6 +6 @@
 #
 # need to change heading and button label depending on where getExpFileName
-# is called from
+# is called from?
 #
 # global background editing & profile work differently: should both 
@@ -26 +26 @@
 #   add phase to atom number in listing
 #   DisplayAllAtoms needs to loop over phases: expgui(curPhase)
-
+#
+# idea: load more than one bank from a multi-bank .RAW file
+#
 if {$tcl_version < 8.0} {
     tk_dialog .expFileErrorMsg "Version Error" \
@@ -59 +61 @@
 set expgui(filesort) 1
 set expgui(initstring) {}
+# use a separate window for DISAGL (default)
+set expgui(disaglSeparateBox) 1
 #=============================================================================
 # Store names of profile terms.
@@ -414 +418 @@
     global expgui env tcl_platform
     set fp [open [file join ~ .gsas_config] a]
-    puts $fp "set expgui(archive) $expgui(archive)"
-    puts $fp "set expgui(asorttype) $expgui(asorttype)"
-    puts $fp "set expgui(hsorttype) $expgui(hsorttype)"
-    puts $fp "set expgui(filesort) $expgui(filesort)"
+    foreach item {archive asorttype hsorttype filesort disaglSeparateBox} {
+        puts $fp "set expgui($item) $expgui($item)"
+    }
     if {$tcl_platform(platform) != "windows"} {
         puts $fp "set env(GSASBACKSPACE) $env(GSASBACKSPACE)"
@@ -3043 +3046 @@
 
 #---- file menu button
-menubutton $expgui(fm).file -text File -underline 0 -menu $expgui(fm).file.menu
+menubutton $expgui(fm).file -text File -menu $expgui(fm).file.menu
 menu $expgui(fm).file.menu
 if $expgui(debug) {
-    $expgui(fm).file.menu add command -label "Reset" -underline 0 \
-            -command "reset"
-}
-$expgui(fm).file.menu add command -label "expnam" -underline 0 \
-        -command readnewexp
+    $expgui(fm).file.menu add command -label "Reset" -command "reset"
+}
+$expgui(fm).file.menu add command -label "expnam" -command readnewexp
 $expgui(fm).file.menu add command -label "Save" -underline 0 \
         -command savearchiveexp
-$expgui(fm).file.menu add command -label "Save As" -underline 1 \
+foreach c {s S} {bind . <Alt-$c> [list savearchiveexp]}
+$expgui(fm).file.menu add command -label "Save As" \
         -command "SaveAsFile"
-$expgui(fm).file.menu add command -label "Reread .EXP file"  -underline 0 \
+$expgui(fm).file.menu add command -label "Reread .EXP file" \
         -command {rereadexp $expgui(expfile)}
-#$expgui(fm).file.menu add command -label "Close" -underline 0
 
 #---- help menu button
-menubutton $expgui(fm).help -text Help -underline 0 -menu $expgui(fm).help.menu
+menubutton $expgui(fm).help -text Help -menu $expgui(fm).help.menu
 menu $expgui(fm).help.menu
-$expgui(fm).help.menu add command -command showhelp -label "Help on Command"
-$expgui(fm).help.menu add command -label "About..." -underline 0 -command About
+$expgui(fm).help.menu add command -command showhelp -underline 0 \
+        -label "Help on Command"
+foreach c {h H} {bind . <Alt-$c> [list showhelp]}
+$expgui(fm).help.menu add command -label "About..." -command About
 
 #---- options menu button
-menubutton $expgui(fm).option -text Options -underline 0 \
+menubutton $expgui(fm).option -text Options \
         -menu $expgui(fm).option.menu
 menu $expgui(fm).option.menu
 
 $expgui(fm).option.menu add checkbutton  -label "Archive EXP" \
-        -variable expgui(archive) -underline 0 
+        -variable expgui(archive)
+$expgui(fm).option.menu add checkbutton  -label "Use DISAGL window" \
+        -variable expgui(disaglSeparateBox)
 
 $expgui(fm).option.menu add cascade -menu  $expgui(fm).option.menu.asort \
@@ -3109 +3114 @@
 menu $expgui(fm).option.menu.editmode
 $expgui(fm).option.menu.editmode add radiobutton  -label "Off" \
-        -variable expgui(globalmode) -underline 0 -value 0\
+        -variable expgui(globalmode) -value 0 \
         -command sethistlist
 $expgui(fm).option.menu.editmode add radiobutton  -label "All" \
-        -variable expgui(globalmode) -underline 0 -value 6 \
+        -variable expgui(globalmode) -value 6 \
         -command sethistlist
 $expgui(fm).option.menu.editmode add radiobutton  -label "TOF" \
-        -variable expgui(globalmode) -underline 0 -value 1 \
+        -variable expgui(globalmode) -value 1 \
         -command sethistlist
 $expgui(fm).option.menu.editmode add radiobutton  -label "CW Neutron" \
-        -variable expgui(globalmode) -underline 0 -value 2  \
+        -variable expgui(globalmode) -value 2  \
         -command sethistlist
 $expgui(fm).option.menu.editmode add radiobutton  -label "Alpha12 Xray" \
-        -variable expgui(globalmode) -underline 0 -value 3 \
+        -variable expgui(globalmode) -value 3 \
         -command sethistlist
 $expgui(fm).option.menu.editmode add radiobutton  -label "Monochromatic Xray" \
-        -variable expgui(globalmode) -underline 0 -value 4 \
+        -variable expgui(globalmode) -value 4 \
         -command sethistlist
 $expgui(fm).option.menu.editmode add radiobutton  -label "Energy Disp Xray" \
-        -variable expgui(globalmode) -underline 0 -value 5 \
+        -variable expgui(globalmode) -value 5 \
         -command sethistlist
 $expgui(fm).option.menu.editmode add separator
@@ -3145 +3150 @@
 }
 
-$expgui(fm).option.menu add command -label "Save Options" -underline 1 \
+$expgui(fm).option.menu add command -label "Save Options" \
         -command "SaveOptions"
 
@@ -3152 +3157 @@
 foreach menu $expgui(menunames) {
     set m [string tolower $menu]
-    pack [menubutton $expgui(fm).$m -text $menu -underline 0 \
+    pack [menubutton $expgui(fm).$m -text $menu \
             -menu $expgui(fm).$m.menu] -side left
     menu $expgui(fm).$m.menu
@@ -3162 +3167 @@
     foreach cmd $expgui_menulist($menu) {
         set action {}
+        set opt {}
         catch {set action [lindex $expgui_cmdlist($cmd) 0]}
+        catch {set opt [lindex $expgui_cmdlist($cmd) 2]}
         if {$expgui(debug) && $action == ""} {puts "blank command for $cmd"}
         if {$action != "" && $action != "-"} {
             eval $expgui(fm).$menu.menu add command \
-                    -label $cmd -command [list [subst $action]]
+                    -label $cmd $opt -command [list [subst $action]]
+            if {[lindex $opt 0] == "-underline"} {
+                catch {
+                    set num [lindex $opt 1]
+                    set key [string range $cmd $num $num]
+                    bind . <Alt-[string tolower $key]> [subst $action]
+                    bind . <Alt-[string toupper $key]> [subst $action]
+                }
+            }
         }
     }
@@ -3193 +3208 @@
     if {$expgui(debug) && $action == ""} {puts "blank command for $cmd"}
     if {$action != ""} {
-        pack [eval button .bar.$cmd -bg beige \
+        pack [eval button .bar.$cmd -bg beige -activebackground yellow \
                 -text $cmd -command [list [subst $action]]] -side left
     }
@@ -3199 +3214 @@
 
 $expgui(fm).file.menu add command -label "Exit"  -underline 1 -command catchQuit
+foreach c {X x} {bind . <Alt-$c> [list catchQuit]}
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ END OF MENU DEFINITION ^^^^^^^^^^^^^^^^^^^