Changeset 91

Timestamp:

Dec 4, 2009 5:00:15 PM (14 years ago)

Author:

toby

Message:

# on 1999/07/21 16:22:54, toby did:
adopt putontop and afterputontop
new autoexpload option
change file lists to -dictionary
add ShowBigMessage?

File:

• trunk/gsascmds.tcl (modified) (15 diffs, 3 props)

trunk/gsascmds.tcl

@@ -50 +50 @@
             global env expgui
             # Windows environment variables
-            # -95 does not seem to be able to use these
             set env(GSAS) [file nativename $expgui(gsasdir)]
             # PGPLOT_FONT is needed by PGPLOT
@@ -57 +56 @@
             set env(LENPAGE) 60
             # all winexec commands are background commands -- ignore background arg
-
             # can't get pause to work! -- ignore wait
 
@@ -137 +135 @@
                 -command "set expgui(temp) {}; destroy $w"] -side left
     }
+    bind $w <Return> "destroy $w"
+
     # force the window to stay on top
-    wm transient $w [winfo toplevel [winfo parent $w]]
-
-    bind $w <Return> "destroy $w"
-    wm withdraw $w
-    update idletasks
-    # center the new window in the middle of the parent
-    set x [expr [winfo x [winfo parent $w]] + [winfo width .]/2 - \
-            [winfo reqwidth $w]/2 - [winfo vrootx [winfo parent $w]]]
-    set y [expr [winfo y [winfo parent $w]] + [winfo height .]/2 - \
-            [winfo reqheight $w]/2 - [winfo vrooty [winfo parent $w]]]
-    wm geom $w +$x+$y
-    wm deiconify $w
-
-    set oldFocus [focus]
-    set oldGrab [grab current $w]
-    if {$oldGrab != ""} {
-        set grabStatus [grab status $oldGrab]
-    }
-    grab $w
+    putontop $w
+
     focus $w.b.2
     tkwait window $w
-    catch {focus $oldFocus}
-    if {$oldGrab != ""} {
-        if {$grabStatus == "global"} {
-            grab -global $oldGrab
-        } else {
-            grab $oldGrab
-        }
-    }
+    afterputontop
+
     return $expgui(temp)
 }
@@ -190 +167 @@
     # Save the current exp file
     savearchiveexp
+    # load the changed .EXP file automatically?
+    if {$expgui(autoexpload)} {
+        # disable the file changed monitor
+        set expgui(expModifiedLast) 0
+    }
     set cmd {}
     set expnam [file root [file tail $expgui(expfile)]]
@@ -202 +184 @@
     }
     forknewterm "$prog -- $expnam" $cmd 0 1 1
-    wm deiconify .
+    # load the changed .EXP file automatically?
+    if {$expgui(autoexpload)} {
+        # load the revised exp file
+        loadexp $expgui(expfile)
+    }
+#    wm deiconify .
 }
 
@@ -513 +500 @@
     unixcnvbox $frmB outfile 0 
     set infile(done) 0
+    bind $frm <Return> "valid_conv_unix"
     # force the window to stay on top
-    wm transient $frm [winfo toplevel [winfo parent $frm]]
-
-    bind $frm <Return> "valid_conv_unix"
-    wm withdraw $frm
-    update idletasks
-    # center the new window in the middle of the parent
-    set x [expr [winfo x [winfo parent $frm]] + [winfo width .]/2 - \
-            [winfo reqwidth $frm]/2 - [winfo vrootx [winfo parent $frm]]]
-    set y [expr [winfo y [winfo parent $frm]] + [winfo height .]/2 - \
-            [winfo reqheight $frm]/2 - [winfo vrooty [winfo parent $frm]]]
-    wm geom $frm +$x+$y
-    wm deiconify $frm
-
-    set oldFocus [focus]
-    set oldGrab [grab current $frm]
-    if {$oldGrab != ""} {
-        set grabStatus [grab status $oldGrab]
-    }
-    grab $frm
+    putontop $frm
     focus $frmC.q 
     update
@@ -545 +515 @@
     }
     destroy $frm
+    afterputontop
 }
 
@@ -702 +673 @@
     pack [label $frmA.0 -text "Select a file to convert"] -side top -anchor center
     winfilebox $frm
+    bind $frm <Return> "ValidWinCnv $frm"
+
     # force the window to stay on top
-    wm transient $frm [winfo toplevel [winfo parent $frm]]
-
-    bind $frm <Return> "ValidWinCnv $frm"
-    wm withdraw $frm
-    update idletasks
-    # center the new window in the middle of the parent
-    set x [expr [winfo x [winfo parent $frm]] + [winfo width .]/2 - \
-            [winfo reqwidth $frm]/2 - [winfo vrootx [winfo parent $frm]]]
-    set y [expr [winfo y [winfo parent $frm]] + [winfo height .]/2 - \
-            [winfo reqheight $frm]/2 - [winfo vrooty [winfo parent $frm]]]
-    wm geom $frm +$x+$y
-    wm deiconify $frm
-
-    set oldFocus [focus]
-    set oldGrab [grab current $frm]
-    if {$oldGrab != ""} {
-        set grabStatus [grab status $oldGrab]
-    }
-    grab $frm
+    putontop $frm
     focus $frmC.q 
     tkwait window $frm
-    catch {focus $oldFocus}
-    if {$oldGrab != ""} {
-        if {$grabStatus == "global"} {
-            grab -global $oldGrab
-        } else {
-            grab $oldGrab
-        }
-    }
+    afterputontop
 }
 
@@ -919 +867 @@
     set filelist [glob -nocomplain \
             [file join [set expgui(FileMenuDir)] *] ]
-    foreach file [lsort $filelist] {
+    foreach file [lsort -dictionary $filelist] {
         if {[file isdirectory $file]} {
             $files insert end [file tail $file]
@@ -925 +873 @@
         }
     }
-    foreach file [lsort $filelist] {
+    foreach file [lsort -dictionary $filelist] {
         if {![file isdirectory $file]} {
             set modified [clock format [file mtime $file] -format "%T %D"]
@@ -965 +913 @@
             ] -side top
     bind $frm <Return> {if ![catch {expr $liveplot(hst)}] "destroy .file"}
+    
     # force the window to stay on top
-    wm transient $frm [winfo toplevel [winfo parent $frm]]
-    wm withdraw $frm
-    update idletasks
-    # center the new window in the middle of the parent
-    set x [expr [winfo x [winfo parent $frm]] + [winfo width .]/2 - \
-            [winfo reqwidth $frm]/2 - [winfo vrootx [winfo parent $frm]]]
-    set y [expr [winfo y [winfo parent $frm]] + [winfo height .]/2 - \
-            [winfo reqheight $frm]/2 - [winfo vrooty [winfo parent $frm]]]
-    wm geom $frm +$x+$y
-    wm deiconify $frm
-
-    set oldFocus [focus]
-    set oldGrab [grab current $frm]
-    if {$oldGrab != ""} {
-        set grabStatus [grab status $oldGrab]
-    }
-    grab $frm
+    putontop $frm 
     focus $frm.2
     tkwait window $frm
-    catch {focus $oldFocus}
-    if {$oldGrab != ""} {
-        if {$grabStatus == "global"} {
-            grab -global $oldGrab
-        } else {
-            grab $oldGrab
-        }
-    }
+    afterputontop
 }
 
@@ -1029 +955 @@
     expfilebox $frmA $mode
     # force the window to stay on top
-    wm transient $frm [winfo toplevel [winfo parent $frm]]
-
-    wm withdraw $frm
-    update idletasks
-    # center the new window in the middle of the parent
-    set x [expr [winfo x [winfo parent $frm]] + [winfo width .]/2 - \
-            [winfo reqwidth $frm]/2 - [winfo vrootx [winfo parent $frm]]]
-    set y [expr [winfo y [winfo parent $frm]] + [winfo height .]/2 - \
-            [winfo reqheight $frm]/2 - [winfo vrooty [winfo parent $frm]]]
-    wm geom $frm +$x+$y
-    wm deiconify $frm
-
-    set oldFocus [focus]
-    set oldGrab [grab current $frm]
-    if {$oldGrab != ""} {
-        set grabStatus [grab status $oldGrab]
-    }
-    grab $frm
+    putontop $frm
     focus $frmC.b
     tkwait window $frm
-    catch {focus $oldFocus}
-    if {$oldGrab != ""} {
-        if {$grabStatus == "global"} {
-            grab -global $oldGrab
-        } else {
-            grab $oldGrab
-        }
-    }
+    afterputontop
     if {$expgui(FileMenuEXPNAM) == ""} return
     return [file join $expgui(FileMenuDir) $expgui(FileMenuEXPNAM)]
@@ -1237 +1139 @@
     set filelist [glob -nocomplain \
             [file join [set expgui(FileMenuDir)] *] ]
-    foreach file [lsort $filelist] {
+    foreach file [lsort -dictionary $filelist] {
         if {[file isdirectory $file]} {
             $files insert end [file tail $file]
@@ -1244 +1146 @@
     }
     set pairlist {}
-    foreach file [lsort $filelist] {
+    foreach file [lsort -dictionary $filelist] {
         if {![file isdirectory $file]  && \
                 [string toupper [file extension $file]] == ".EXP"} {
@@ -1287 +1189 @@
     return
 }
+
+proc putontop {w} {
+    # center window $w above its parent and make it stay on top
+    set wp [winfo parent $w]
+    wm transient $w [winfo toplevel $wp]
+    wm withdraw $w
+    update idletasks
+    # center the new window in the middle of the parent
+    set x [expr [winfo x $wp] + [winfo width $wp]/2 - \
+            [winfo reqwidth $w]/2 - [winfo vrootx $wp]]
+    if {$x < 0} {set x 0}
+    set xborder 10
+    if {$x+[winfo reqwidth $w] +$xborder > [winfo screenwidth $w]} {
+        incr x [expr \
+                [winfo screenwidth $w] - ($x+[winfo reqwidth $w] + $xborder)]
+    }
+    set y [expr [winfo y $wp] + [winfo height $wp]/2 - \
+            [winfo reqheight $w]/2 - [winfo vrooty $wp]]
+    if {$y < 0} {set y 0}
+    set yborder 25
+    if {$y+[winfo reqheight $w] +$yborder > [winfo screenheight $w]} {
+        incr y [expr \
+                [winfo screenheight $w] - ($y+[winfo reqheight $w] + $yborder)]
+    }
+    wm geom $w +$x+$y
+    wm deiconify $w
+
+    global makenew
+    set makenew(OldFocus) [focus]
+    set makenew(OldGrab) [grab current $w]
+    if {$makenew(OldGrab) != ""} {
+        set makenew(GrabStatus) [grab status $makenew(OldGrab)]
+    }
+    grab $w
+}
+
+proc afterputontop {} {
+    # restore focus
+    global makenew
+    catch {focus $makenew(OldFocus)}
+    if {$makenew(OldGrab) != ""} {
+        if {$makenew(GrabStatus) == "global"} {
+            grab -global $makenew(OldGrab)
+        } else {
+            grab $makenew(OldGrab)
+        }
+    }
+}
+
+proc ShowBigMessage {win labeltext msg "optionlist OK"} {
+    catch {destroy $win}
+    toplevel $win
+
+    # grab focus, etc.
+    pack [label $win.l1 -text $labeltext] -side top
+    pack [frame $win.f1] -side top
+    grid [text  $win.f1.t  \
+            -height 20 -width 55  -wrap none -font Courier \
+            -xscrollcommand "$win.f1.bscr set" \
+            -yscrollcommand "$win.f1.rscr set" \
+            ] -row 1 -column 0 -sticky news
+    grid [scrollbar $win.f1.bscr -orient horizontal \
+            -command "$win.f1.t xview" \
+            ] -row 2 -column 0 -sticky ew
+    grid [scrollbar $win.f1.rscr  -command "$win.f1.t yview" \
+            ] -row 1 -column 1 -sticky ns
+    # give extra space to the text box
+    grid columnconfigure $win.f1 0 -weight 1
+    grid rowconfigure $win.f1 1 -weight 1
+    $win.f1.t insert end $msg
+
+    global makenew
+    set makenew(result) 0
+    bind $win <Return> "destroy $win"
+    bind $win <KeyPress-Prior> "$win.f1.t yview scroll -1 page"
+    bind $win <KeyPress-Next> "$win.f1.t yview scroll 1 page"
+    bind $win <KeyPress-Right> "$win.f1.t xview scroll 1 unit"
+    bind $win <KeyPress-Left> "$win.f1.t xview scroll -1 unit"
+    bind $win <KeyPress-Up> "$win.f1.t yview scroll -1 unit"
+    bind $win <KeyPress-Down> "$win.f1.t yview scroll 1 unit"
+    bind $win <KeyPress-Home> "$win.f1.t yview 0"
+    bind $win <KeyPress-End> "$win.f1.t yview end"
+    set i 0
+    foreach item $optionlist {
+        pack [button $win.q[incr i] \
+                -command "set makenew(result) $i; destroy $win" -text $item] -side left
+    }
+    putontop $win
+    tkwait window $win
+
+    # fix focus...
+    afterputontop
+    return $makenew(result)
+}