rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-29 18:52:13 +01:00
Code Issues Releases Activity

SerialMonitor: added "no line ending" alert

Browse Source
This commit is contained in:
Federico Fissore 2013-07-17 11:25:33 +02:00
parent 2ce3a4a8fc
commit 12cddf0d90
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/processing/app/AbstractMonitor.java
View File

@ -16,6 +16,7 @@ import static processing.app.I18n._;
public abstract class AbstractMonitor extends JFrame implements MessageConsumer { public abstract class AbstractMonitor extends JFrame implements MessageConsumer {
protected final JLabel noLineEndingAlert;
protected JTextArea textArea; protected JTextArea textArea;
protected JScrollPane scrollPane; protected JScrollPane scrollPane;
protected JTextField textField; protected JTextField textField;
@ -69,29 +70,33 @@ public abstract class AbstractMonitor extends JFrame implements MessageConsumer
getContentPane().add(scrollPane, BorderLayout.CENTER); getContentPane().add(scrollPane, BorderLayout.CENTER);
JPanel pane = new JPanel(); JPanel upperPane = new JPanel();
pane.setLayout(new BoxLayout(pane, BoxLayout.X_AXIS)); upperPane.setLayout(new BoxLayout(upperPane, BoxLayout.X_AXIS));
pane.setBorder(new EmptyBorder(4, 4, 4, 4)); upperPane.setBorder(new EmptyBorder(4, 4, 4, 4));
textField = new JTextField(40); textField = new JTextField(40);
sendButton = new JButton(_("Send")); sendButton = new JButton(_("Send"));
pane.add(textField); upperPane.add(textField);
pane.add(Box.createRigidArea(new Dimension(4, 0))); upperPane.add(Box.createRigidArea(new Dimension(4, 0)));
pane.add(sendButton); upperPane.add(sendButton);
getContentPane().add(pane, BorderLayout.NORTH); getContentPane().add(upperPane, BorderLayout.NORTH);
pane = new JPanel(); final JPanel pane = new JPanel();
pane.setLayout(new BoxLayout(pane, BoxLayout.X_AXIS)); pane.setLayout(new BoxLayout(pane, BoxLayout.X_AXIS));
pane.setBorder(new EmptyBorder(4, 4, 4, 4)); pane.setBorder(new EmptyBorder(4, 4, 4, 4));
autoscrollBox = new JCheckBox(_("Autoscroll"), true); autoscrollBox = new JCheckBox(_("Autoscroll"), true);
noLineEndingAlert = new JLabel(I18n.format(_("You've pressed {0} but nothing was sent. Should you select a line ending?"), _("Send")));
noLineEndingAlert.setForeground(pane.getBackground());
lineEndings = new JComboBox(new String[]{_("No line ending"), _("Newline"), _("Carriage return"), _("Both NL & CR")}); lineEndings = new JComboBox(new String[]{_("No line ending"), _("Newline"), _("Carriage return"), _("Both NL & CR")});
lineEndings.addActionListener(new ActionListener() { lineEndings.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent event) { public void actionPerformed(ActionEvent event) {
Preferences.setInteger("serial.line_ending", lineEndings.getSelectedIndex()); Preferences.setInteger("serial.line_ending", lineEndings.getSelectedIndex());
noLineEndingAlert.setForeground(pane.getBackground());
} }
}); });
if (Preferences.get("serial.line_ending") != null) { if (Preferences.get("serial.line_ending") != null) {
@ -113,6 +118,8 @@ public abstract class AbstractMonitor extends JFrame implements MessageConsumer
pane.add(autoscrollBox); pane.add(autoscrollBox);
pane.add(Box.createHorizontalGlue()); pane.add(Box.createHorizontalGlue());
pane.add(noLineEndingAlert);
pane.add(Box.createRigidArea(new Dimension(8, 0)));
pane.add(lineEndings); pane.add(lineEndings);
pane.add(Box.createRigidArea(new Dimension(8, 0))); pane.add(Box.createRigidArea(new Dimension(8, 0)));
pane.add(serialRates); pane.add(serialRates);

5
app/src/processing/app/SerialMonitor.java
View File

@ -20,6 +20,7 @@ package processing.app;
import processing.core.PApplet; import processing.core.PApplet;
import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
@ -77,6 +78,10 @@ public class SerialMonitor extends AbstractMonitor {
s += "\r\n"; s += "\r\n";
break; break;
} }
if ("".equals(s) && lineEndings.getSelectedIndex() == 0 && !Preferences.has("runtime.line.ending.alert.notified")) {
noLineEndingAlert.setForeground(Color.RED);
Preferences.set("runtime.line.ending.alert.notified", "true");
}
serial.write(s); serial.write(s);
} }
} }