From f7fe11c8258ecd5d7c3da8de45f09ceb729e31a1 Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Mon, 13 Apr 2015 17:18:23 +0200 Subject: [PATCH] Reviewed warnings key names and dropdown in Preferences --- app/src/processing/app/Preferences.java | 2 +- hardware/arduino/avr/platform.txt | 6 +++--- hardware/arduino/sam/platform.txt | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java index 55591555f..88d8545f9 100644 --- a/app/src/processing/app/Preferences.java +++ b/app/src/processing/app/Preferences.java @@ -377,7 +377,7 @@ public class Preferences { box = Box.createHorizontalBox(); label = new JLabel(_("Compiler warnings: ")); box.add(label); - WarningItem[] warningItems = new WarningItem[]{new WarningItem("none", _("none")), new WarningItem("normal", _("normal")), new WarningItem("all", _("all")), new WarningItem("extra", _("extra")), }; + WarningItem[] warningItems = new WarningItem[]{new WarningItem("none", _("None")), new WarningItem("default", _("Default")), new WarningItem("more", _("More")), new WarningItem("all", _("All")), }; comboWarnings = new JComboBox(warningItems); String currentWarningLevel = PreferencesData.get("compiler.warning_flags", "none"); for (WarningItem item : warningItems) { diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt index afe2f2312..a64209bf2 100644 --- a/hardware/arduino/avr/platform.txt +++ b/hardware/arduino/avr/platform.txt @@ -12,9 +12,9 @@ version=1.6.3 # --------------------- compiler.warning_flags.none=-w -compiler.warning_flags.normal= -compiler.warning_flags.all=-Wall -compiler.warning_flags.extra=-Wall -Wextra +compiler.warning_flags.default= +compiler.warning_flags.more=-Wall +compiler.warning_flags.all=-Wall -Wextra # Default "compiler.path" is correct, change only if you want to overidde the initial value compiler.path={runtime.tools.avr-gcc.path}/bin/ diff --git a/hardware/arduino/sam/platform.txt b/hardware/arduino/sam/platform.txt index 81306e034..b7978fbd6 100644 --- a/hardware/arduino/sam/platform.txt +++ b/hardware/arduino/sam/platform.txt @@ -12,9 +12,9 @@ version=1.6.3 # ---------------------- compiler.warning_flags.none=-w -compiler.warning_flags.normal= -compiler.warning_flags.all=-Wall -compiler.warning_flags.extra=-Wall -Wextra +compiler.warning_flags.default= +compiler.warning_flags.more=-Wall +compiler.warning_flags.all=-Wall -Wextra compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/ compiler.c.cmd=arm-none-eabi-gcc