diff --git a/java_console/logging/src/com/rusefi/FileLog.java b/java_console/logging/src/com/rusefi/FileLog.java index 91bb1f0be1..bff4f2f73b 100644 --- a/java_console/logging/src/com/rusefi/FileLog.java +++ b/java_console/logging/src/com/rusefi/FileLog.java @@ -15,6 +15,7 @@ public enum FileLog { SIMULATOR_CONSOLE; public static final String DIR = "out/"; + public static final String LOG_INFO_TEXT = "Writing logs to '" + DIR + "'"; public static String currentLogName; public static final String END_OF_TIMESTAND_TAG = ": "; public static final Logger LOGGER = new Logger() { diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 42505b2b23..1153a13995 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -44,7 +44,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20170218; + public static final int CONSOLE_VERSION = 20170222; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port"; diff --git a/java_console/ui/src/com/rusefi/ui/WarningPanel.java b/java_console/ui/src/com/rusefi/ui/WarningPanel.java index fc2840b8bb..f7b9c7ea2c 100644 --- a/java_console/ui/src/com/rusefi/ui/WarningPanel.java +++ b/java_console/ui/src/com/rusefi/ui/WarningPanel.java @@ -1,5 +1,6 @@ package com.rusefi.ui; +import com.rusefi.FileLog; import com.rusefi.Launcher; import com.rusefi.core.MessagesCentral; import com.rusefi.ui.util.UiUtils; @@ -13,7 +14,7 @@ public class WarningPanel { private static final String WARNING = "WARNING"; private static final String ERROR = "firmware error"; - private final JPanel panel = new JPanel(new BorderLayout()); + private final JPanel panel = new JPanel(new FlowLayout()); private final JLabel label = new JLabel(); private final JButton reset = new JButton("clear warning"); @@ -27,7 +28,7 @@ public class WarningPanel { public WarningPanel() { label.setForeground(Color.red); - panel.add(label, BorderLayout.WEST); + panel.add(label); Font currentFont = label.getFont(); label.setFont(currentFont.deriveFont((float) (currentFont.getSize() * 1.5))); @@ -61,7 +62,9 @@ public class WarningPanel { } } }); - panel.add(reset, BorderLayout.EAST); + panel.add(reset); + // todo: only display label if logs are being recorded + panel.add(new JLabel(FileLog.LOG_INFO_TEXT)); } private void clear() { diff --git a/java_console/ui/src/com/rusefi/ui/logview/LogViewer.java b/java_console/ui/src/com/rusefi/ui/logview/LogViewer.java index d240a36f8f..6d436609ff 100644 --- a/java_console/ui/src/com/rusefi/ui/logview/LogViewer.java +++ b/java_console/ui/src/com/rusefi/ui/logview/LogViewer.java @@ -37,7 +37,7 @@ public class LogViewer extends JPanel { return pathname.getName().contains("MAIN_rfi_report"); } }; - public static final String DEFAULT_LOG_LOCATION = "out"; + public static final String DEFAULT_LOG_LOCATION = FileLog.DIR; private final JLabel folderLabel = new JLabel(); private final JLabel fileLabel = new JLabel(); private final DefaultListModel fileListModel = new DefaultListModel();