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

Timestamp:

Feb 23, 2006, 9:06:49 AM (19 years ago)

Author:

mmc

Message:

• Fixed up the tool tips for upload to remind the user about allowing pop ups, and to catch errors when the user uploads nothing.

• Added a protocol version number to the filexfer applet, so Rappture can warn when the applet is out-of-date with respect to the application. (Thanks, Rick!)

File:

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

trunk/gui/scripts/loader.tcl

@@ -286 +286 @@
             if {$status == 0} {
                 Rappture::Tooltip::cue $itk_component(combo) \
-                    "Upload starting...\nA web browser page should pop up on your desktop.  Use that form to handle the upload operation."
+                    "Upload starting...\nA web browser page should pop up on your desktop.  Use that form to handle the upload operation.\n\nIf the upload form doesn't pop up, make sure that you're allowing pop ups from this site.  If it still doesn't pop up, you may be having trouble with the version of Java installed for your browser.  See our Support area for details.\n\nClick anywhere to dismiss this message."
             } else {
                 if {$result == "no clients"} {
                     Rappture::Tooltip::cue $itk_component(combo) \
                         "Can't upload files.  Looks like you might be having trouble with the version of Java installed for your browser."
+                } elseif {"old client" == $result} {
+                    Rappture::Tooltip::cue $itk_component(combo) "For this to work properly, you must first restart your Web browser.  You don't need to close down this session.  Simply shut down all windows for your Web browser, then restart the browser and navigate back to this page.  You'll find it on \"my nanoHUB\" listed under \"my sessions\".  Once the browser is restarted, the upload should work properly."
+                } elseif {"old clients" == $result} {
+                    Rappture::Tooltip::cue $itk_component(combo) "There are multiple browser pages connected to this session, and one of them has browser that needs to be restarted.\n\nWhoever didn't get the upload form should restart their Web browser.  You don't need to close down this session.  Simply shut down all windows for the Web browser, then restart the browser and navigate back to this page.  You'll find it on \"my nanoHUB\" listed under \"my sessions\".  Once the browser is restarted, the upload should work properly."
                 } else {
                     bgerror $result
@@ -314 +318 @@
                     Rappture::Tooltip::cue $itk_component(combo) \
                         "Can't download data.  Looks like you might be having trouble with the version of Java installed for your browser."
+                } elseif {"old client" == $result} {
+                    Rappture::Tooltip::cue $itk_component(combo) "For this to work properly, you must first restart your Web browser.  You don't need to close down this session.  Simply shut down all windows for your Web browser, then restart the browser and navigate back to this page.  You'll find it on \"my nanoHUB\" listed under \"my sessions\".  Once the browser is restarted, the download should work properly."
+                } elseif {"old clients" == $result} {
+                    Rappture::Tooltip::cue $itk_component(combo) "There are multiple browser pages connected to this session, and one of them has browser that needs to be restarted.\n\nWhoever didn't get the download should restart their Web browser.  You don't need to close down this session.  Simply shut down all windows for the Web browser, then restart the browser and navigate back to this page.  You'll find it on \"my nanoHUB\" listed under \"my sessions\".  Once the browser is restarted, the download should work properly."
                 } else {
                     bgerror $result
@@ -380 +388 @@
 
 # ----------------------------------------------------------------------
-# USAGE: _uploadValue
+# USAGE: _uploadValue ?<key> <value> <key> <value> ...?
 #
 # Invoked automatically whenever the user has uploaded data from
@@ -386 +394 @@
 # argument) and loads into the destination widget.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Loader::_uploadValue {string} {
+itcl::body Rappture::Loader::_uploadValue {args} {
     Rappture::Tooltip::cue hide  ;# take down the note about the popup window
+
+    array set data $args
+
+    if {[string length [string trim $data(data)]] == 0} {
+        switch -- $data(which) {
+            file {
+                set mesg "You indicated that you were uploading a file, but y"
+            }
+            text {
+                set mesg "You indicated that you were uploading text, but y"
+            }
+            default {
+                set mesg "Y"
+            }
+        }
+        Rappture::Tooltip::cue $itk_component(combo) \
+            "${mesg}ou didn't fill in any data on the upload form."
+        return
+    }
+
     #
     # BE CAREFUL:  This string may have binary characters that
@@ -394 +422 @@
     #   done with it.
     #
+    set string $data(data)
     regsub -all {[\000-\010\013\014\016-\037\177-\377]} $string {} string
     regsub -all "\r" $string "\n" string