Changeset 2253

Timestamp:

May 20, 2011, 1:00:35 PM (13 years ago)

Author:

mmc

Message:

Fixed the "save as..." to do a better job of knowing when changes need to
be saved. It used to be that if you set the program type, then saved, then
tried to exit, it would prompt you to save again. That's fixed now. Also
added a "cancel" button in case you are trying to exit, see that there are
changes, and want to cancel the exit.

File:

• trunk/builder/scripts/main.tcl (modified) (3 diffs)

trunk/builder/scripts/main.tcl

@@ -784 +784 @@
                 main_generate_xml
 
+                # change any !Language for the command into a proper
+                # invocation command.  Grab the XML before we do this
+                # as the last official XML that's been saved.  We'll
+                # know later if things changed and we need to save again.
+                set xmlBeforeCmdSubst [$ToolXml xml]
+
                 set cmd [$ToolXml get tool.command]
                 if {[string index $cmd 0] eq "!"} {
@@ -807 +813 @@
                     set status "error"
                 } else {
-                    set LastToolXmlLoaded [$ToolXml xml]
+                    set LastToolXmlLoaded $xmlBeforeCmdSubst
                 }
             }
@@ -966 +972 @@
 
     if {[$ToolXml xml] ne $LastToolXmlLoaded} {
-        set choice [tk_messageBox -icon warning -type yesno -title "Rappture: Save Changes?" -message "Changes to the current tool haven't been saved.\n\nSave changes?"]
+        set choice [tk_messageBox -icon warning -type yesnocancel -title "Rappture: Save Changes?" -message "Changes to the current tool haven't been saved.\n\nSave changes?"]
         if {$choice == "yes" && ![main_saveas]} {
+            return
+        } elseif {$choice == "cancel"} {
             return
         }