Changeset 1077 for trunk/gui/scripts/loader.tcl

Timestamp:

Jul 23, 2008, 8:00:21 PM (16 years ago)

Author:

mmc

Message:

Fixed the Rappture::filexfer facility so that if importfile/exportfile
commands are not available, it reverts to local Load/Save? operations.
This is important for applications that are not deployed in a hub, but
used instead in a standard desktop environment.

File:

• trunk/gui/scripts/loader.tcl (modified) (5 diffs)

trunk/gui/scripts/loader.tcl

@@ -121 +121 @@
     }
     if {[llength $_uppath] > 0} {
-        $itk_component(combo) choices insert end @upload "Upload..."
+        $itk_component(combo) choices insert end \
+            @upload [Rappture::filexfer::label upload]
     }
 
@@ -130 +131 @@
     #
     Rappture::Balloon $itk_component(hull).download \
-        -title "Choose what to download:"
+        -title "Choose what to [string tolower [Rappture::filexfer::label downloadWord]]:"
     set inner [$itk_component(hull).download component inner]
 
@@ -149 +150 @@
         }
     }
-    button $inner.go -text "Download" \
+    button $inner.go -text [Rappture::filexfer::label download] \
         -command [itcl::code $this _downloadValues]
     pack $inner.go -side bottom -padx 50 -pady {4 2}
 
     if {[llength $_dnpaths] > 0} {
-        $itk_component(combo) choices insert end @download "Download..."
+        $itk_component(combo) choices insert end \
+            @download [Rappture::filexfer::label download]
     }
 
@@ -304 +306 @@
     set obj [$itk_component(combo) translate $newval]
     if {$obj == "@upload"} {
-        if {[Rappture::filexfer::enabled]} {
-            set tool [Rappture::Tool::resources -appname]
-            Rappture::filexfer::upload \
-                $tool $_uppath [itcl::code $this _uploadValue]
-        }
+        set tool [Rappture::Tool::resources -appname]
+        Rappture::filexfer::upload \
+            $tool $_uppath [itcl::code $this _uploadValue]
 
         # put the combobox back to its last value
@@ -417 +417 @@
 
     set mesg ""
-    if {[Rappture::filexfer::enabled]} {
-        foreach path $_dnpaths {
-            if {$_dnpath2state($this-$path)} {
-                set info [$itk_option(-tool) valuefor $path]
-                set mesg [Rappture::filexfer::download $info input.txt]
-                if {"" != $mesg} { break }
-            }
+    foreach path $_dnpaths {
+        if {$_dnpath2state($this-$path)} {
+            set info [$itk_option(-tool) valuefor $path]
+            set mesg [Rappture::filexfer::download $info input.txt]
+            if {"" != $mesg} { break }
         }
     }