From 99006fc5c68115a55b01b796a50d6a904c9b716c Mon Sep 17 00:00:00 2001 From: "Michael michael.sytko" Date: Sat, 28 Jan 2017 10:49:23 +0100 Subject: [PATCH] Serial Monitor: added "clear output" button --- app/src/processing/app/AbstractTextMonitor.java | 8 ++++++++ app/src/processing/app/SerialMonitor.java | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/app/src/processing/app/AbstractTextMonitor.java b/app/src/processing/app/AbstractTextMonitor.java index b1272589c..b2bd49d65 100644 --- a/app/src/processing/app/AbstractTextMonitor.java +++ b/app/src/processing/app/AbstractTextMonitor.java @@ -34,6 +34,7 @@ public abstract class AbstractTextMonitor extends AbstractMonitor { protected JScrollPane scrollPane; protected JTextField textField; protected JButton sendButton; + protected JButton clearButton; protected JCheckBox autoscrollBox; protected JComboBox lineEndings; protected JComboBox serialRates; @@ -76,6 +77,7 @@ public abstract class AbstractTextMonitor extends AbstractMonitor { }); sendButton = new JButton(tr("Send")); + clearButton = new JButton(tr("Clear output")); upperPane.add(textField); upperPane.add(Box.createRigidArea(new Dimension(4, 0))); @@ -116,6 +118,7 @@ public abstract class AbstractTextMonitor extends AbstractMonitor { serialRates.setMaximumSize(serialRates.getMinimumSize()); pane.add(autoscrollBox); + pane.add(clearButton); pane.add(Box.createHorizontalGlue()); pane.add(noLineEndingAlert); pane.add(Box.createRigidArea(new Dimension(8, 0))); @@ -129,6 +132,7 @@ public abstract class AbstractTextMonitor extends AbstractMonitor { protected void onEnableWindow(boolean enable) { textArea.setEnabled(enable); + clearButton.setEnabled(enable); scrollPane.setEnabled(enable); textField.setEnabled(enable); sendButton.setEnabled(enable); @@ -141,6 +145,10 @@ public abstract class AbstractTextMonitor extends AbstractMonitor { textField.addActionListener(listener); sendButton.addActionListener(listener); } + + public void onClearCommand(ActionListener listener) { + clearButton.addActionListener(listener); + } public void onSerialRateChange(ActionListener listener) { serialRates.addActionListener(listener); diff --git a/app/src/processing/app/SerialMonitor.java b/app/src/processing/app/SerialMonitor.java index 3d5f24ea3..45adbd7d5 100644 --- a/app/src/processing/app/SerialMonitor.java +++ b/app/src/processing/app/SerialMonitor.java @@ -62,6 +62,12 @@ public class SerialMonitor extends AbstractTextMonitor { textField.setText(""); } }); + + onClearCommand(new ActionListener() { + public void actionPerformed(ActionEvent e) { + textArea.setText(""); + } + }); } private void send(String s) {