mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-17 22:23:10 +03:00
Moving line endings selection combo-box.
This commit is contained in:
@ -93,14 +93,9 @@ public class SerialMonitor extends JFrame implements MessageConsumer {
|
|||||||
textField.setText("");
|
textField.setText("");
|
||||||
}});
|
}});
|
||||||
|
|
||||||
lineEndings = new JComboBox(new String[] { "No line ending", "Newline", "Carriage return", "Both" });
|
|
||||||
lineEndings.setMaximumSize(lineEndings.getMinimumSize());
|
|
||||||
|
|
||||||
pane.add(textField);
|
pane.add(textField);
|
||||||
pane.add(Box.createRigidArea(new Dimension(4, 0)));
|
pane.add(Box.createRigidArea(new Dimension(4, 0)));
|
||||||
pane.add(sendButton);
|
pane.add(sendButton);
|
||||||
pane.add(Box.createRigidArea(new Dimension(8, 0)));
|
|
||||||
pane.add(lineEndings);
|
|
||||||
|
|
||||||
getContentPane().add(pane, BorderLayout.NORTH);
|
getContentPane().add(pane, BorderLayout.NORTH);
|
||||||
|
|
||||||
@ -108,9 +103,10 @@ public class SerialMonitor extends JFrame implements MessageConsumer {
|
|||||||
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("Automatically scroll when new data is received.", true);
|
autoscrollBox = new JCheckBox("Autoscroll", true);
|
||||||
pane.add(autoscrollBox);
|
|
||||||
pane.add(Box.createHorizontalGlue());
|
lineEndings = new JComboBox(new String[] { "No line ending", "Newline", "Carriage return", "Both NL & CR" });
|
||||||
|
lineEndings.setMaximumSize(lineEndings.getMinimumSize());
|
||||||
|
|
||||||
String[] serialRateStrings = {
|
String[] serialRateStrings = {
|
||||||
"300","1200","2400","4800","9600","14400",
|
"300","1200","2400","4800","9600","14400",
|
||||||
@ -139,6 +135,10 @@ public class SerialMonitor extends JFrame implements MessageConsumer {
|
|||||||
|
|
||||||
serialRates.setMaximumSize(serialRates.getMinimumSize());
|
serialRates.setMaximumSize(serialRates.getMinimumSize());
|
||||||
|
|
||||||
|
pane.add(autoscrollBox);
|
||||||
|
pane.add(Box.createHorizontalGlue());
|
||||||
|
pane.add(lineEndings);
|
||||||
|
pane.add(Box.createRigidArea(new Dimension(8, 0)));
|
||||||
pane.add(serialRates);
|
pane.add(serialRates);
|
||||||
|
|
||||||
getContentPane().add(pane, BorderLayout.SOUTH);
|
getContentPane().add(pane, BorderLayout.SOUTH);
|
||||||
|
Reference in New Issue
Block a user