Changeset 325

Timestamp:

Dec 4, 2009 5:04:10 PM (14 years ago)

Author:

toby

Message:

# on 2000/10/17 15:20:45, toby did:
snapshot with revisions for WWW help

File:

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

trunk/gsascmds.tcl

@@ -3 +3 @@
 if {$tcl_platform(platform) == "windows"} {
     if [catch {package require winexec}] {
-        tk_dialog .err "WINEXEC Error" \
-                "Error -- Unable to load the WINEXEC package. This is needed in Win95 machines" \
-                error 0 Quit
+        MyMessageBox -parent . -title "WINEXEC Error" \
+                -message "Error -- Unable to load the WINEXEC package. This is needed in Win95 machines" \
+                -icon error -type Quit -default quit \
+                -helplink "expgui_Win_readme.html Winexec"
         destroy .
     }
     if ![file exists [file join $expgui(gsasdir) fonts grfont.dat]] {
-        tk_dialog .err "PGPLOT Error" \
-                "Warning -- Unable to find file GRFONT.DAT. GSAS graphics will not work. Is GSAS correctly installed?" \
-                warning 0 "Limp Ahead"
+        MyMessageBox -parent . -title "PGPLOT Error" \
+                -message "Warning -- Unable to find file GRFONT.DAT. GSAS graphics will not work. Is GSAS correctly installed?" \
+                -icon warning -type {"Limp Ahead"} -default "Limp Ahead" \
+                -helplink "expguierr.html NoPGPLOT"
     }
 
@@ -29 +31 @@
             # check the path -- can DOS use it?
             if {[string first // [pwd]] != -1} {
-                tk_dialog .braindead "Invalid Path" \
-                {Error -- Use "Map network drive" to access this directory with a letter (e.g. F:) \
-                Win-95 can't directly access a network drive in DOS} error 0 OK
+                MyMessageBox -parent . -title "Invalid Path" \
+                -message {Error -- Use "Map network drive" to access this directory with a letter (e.g. F:) GSAS can't directly access a network drive} \
+                -icon error -type ok -default ok \
+                -helplink "expgui_Win_readme.html NetPath"
                 return
             }
@@ -78 +81 @@
     }
 } else {
+    if ![file exists [file join $expgui(gsasdir) pgl grfont.dat]] {
+        MyMessageBox -parent . -title "PGPLOT Error" \
+                -message "Warning -- Unable to find file grfont.dat. GSAS graphics will not work. Is GSAS correctly installed?" \
+                -icon warning -type {"Limp Ahead"} -default "Limp Ahead" \
+                -helplink "expguierr.html NoPGPLOT"
+    }
     if [catch {set env(GSASBACKSPACE)}] {set env(GSASBACKSPACE) 1}
 
@@ -305 +314 @@
     catch {destroy .comp}
     toplevel .comp
-    bind .comp <Key-F1> "MakeWWWHelp expguierr.html Composition"
+    bind .comp <Key-F1> "MakeWWWHelp expgui.html Composition"
     wm title .comp Composition
     pack [label .comp.results -text $text \
@@ -316 +325 @@
             -command "writelst [list $text] ; destroy .comp"] -side left
     pack [button .comp.box.help -text Help -bg yellow \
-            -command "MakeWWWHelp expguierr.html Composition"] \
+            -command "MakeWWWHelp expgui.html Composition"] \
             -side right
 }
@@ -337 +346 @@
     toplevel .export
     wm title .export "Export coordinates"
-    bind .export <Key-F1> "MakeWWWHelp expguierr.html ExportMSI"
+    bind .export <Key-F1> "MakeWWWHelp expgui.html ExportMSI"
     pack [label .export.lbl -text "Export coordinates in MSI .xtl format"\
             ] -side top -anchor center
@@ -360 +369 @@
     pack [button .export.but.2 -text Quit -command "destroy .export"] -side left
     pack [button .export.but.help -text Help -bg yellow \
-            -command "MakeWWWHelp expguierr.html ExportMSI"] \
+            -command "MakeWWWHelp expgui.html ExportMSI"] \
             -side right
     # force the window to stay on top
@@ -452 +461 @@
     } else {
         catch {close $fp}
-        tk_dialog .ok "Done" \
-                "File [file tail $filnam] written in directory [file dirname $filnam]" \
-                warning 0 "OK"
+        MyMessageBox -parent . -title "Done" \
+                -message "File [file tail $filnam] was written in directory [file dirname $filnam]"
     }
     if {[llength $expmap(phaselist)] == 1} {destroy .export}
@@ -477 +485 @@
     toplevel $frm
     wm title $frm "Convert File"
-    bind $frm <Key-F1> "MakeWWWHelp expguierr.html ConvertUnix"
+    bind $frm <Key-F1> "MakeWWWHelp expgui.html ConvertUnix"
 
     pack [frame [set frm0 $frm.0] -bd 2 -relief groove] \
@@ -503 +511 @@
     pack [button $frmC.q -text Quit -command "set infile(done) 1"] -side left
     pack [button $frmC.help -text Help -bg yellow \
-            -command "MakeWWWHelp expguierr.html ConvertUnix"] \
+            -command "MakeWWWHelp expgui.html ConvertUnix"] \
             -side right
     
@@ -540 +548 @@
 
     if {$infile(name) == $outfile(name)} {
+        MyMessageBox -parent . -title Notify \
+                -message "Sorry, filenames must differ" \
+                -icon warning -helplink "expguierr.html ConvSameName"
         tk_dialog .warn Notify "Sorry, filenames must differ" warning 0 OK
         return
     }
     if ![file exists [file join $infile(dir) $infile(name)]] {
-        tk_dialog .warn Notify \
-                "Sorry, file $infile(name) not found in $infile(dir)" warning 0 OK
+        MyMessageBox -parent . -title Notify \
+                -message "Sorry, file $infile(name) not found in $infile(dir)" \
+                -icon warning -helplink "expguierr.html ConvNotFound"
         return
     }
     if [file exists [file join $outfile(dir) $outfile(name)]] {
-        if [tk_dialog .warn Notify \
-                "Warning: file $outfile(name) exists in $outfile(dir). OK to overwrite?" \
-                warning 0 OK No] return
+        set ans [MyMessageBox -parent . -title "Overwrite?" \
+                -message "Warning: file $outfile(name) exists in $outfile(dir). OK to overwrite?" \
+                -icon warning -type {Overwrite Cancel} -default Overwrite \
+                -helplink "expguierr.html OverwriteCnv"]
+        if {[string tolower $ans] == "cancel"} return
     }
     if [catch {
@@ -579 +593 @@
 
     pack [frame $bx.a -width 200 -height 75] -side top -expand yes -fill both
-    listbox $bx.a.files -relief raised -bd 2 -yscrollcommand "$bx.a.scroll set" \
-            -height 15 -width 0
+    listbox $bx.a.files -relief raised -bd 2 \
+            -yscrollcommand "$bx.a.scroll set" \
+            -height 15 -width 0 -exportselection 0 
     scrollbar $bx.a.scroll -command "$bx.a.files yview"
     unixFilChoose $bx $bx.a.files $filvar $diropt
@@ -667 +682 @@
     toplevel $frm
     wm title $frm "Convert File"
-    bind $frm <Key-F1> "MakeWWWHelp expguierr.html ConvertWin"
+    bind $frm <Key-F1> "MakeWWWHelp expgui.html ConvertWin"
     pack [frame [set frmA $frm.1] -bd 2 -relief groove] -padx 3 -pady 3 -side left
     pack [frame [set frmC $frm.3] ] -padx 3 -pady 3 \
             -side left -fill y -expand yes
     pack [button $frmC.help -text Help -bg yellow \
-            -command "MakeWWWHelp expguierr.html ConvertWin"] -side top
+            -command "MakeWWWHelp expgui.html ConvertWin"] -side top
     pack [button $frmC.q -text Quit -command "destroy $frm"] -side bottom
     pack [button $frmC.b -text Convert -command "ValidWinCnv $frm"] \
@@ -721 +736 @@
     set oldname "[file rootname $file].org"
     if [file exists $oldname] {
-        set ans [tk_dialog .warn "OK to overwrite?" \
-                "File [file tail $oldname] exists in [file dirname $oldname]. OK to overwrite?" question 0 \
-                "Yes" "No"]
-        if $ans return
+        set ans [MyMessageBox -parent . -title "Overwrite?" \
+                -message "File [file tail $oldname] exists in [file dirname $oldname]. OK to overwrite?" \
+                -icon warning -type {Overwrite Cancel} -default Overwrite \
+                -helplink "expguierr.html OverwriteCnv"]
+        if {[string tolower $ans] == "cancel"} return
         catch {file delete $oldname}
     }
@@ -787 +803 @@
             -command "updir; ChooseWinCnv $frm" ]
     pack [frame $bx.a -width 200 -height 75] -side top -expand yes -fill both
-    listbox $bx.a.files -relief raised -bd 2 \
+    listbox $bx.a.files -relief raised -bd 2  -exportselection 0 \
             -yscrollcommand "sync2boxes $bx.a.files $bx.a.dates $bx.a.scroll" \
             -height 15 -width 0
-    listbox $bx.a.dates -relief raised -bd 2 \
+    listbox $bx.a.dates -relief raised -bd 2  -exportselection 0 \
             -yscrollcommand "sync2boxes $bx.a.dates $bx.a.files $bx.a.scroll" \
             -height 15 -width 0 -takefocus 0
@@ -887 +903 @@
     $expgui(FileDirButtonMenu)  delete 0 end
     set list ""
+    catch {set list [file volume]}
     set dir ""
     foreach subdir [file split [set expgui(FileMenuDir)]] {
@@ -935 +952 @@
     toplevel $frm
     wm title $frm "Experiment file"
+    bind $frm <Key-F1> "MakeWWWHelp expguierr.html open"
     pack [frame [set frmA $frm.1] -bd 2 -relief groove] -padx 3 -pady 3 -side left
-    pack [frame [set frmC $frm.3] ] -padx 3 -pady 3 -side left
+    pack [frame [set frmC $frm.3] ] -padx 3 -pady 3 -side left \
+            -fill y -expand yes
+    pack [button $frmC.help -text Help -bg yellow \
+            -command "MakeWWWHelp expguierr.html open"] \
+            -side top -anchor e
     pack [label $frmC.2 -text "Sort .EXP files by" ] -side top
     pack [radiobutton $frmC.1 -text "File Name" -value 1 \
@@ -943 +965 @@
             -variable expgui(filesort) -command "ChooseExpFil $frmA"] -side top
     pack [button $frmC.b -text Read \
-            -command "valid_exp_file $frmA $mode"] -side top
+            -command "valid_exp_file $frmA $mode"] -side bottom
     if {$mode == "new"} {
         $frmC.b config -text Save
     }
     pack [button $frmC.q -text Quit \
-            -command "set expgui(FileMenuEXPNAM) {}; destroy $frm"] -side top
+            -command "set expgui(FileMenuEXPNAM) {}; destroy $frm"] -side bottom
     bind $frm <Return> "$frmC.b invoke"
 
@@ -1008 +1030 @@
     set file [file join $expgui(FileMenuDir) $expgui(FileMenuEXPNAM)]
     if {$mode == "new" && [file exists $file]} {
-        set ans [tk_dialog .expFileErrorMsg "File Open Error" \
-            "File [file tail $file] already exists in [file dirname $file]. OK to overwrite?" question 0 \
-             "Select other name" "Overwrite"]
+        set ans [
+        MyMessageBox -parent . -title "File Open Error" \
+                -message "File [file tail $file] already exists in [file dirname $file]. OK to overwrite?" \
+                -icon question -type {"Select other" "Overwrite"} -default "select other" \
+                -helplink "expguierr.html OverwriteErr"
+        ]
+        if {[string tolower $ans] == "overwrite"} {destroy .file}
         if $ans {destroy .file}
         return
@@ -1022 +1048 @@
     }
     if {$mode == "old" && ![file exists $file]} {
-        set ans [tk_dialog .expFileErrorMsg "File Open Error" \
-            "File [file tail $file] does not exist in [file dirname $file]. OK to create?" question 0 \
-             "Select other name" "Create"]
-        if $ans {destroy .file}
+        set ans [
+        MyMessageBox -parent . -title "File Open Error" \
+                -message "File [file tail $file] does not exist in [file dirname $file]. OK to create?" \
+                -icon question -type {"Select other" "Create"} -default "select other" \
+                -helplink "expguierr.html OpenErr"
+        ]
+        if {[string tolower $ans] == "create"} {destroy .file}
         return
     }
@@ -1143 +1172 @@
 # also called when box is created to fill it
 proc ChooseExpFil {frm} {
-    global expgui
+    global expgui tcl_platform
     set files $frm.a.files
     set dates $frm.a.dates
@@ -1184 +1213 @@
     $expgui(FileDirButtonMenu)  delete 0 end
     set list ""
+    if {$tcl_platform(platform) == "windows"} {
+        catch {set list [file volume]}
+    }
+    
     set dir ""
     foreach subdir [file split [set expgui(FileMenuDir)]] {
@@ -1503 +1536 @@
       eval button [list $w.$name] $opts [list -command [list set tkPriv(button) $name]]
 
-        if {![string compare $name $data(-default)]} {
+        if {![string compare $name [string tolower $data(-default)]]} {
             $w.$name configure -default active
         }
@@ -1523 +1556 @@
 
     if {[string compare $data(-default) ""]} {
-      bind $w <Return> [list tkButtonInvoke $w.$data(-default)]
+      bind $w <Return> [list tkButtonInvoke $w.[string tolower $data(-default)]]
     }
 
@@ -1561 +1594 @@
         grab $w
         if {[string compare $data(-default) ""]} {
-            focus $w.$data(-default)
+            focus $w.[string tolower $data(-default)]
         } else {
             focus $w
@@ -1587 +1620 @@
     catch {destroy $frm}
     toplevel $frm
-    bind $frm <Key-F1> "MakeWWWHelp expguierr.html DeleteHistoryRecords"
+    bind $frm <Key-F1> "MakeWWWHelp expgui.html DeleteHistoryRecords"
     if {[string trim $msg] == ""} {
         set msg "There are [CountHistory] history records"
@@ -1602 +1635 @@
     pack [frame $frm.2] -padx 3 -pady 3 -side left -fill both -expand yes
     pack [button $frm.2.help -text Help -bg yellow \
-            -command "MakeWWWHelp expguierr.html DeleteHistoryRecords"] -side top
+            -command "MakeWWWHelp expgui.html DeleteHistoryRecords"] -side top
     pack [button $frm.2.4 -text Quit \
             -command {destroy .history}] -side bottom