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

steps towards notepad++

This commit is contained in:
rusefillc 2022-02-22 16:01:51 -05:00
parent ab3bcadccf
commit 1e10c2a1af
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/shared_io/src/main/java/com/rusefi/rusEFIVersion.java
View File

@ -6,7 +6,7 @@ import java.net.URL;
import java.util.concurrent.atomic.AtomicReference;
public class rusEFIVersion {
public static final int CONSOLE_VERSION = 20220221;
public static final int CONSOLE_VERSION = 20220222;
public static AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
public static long classBuildTimeMillis() {

22
java_console/ui/src/main/java/com/rusefi/ui/lua/TextEditor.java
View File

@ -1,13 +1,17 @@
package com.rusefi.ui.lua;
import com.rusefi.config.generated.Fields;
import com.rusefi.ui.util.URLLabel;
import com.rusefi.ui.util.UiUtils;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.event.CaretEvent;
import javax.swing.event.CaretListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.AbstractDocument;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.undo.CannotRedoException;
import javax.swing.undo.CannotUndoException;
@ -26,6 +30,7 @@ public class TextEditor {
private final JPanel area = new JPanel(new BorderLayout());
private final JTextArea textArea = new JTextArea();
private final JLabel sizeLabel = new JLabel();
private final JLabel locationLabel = new JLabel();
public TextEditor() {
textArea.setTabSize(2);
@ -49,11 +54,24 @@ public class TextEditor {
}
});
textArea.addCaretListener(new CaretListener() {
@Override
public void caretUpdate(CaretEvent e) {
int offset = textArea.getCaretPosition();
try {
int line = textArea.getLineOfOffset(offset);
locationLabel.setText(Integer.toString(line + 1));
} catch (BadLocationException ignored) {
}
}
});
JScrollPane textAreaScroll = new JScrollPane(textArea, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
area.add(textAreaScroll, BorderLayout.CENTER);
JPanel bottomArea = new JPanel(new FlowLayout(FlowLayout.RIGHT));
JPanel bottomArea = new JPanel(new BorderLayout());
area.add(bottomArea, BorderLayout.SOUTH);
bottomArea.add(sizeLabel);
bottomArea.add(locationLabel, BorderLayout.WEST);
bottomArea.add(sizeLabel, BorderLayout.EAST);
installUndoRedoKeystrokes();
UiUtils.installPopupMenu(createPopupMenu(), textArea);