andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Working disconnect button in Console #4862

This commit is contained in:
rusefillc 2023-07-29 01:10:45 -04:00
parent aadf3cf123
commit 786caca2ac
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
java_console/ui/src/main/java/com/rusefi/ConnectionTab.java
View File

@ -8,12 +8,9 @@ import org.putgemin.VerticalFlowLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import static javax.swing.JComponent.WHEN_IN_FOCUSED_WINDOW;
public class ConnectionTab {
private final UIContext uiContext;
private final JPanel content = new JPanel(new BorderLayout());
@ -29,9 +26,7 @@ public class ConnectionTab {
JButton disconnect = new JButton("Disconnect");
KeyStroke disconnectKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK);
KeyStroke connectKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK);
vertical.add(new JLabel("Same shortcuts work while on Lua tab"));
vertical.add(new JLabel("Ctrl+R connect"));
vertical.add(connect);
vertical.add(new JLabel("Ctrl+D disconnect"));
@ -42,27 +37,27 @@ public class ConnectionTab {
disconnect.setEnabled(isConnected);
});
installConnectAndDisconnect(uiContext, content);
disconnect.addActionListener(e -> disconnect(uiContext));
connect.addActionListener(e -> reconnect(uiContext));
}
TextEditor.installKeyAction(connectKeyStroke, "connectCommand", content, new AbstractAction() {
public static void installConnectAndDisconnect(UIContext uiContext, JComponent control) {
KeyStroke disconnectKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK);
KeyStroke connectKeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK);
TextEditor.installKeyAction(connectKeyStroke, "connectCommand", control, new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
reconnect(uiContext);
}
});
TextEditor.installKeyAction(disconnectKeyStroke, "disconnectCommand", content, new AbstractAction() {
TextEditor.installKeyAction(disconnectKeyStroke, "disconnectCommand", control, new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
disconnect(uiContext);
}
});
disconnect.addActionListener(e -> disconnect(uiContext));
connect.addActionListener(e -> reconnect(uiContext));
}
private static void reconnect(UIContext uiContext) {

3
java_console/ui/src/main/java/com/rusefi/ui/lua/LuaScriptPanel.java
View File

@ -1,12 +1,12 @@
package com.rusefi.ui.lua;
import com.opensr5.ConfigurationImage;
import com.rusefi.ConnectionTab;
import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.config.generated.Fields;
import com.rusefi.io.ConnectionStatusLogic;
import com.rusefi.io.LinkManager;
import com.rusefi.ui.MessagesPanel;
import com.rusefi.ui.MessagesView;
import com.rusefi.ui.UIContext;
import com.rusefi.core.preferences.storage.Node;
import com.rusefi.ui.util.URLLabel;
@ -30,6 +30,7 @@ public class LuaScriptPanel {
public LuaScriptPanel(UIContext context, Node config) {
this.context = context;
ConnectionTab.installConnectAndDisconnect(context, mainPanel);
command = AnyCommand.createField(context, config, true, true);
// Upper panel: command entry, etc