From 6f96ce0df240abb931f0f38377d915c78c5689f8 Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Sun, 11 Jul 2010 15:31:34 +0000
Subject: [PATCH] Adding drop-down for selecting line ending to serial monitor
 (issue #119).  Also switching subpanes from BorderLayout to BoxLayout.

---
 app/src/processing/app/SerialMonitor.java | 34 +++++++++++++++++------
 build/shared/revisions.txt                |  3 ++
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/src/processing/app/SerialMonitor.java b/app/src/processing/app/SerialMonitor.java
index 19294cdb4..ab8a4693d 100644
--- a/app/src/processing/app/SerialMonitor.java
+++ b/app/src/processing/app/SerialMonitor.java
@@ -35,6 +35,7 @@ public class SerialMonitor extends JFrame implements MessageConsumer {
   private JTextField textField;
   private JButton sendButton;
   private JCheckBox autoscrollBox;
+  private JComboBox lineEndings;
   private JComboBox serialRates;
   private int serialRate;
 
@@ -74,7 +75,8 @@ public class SerialMonitor extends JFrame implements MessageConsumer {
     
     getContentPane().add(scrollPane, BorderLayout.CENTER);
     
-    JPanel pane = new JPanel(new BorderLayout(4, 0));
+    JPanel pane = new JPanel();
+    pane.setLayout(new BoxLayout(pane, BoxLayout.X_AXIS));
     pane.setBorder(new EmptyBorder(4, 4, 4, 4));
 
     textField = new JTextField(40);
@@ -91,17 +93,25 @@ public class SerialMonitor extends JFrame implements MessageConsumer {
         textField.setText("");
       }});
     
-    pane.add(textField, BorderLayout.CENTER);
-    pane.add(sendButton, BorderLayout.EAST);
+    lineEndings = new JComboBox(new String[] { "No line ending", "Newline", "Carriage return", "Both" });
+    lineEndings.setMaximumSize(lineEndings.getMinimumSize());
+  
+    pane.add(textField);
+    pane.add(Box.createRigidArea(new Dimension(4, 0)));
+    pane.add(sendButton);
+    pane.add(Box.createRigidArea(new Dimension(8, 0)));
+    pane.add(lineEndings);
     
     getContentPane().add(pane, BorderLayout.NORTH);
     
-    pane = new JPanel(new BorderLayout(4, 0));
+    pane = new JPanel();
+    pane.setLayout(new BoxLayout(pane, BoxLayout.X_AXIS));
     pane.setBorder(new EmptyBorder(4, 4, 4, 4));
     
     autoscrollBox = new JCheckBox("Automatically scroll when new data is received.", true);
-    pane.add(autoscrollBox, BorderLayout.CENTER);
-  
+    pane.add(autoscrollBox);
+    pane.add(Box.createHorizontalGlue());
+    
     String[] serialRateStrings = {
       "300","1200","2400","4800","9600","14400",
       "19200","28800","38400","57600","115200"
@@ -126,8 +136,10 @@ public class SerialMonitor extends JFrame implements MessageConsumer {
           System.err.println(e);
         }
       }});
+      
+    serialRates.setMaximumSize(serialRates.getMinimumSize());
     
-    pane.add(serialRates, BorderLayout.EAST);
+    pane.add(serialRates);
     
     getContentPane().add(pane, BorderLayout.SOUTH);
 
@@ -135,8 +147,14 @@ public class SerialMonitor extends JFrame implements MessageConsumer {
   }
   
   private void send(String s) {
-    if (serial != null)
+    if (serial != null) {
+      switch (lineEndings.getSelectedIndex()) {
+        case 1: s += "\n"; break;
+        case 2: s += "\r"; break;
+        case 3: s += "\r\n"; break;
+      }
       serial.write(s);
+    }
   }
   
   public void openSerialPort() throws SerialException {
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 778e87427..54430d3dd 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -38,6 +38,9 @@ ARDUINO 0019
 * Adding control over scrolling in serial monitor.
   http://code.google.com/p/arduino/issues/detail?id=97
 
+* Added drop-down for selecting line endings to the serial monitor.
+  http://code.google.com/p/arduino/issues/detail?id=119
+
 * Fixed problem with tabs of the same name but different extensions.
   http://code.google.com/p/arduino/issues/detail?id=191