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

maybe less confusion layout

This commit is contained in:
rusefi 2018-10-12 15:17:56 -04:00
parent df0ae75d94
commit 4549803fa9
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -45,7 +45,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20181010;
public static final int CONSOLE_VERSION = 20181012;
public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port";

56
java_console/ui/src/com/rusefi/StartupFrame.java
View File

@ -15,6 +15,7 @@ import org.jetbrains.annotations.NotNull;
import org.putgemin.VerticalFlowLayout;
import javax.swing.*;
import javax.swing.border.TitledBorder;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -57,8 +58,17 @@ public class StartupFrame {
@NotNull
private List<String> currentlyDisplayedPorts = new ArrayList<>();
private boolean isFirstTimeApplyingPorts = true;
private JPanel leftPanel;
private JPanel leftPanel = new JPanel(new VerticalFlowLayout());
private JPanel realHardwarePanel = new JPanel(new VerticalFlowLayout(VerticalFlowLayout.LEADING, 5, 10));
private JPanel miscPanel = new JPanel(new VerticalFlowLayout(VerticalFlowLayout.TRAILING)) {
@Override
public Dimension getPreferredSize() {
// want miscPanel and realHardwarePanel to be the same width
Dimension size = super.getPreferredSize();
return new Dimension(Math.max(size.width, realHardwarePanel.getPreferredSize().width), size.height);
}
};
/**
* this flag tells us if we are closing the startup frame in order to proceed with console start or if we are
* closing the application.
@ -89,10 +99,13 @@ public class StartupFrame {
}
public void chooseSerialPort() {
realHardwarePanel.setBorder(new TitledBorder(BorderFactory.createLineBorder(Color.darkGray), "Real stm32"));
miscPanel.setBorder(new TitledBorder(BorderFactory.createLineBorder(Color.darkGray), "Miscellaneous"));
// leftPanel.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10),
// BorderFactory.createLineBorder(Color.darkGray)));
leftPanel = new JPanel(new VerticalFlowLayout());
leftPanel.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10),
BorderFactory.createLineBorder(Color.darkGray)));
connectPanel.add(comboPorts);
final JComboBox<String> comboSpeeds = createSpeedCombo();
@ -109,11 +122,22 @@ public class StartupFrame {
}
});
leftPanel.add(connectPanel);
leftPanel.add(noPortsMessage);
leftPanel.add(realHardwarePanel);
leftPanel.add(miscPanel);
realHardwarePanel.add(connectPanel);
realHardwarePanel.add(noPortsMessage);
installMessage(noPortsMessage, "Check you cables. Check your drivers. Do you want to start simulator maybe?");
leftPanel.add(new URLLabel(VCP_DRIVER_TEXT, VCP_DRIVER_URI));
leftPanel.add(new HorizontalLine());
realHardwarePanel.add(new URLLabel(VCP_DRIVER_TEXT, VCP_DRIVER_URI));
if (ProcessStatusWindow.isWindows()) {
realHardwarePanel.add(new HorizontalLine());
realHardwarePanel.add(new OlderDiscoveryChecbbox().getButton());
realHardwarePanel.add(new FirmwareFlasher(FirmwareFlasher.IMAGE_DEBUG_FILE, "Program Firmware/Debug").getButton());
realHardwarePanel.add(new FirmwareFlasher(FirmwareFlasher.IMAGE_RELEASE_FILE, "Program Firmware/Release").getButton());
realHardwarePanel.add(new EraseChip().getButton());
}
findAndApplyPorts();
@ -127,20 +151,10 @@ public class StartupFrame {
}
});
leftPanel.add(buttonLogViewer);
leftPanel.add(new HorizontalLine());
miscPanel.add(buttonLogViewer);
miscPanel.add(new HorizontalLine());
leftPanel.add(SimulatorHelper.createSimulatorComponent(this));
if (ProcessStatusWindow.isWindows()) {
leftPanel.add(new HorizontalLine());
leftPanel.add(new OlderDiscoveryChecbbox().getButton());
leftPanel.add(new FirmwareFlasher(FirmwareFlasher.IMAGE_DEBUG_FILE, "Program Firmware/Debug").getButton());
leftPanel.add(new HorizontalLine());
leftPanel.add(new FirmwareFlasher(FirmwareFlasher.IMAGE_RELEASE_FILE, "Program Firmware/Release").getButton());
leftPanel.add(new HorizontalLine());
leftPanel.add(new EraseChip().getButton());
}
miscPanel.add(SimulatorHelper.createSimulatorComponent(this));
JPanel rightPanel = new JPanel(new VerticalFlowLayout());