From 5a6af2cf02dbfb14f3b44ffeaeebe6d77c790a89 Mon Sep 17 00:00:00 2001
From: Fulvio Ieva <fulvio.ieva@gmail.com>
Date: Thu, 24 Jul 2014 16:31:06 +0200
Subject: [PATCH] add save when verifyng and uploading #1934

---
 app/src/processing/app/Editor.java      | 11 ++++++++++-
 app/src/processing/app/Preferences.java | 16 +++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 0451e2010..fddceb83a 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -1887,6 +1887,11 @@ public class Editor extends JFrame implements RunnerListener {
    */
   public void handleRun(final boolean verbose) {
     internalCloseRunner();
+    if (Preferences.getBoolean("save.verifyUpload")) {
+      if (sketch.isModified()) {
+        handleSave(true);
+      }
+    }
     running = true;
     toolbar.activate(EditorToolbar.RUN);
     status.progress(_("Compiling sketch..."));
@@ -2369,7 +2374,11 @@ public class Editor extends JFrame implements RunnerListener {
    * hitting export twice, quickly, and horking things up.
    */
   synchronized public void handleExport(final boolean usingProgrammer) {
-    //if (!handleExportCheckModified()) return;
+    if (Preferences.getBoolean("save.verifyUpload")) {
+      if (sketch.isModified()) {
+        handleSave(true);
+      }
+    }
     toolbar.activate(EditorToolbar.EXPORT);
     console.clear();
     status.progress(_("Uploading to I/O Board..."));
diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
index dc2b04b99..c2a1f993c 100644
--- a/app/src/processing/app/Preferences.java
+++ b/app/src/processing/app/Preferences.java
@@ -208,6 +208,7 @@ public class Preferences {
   JCheckBox updateExtensionBox;
   JCheckBox autoAssociateBox;
   JComboBox comboLanguage;
+  JCheckBox saveVerifyUploadBox;
 
 
   // the calling editor, so updates can be applied
@@ -478,6 +479,15 @@ public class Preferences {
         autoAssociateBox.setEnabled(false);
     }
 
+    // [ ] save when verifying or uploading
+
+    saveVerifyUploadBox = new JCheckBox(_("Save when verifying or uploading"));
+    pain.add(saveVerifyUploadBox);
+    d = saveVerifyUploadBox.getPreferredSize();
+    saveVerifyUploadBox.setBounds(left, top, d.width + 10, d.height);
+    right = Math.max(right, left + d.width);
+    top += d.height + GUI_BETWEEN;
+
     // More preferences are in the ...
 
     label = new JLabel(_("More preferences can be edited directly in the file"));
@@ -620,7 +630,8 @@ public class Preferences {
     setBoolean("upload.verbose", verboseUploadBox.isSelected());
     setBoolean("editor.linenumbers", displayLineNumbersBox.isSelected());
     setBoolean("upload.verify", verifyUploadBox.isSelected());
-    
+    setBoolean("save.verifyUpload", saveVerifyUploadBox.isSelected());
+
 //    setBoolean("sketchbook.closing_last_window_quits",
 //               closingLastQuitsBox.isSelected());
     //setBoolean("sketchbook.prompt", sketchPromptBox.isSelected());
@@ -642,6 +653,7 @@ public class Preferences {
 
     setBoolean("editor.external", externalEditorBox.isSelected());
     setBoolean("update.check", checkUpdatesBox.isSelected());
+    setBoolean("save.verifyUpload", saveVerifyUploadBox.isSelected());
 
     /*
       // was gonna use this to check memory settings,
@@ -703,6 +715,8 @@ public class Preferences {
       setSelected(getBoolean("editor.external"));
     checkUpdatesBox.
       setSelected(getBoolean("update.check"));
+    saveVerifyUploadBox.
+      setSelected(getBoolean("save.verifyUpload"));
 
     if (autoAssociateBox != null) {
       autoAssociateBox.