Changeset 72

Timestamp:

Dec 4, 2009 4:59:56 PM (13 years ago)

Author:

toby

Message:

# on 1999/03/19 17:07:59, toby did:
rename file directory routines
make file menus smarter w/r to windows usage
fix bug with spaces in filenames

File:

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

trunk/gsascmds.tcl

@@ -696 +696 @@
     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 [button $frmC.b -text Convert -command "valid_conv_win $frm"] \
+    pack [button $frmC.b -text Convert -command "ValidWinCnv $frm"] \
             -side top
     pack [button $frmC.q -text Quit -command "destroy $frm"] -side top
     pack [label $frmA.0 -text "Select a file to convert"] -side top -anchor center
-    winfilebox $frmA 
+    winfilebox $frm
     # force the window to stay on top
     wm transient $frm [winfo toplevel [winfo parent $frm]]
 
-    bind $frm <Return> "valid_conv_win $frm"
+    bind $frm <Return> "ValidWinCnv $frm"
     wm withdraw $frm
     update idletasks
@@ -734 +734 @@
 
 # validate the files and make the conversion
-proc valid_conv_win {frm} {
+proc ValidWinCnv {frm} {
     global expgui
+    # change backslashes to something sensible
+    regsub -all {\\} $expgui(FileMenuCnvName) / expgui(FileMenuCnvName)
+    # allow entry of D: for D:/ and D:TEST for d:/TEST
+    if {[string first : $expgui(FileMenuCnvName)] != -1 && \
+            [string first :/ $expgui(FileMenuCnvName)] == -1} {
+        regsub : $expgui(FileMenuCnvName) :/ expgui(FileMenuCnvName)
+    }
     if {$expgui(FileMenuCnvName) == "<Parent>"} {
         set expgui(FileMenuDir) [file dirname [set expgui(FileMenuDir)] ]
-        ChooseCnvFil $frm
+        ChooseWinCnv $frm
         return
     } elseif [file isdirectory \
@@ -746 +753 @@
                 [file join $expgui(FileMenuDir) $expgui(FileMenuCnvName)]
         }
-        ChooseCnvFil $frm
+        ChooseWinCnv $frm
         return
     }
@@ -803 +810 @@
 
 # create a file box
-proc winfilebox {bx} {
+proc winfilebox {frm} {
     global expgui
+    set bx $frm.1
     pack [frame $bx.top] -side top 
     pack [label $bx.top.a -text "Directory" ] -side left 
@@ -823 +831 @@
 
     pack [button $bx.top.b -image $upfolder \
-            -command "updir; ChooseCnvFil $bx" ]
+            -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 \
@@ -832 +840 @@
             -height 15 -width 0 -takefocus 0
     scrollbar $bx.a.scroll -command "move2boxesY \" $bx.a.files $bx.a.dates \" "
-    ChooseCnvFil $bx
-    bind $bx.a.files <ButtonRelease-1> "ReleaseCnvFil $bx"
-    bind $bx.a.dates <ButtonRelease-1> "ReleaseCnvFil $bx"
-    bind $bx.a.files <Double-1> "SelectCnvFil $bx"
-    bind $bx.a.dates <Double-1> "SelectCnvFil $bx"
+    ChooseWinCnv $frm
+    bind $bx.a.files <ButtonRelease-1> "ReleaseWinCnv $frm"
+    bind $bx.a.dates <ButtonRelease-1> "ReleaseWinCnv $frm"
+    bind $bx.a.files <Double-1> "SelectWinCnv $frm"
+    bind $bx.a.dates <Double-1> "SelectWinCnv $frm"
     pack $bx.a.scroll -side left -fill y 
     pack $bx.a.files $bx.a.dates -side left -fill both -expand yes
@@ -843 +851 @@
 
 # set the box or file in the selection window
-proc ReleaseCnvFil {frm} {
+proc ReleaseWinCnv {frm} {
     global expgui
-    set files $frm.a.files
-    set dates $frm.a.dates
+    set files $frm.1.a.files
+    set dates $frm.1.a.dates
     set select [$files curselection]
     if {$select == ""} {
@@ -858 +866 @@
     if {$expgui(FileMenuCnvName) == "<Parent>"} {
         set expgui(FileMenuDir) [file dirname $expgui(FileMenuDir)]
-        ChooseCnvFil $frm
+        ChooseWinCnv $frm
     } elseif [file isdirectory \
             [file join [set expgui(FileMenuDir)] $expgui(FileMenuCnvName)]] {
         if {$expgui(FileMenuCnvName) != "."} {
             set expgui(FileMenuDir) [file join $expgui(FileMenuDir) $expgui(FileMenuCnvName)]
-            ChooseCnvFil $frm
+            ChooseWinCnv $frm
         }
     }
@@ -870 +878 @@
 
 # select a file or directory -- called on double click
-proc SelectCnvFil {frm} {
+proc SelectWinCnv {frm} {
     global expgui
-    set files $frm.a.files
-    set dates $frm.a.dates
+    set files $frm.1.a.files
+    set dates $frm.1.a.dates
     set select [$files curselection]
     if {$select == ""} {
@@ -885 +893 @@
     if {$file == "<Parent>"} {
         set expgui(FileMenuDir) [file dirname [set expgui(FileMenuDir)] ]
-        ChooseCnvFil $frm
+        ChooseWinCnv $frm
     } elseif [file isdirectory [file join [set expgui(FileMenuDir)] $file]] {
         if {$file != "."} {
             set expgui(FileMenuDir) [file join [set expgui(FileMenuDir)] $file]
-            ChooseCnvFil $frm
+            ChooseWinCnv $frm
         }
     } else {
         set expgui(FileMenuCnvName) [file tail $file]
-        valid_conv_win $frm
+        ValidWinCnv $frm
     }
 }
@@ -899 +907 @@
 # fill the files & dates & Directory selection box with current directory,
 # also called when box is created to fill it
-proc ChooseCnvFil {frm} {
+proc ChooseWinCnv {frm} {
     global expgui
-    set files $frm.a.files
-    set dates $frm.a.dates
+    set files $frm.1.a.files
+    set dates $frm.1.a.dates
     set expgui(FileMenuCnvName) {}
     $files delete 0 end
@@ -917 +925 @@
     }
     foreach file [lsort $filelist] {
-        set modified [file mtime $file]
-        set modified [clock format [file mtime $file] -format "%T %D"]
-        $files insert end [file tail $file]
-        $dates insert end $modified
+        if {![file isdirectory $file]} {
+            set modified [clock format [file mtime $file] -format "%T %D"]
+            $files insert end [file tail $file]
+            $dates insert end $modified
+        }
     }
     $expgui(FileDirButtonMenu)  delete 0 end
@@ -932 +941 @@
         $expgui(FileDirButtonMenu) add command -label $path \
                 -command "[list set expgui(FileMenuDir) $path]; \
-                ChooseCnvFil $frm"
+                ChooseWinCnv $frm"
     }
     return
@@ -1051 +1060 @@
 # validation routine
 proc valid_exp_file {frm mode} {
-    global expgui
+    global expgui tcl_platform
+    # windows fixes
+    if {$tcl_platform(platform) == "windows"} {
+        # change backslashes to something sensible
+        regsub -all {\\} $expgui(FileMenuEXPNAM) / expgui(FileMenuEXPNAM)
+        # allow entry of D: for D:/ and D:TEST for d:/TEST
+        if {[string first : $expgui(FileMenuEXPNAM)] != -1 && \
+                [string first :/ $expgui(FileMenuEXPNAM)] == -1} {
+            regsub : $expgui(FileMenuEXPNAM) :/ expgui(FileMenuEXPNAM)
+        }
+    }
     if {$expgui(FileMenuEXPNAM) == "<Parent>"} {
         set expgui(FileMenuDir) [file dirname [set expgui(FileMenuDir)] ]
@@ -1226 +1245 @@
                 [string toupper [file extension $file]] == ".EXP"} {
             set modified [file mtime $file]
-            lappend pairlist "$file $modified"
+            lappend pairlist [list $file $modified]
         }
     }
@@ -1265 +1284 @@
     return
 }
-