mirror of https://github.com/rusefi/rusefi-1.git
Startup screen: should be a way to hit "enter" on connect button fix #1440
This commit is contained in:
parent
ce17e945b1
commit
81503a1fa7
|
@ -3,7 +3,6 @@ package com.rusefi;
|
||||||
import com.rusefi.autodetect.PortDetector;
|
import com.rusefi.autodetect.PortDetector;
|
||||||
import com.rusefi.io.LinkManager;
|
import com.rusefi.io.LinkManager;
|
||||||
import com.rusefi.io.serial.BaudRateHolder;
|
import com.rusefi.io.serial.BaudRateHolder;
|
||||||
import com.rusefi.io.serial.PortHolder;
|
|
||||||
import com.rusefi.maintenance.*;
|
import com.rusefi.maintenance.*;
|
||||||
import com.rusefi.ui.util.HorizontalLine;
|
import com.rusefi.ui.util.HorizontalLine;
|
||||||
import com.rusefi.ui.util.URLLabel;
|
import com.rusefi.ui.util.URLLabel;
|
||||||
|
@ -110,22 +109,19 @@ public class StartupFrame {
|
||||||
//connectButton.setBackground(new Color(RUSEFI_ORANGE)); // custom orange
|
//connectButton.setBackground(new Color(RUSEFI_ORANGE)); // custom orange
|
||||||
setToolTip(connectButton, "Connect to real hardware");
|
setToolTip(connectButton, "Connect to real hardware");
|
||||||
connectPanel.add(connectButton);
|
connectPanel.add(connectButton);
|
||||||
connectButton.addActionListener(new ActionListener() {
|
|
||||||
|
frame.getRootPane().setDefaultButton(connectButton);
|
||||||
|
connectButton.addKeyListener(new KeyAdapter() {
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void keyPressed(KeyEvent e) {
|
||||||
BaudRateHolder.INSTANCE.baudRate = Integer.parseInt((String) comboSpeeds.getSelectedItem());
|
if (e.getKeyCode() == KeyEvent.VK_ENTER) {
|
||||||
String selectedPort = comboPorts.getSelectedItem().toString();
|
connectButtonAction(comboSpeeds);
|
||||||
if (SerialPortScanner.AUTO_SERIAL.equals(selectedPort)) {
|
|
||||||
String autoDetectedPort = PortDetector.autoDetectPort(StartupFrame.this.frame);
|
|
||||||
if (autoDetectedPort == null)
|
|
||||||
return;
|
|
||||||
selectedPort = autoDetectedPort;
|
|
||||||
}
|
}
|
||||||
disposeFrameAndProceed();
|
|
||||||
new Launcher(selectedPort);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
connectButton.addActionListener(e -> connectButtonAction(comboSpeeds));
|
||||||
|
|
||||||
leftPanel.add(realHardwarePanel);
|
leftPanel.add(realHardwarePanel);
|
||||||
leftPanel.add(miscPanel);
|
leftPanel.add(miscPanel);
|
||||||
|
|
||||||
|
@ -225,6 +221,19 @@ public class StartupFrame {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void connectButtonAction(JComboBox<String> comboSpeeds) {
|
||||||
|
BaudRateHolder.INSTANCE.baudRate = Integer.parseInt((String) comboSpeeds.getSelectedItem());
|
||||||
|
String selectedPort = comboPorts.getSelectedItem().toString();
|
||||||
|
if (SerialPortScanner.AUTO_SERIAL.equals(selectedPort)) {
|
||||||
|
String autoDetectedPort = PortDetector.autoDetectPort(StartupFrame.this.frame);
|
||||||
|
if (autoDetectedPort == null)
|
||||||
|
return;
|
||||||
|
selectedPort = autoDetectedPort;
|
||||||
|
}
|
||||||
|
disposeFrameAndProceed();
|
||||||
|
new Launcher(selectedPort);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Here we listen to keystrokes while console start-up frame is being displayed and if magic "test" word is typed
|
* Here we listen to keystrokes while console start-up frame is being displayed and if magic "test" word is typed
|
||||||
* we launch a functional test on real hardware, same as Jenkins runs within continues integration
|
* we launch a functional test on real hardware, same as Jenkins runs within continues integration
|
||||||
|
|
Loading…
Reference in New Issue