rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-21 15:54:39 +01:00
Code Issues Releases Activity

Renamed preferences 'save.verifyUpload' to 'editor.save_on_verify'

Browse Source
This commit is contained in:
Cristian Maglie 2014-11-09 20:44:12 +01:00
parent 9a441d6dae
commit 9a9fef808c
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/processing/app/Editor.java
View File

@ -1887,7 +1887,7 @@ public class Editor extends JFrame implements RunnerListener {
*/ */
public void handleRun(final boolean verbose) { public void handleRun(final boolean verbose) {
internalCloseRunner(); internalCloseRunner();
if (Preferences.getBoolean("save.verifyUpload")) { if (Preferences.getBoolean("editor.save_on_verify")) {
if (sketch.isModified() && !sketch.isReadOnly()) { if (sketch.isModified() && !sketch.isReadOnly()) {
handleSave(true); handleSave(true);
} }
@ -2374,7 +2374,7 @@ public class Editor extends JFrame implements RunnerListener {
* hitting export twice, quickly, and horking things up. * hitting export twice, quickly, and horking things up.
*/ */
synchronized public void handleExport(final boolean usingProgrammer) { synchronized public void handleExport(final boolean usingProgrammer) {
if (Preferences.getBoolean("save.verifyUpload")) { if (Preferences.getBoolean("editor.save_on_verify")) {
if (sketch.isModified() && !sketch.isReadOnly()) { if (sketch.isModified() && !sketch.isReadOnly()) {
handleSave(true); handleSave(true);
} }

6
app/src/processing/app/Preferences.java
View File

@ -630,7 +630,7 @@ public class Preferences {
setBoolean("upload.verbose", verboseUploadBox.isSelected()); setBoolean("upload.verbose", verboseUploadBox.isSelected());
setBoolean("editor.linenumbers", displayLineNumbersBox.isSelected()); setBoolean("editor.linenumbers", displayLineNumbersBox.isSelected());
setBoolean("upload.verify", verifyUploadBox.isSelected()); setBoolean("upload.verify", verifyUploadBox.isSelected());
setBoolean("save.verifyUpload", saveVerifyUploadBox.isSelected()); setBoolean("editor.save_on_verify", saveVerifyUploadBox.isSelected());
// setBoolean("sketchbook.closing_last_window_quits", // setBoolean("sketchbook.closing_last_window_quits",
// closingLastQuitsBox.isSelected()); // closingLastQuitsBox.isSelected());
@ -653,7 +653,7 @@ public class Preferences {
setBoolean("editor.external", externalEditorBox.isSelected()); setBoolean("editor.external", externalEditorBox.isSelected());
setBoolean("update.check", checkUpdatesBox.isSelected()); setBoolean("update.check", checkUpdatesBox.isSelected());
setBoolean("save.verifyUpload", saveVerifyUploadBox.isSelected()); setBoolean("editor.save_on_verify", saveVerifyUploadBox.isSelected());
/* /*
// was gonna use this to check memory settings, // was gonna use this to check memory settings,
@ -716,7 +716,7 @@ public class Preferences {
checkUpdatesBox. checkUpdatesBox.
setSelected(getBoolean("update.check")); setSelected(getBoolean("update.check"));
saveVerifyUploadBox. saveVerifyUploadBox.
setSelected(getBoolean("save.verifyUpload")); setSelected(getBoolean("editor.save_on_verify"));
if (autoAssociateBox != null) { if (autoAssociateBox != null) {
autoAssociateBox. autoAssociateBox.

3
build/shared/lib/preferences.txt
View File

@ -149,6 +149,9 @@ editor.divider.size = 0
# but keeps it from being annoyingly obtrusive # but keeps it from being annoyingly obtrusive
editor.divider.size.windows = 2 editor.divider.size.windows = 2
# automatically save sketch when verifying or uploading
editor.save_on_verify = true
# any additional java options when running externally # any additional java options when running externally
# (for applets that are run external to the environment... # (for applets that are run external to the environment...
# those with a code folder, or using any libraries) # those with a code folder, or using any libraries)