1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00

Merge pull request #2973 from ffissore/warnings

Reviewed warnings key names and dropdown in Preferences
This commit is contained in:
Federico Fissore 2015-04-17 23:55:54 +02:00
commit 38d5e916ca
3 changed files with 7 additions and 7 deletions

View File

@ -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) {

View File

@ -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/

View File

@ -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