From 0029d7237e76bc1fc4d23c659bcc59d9fa2d7fea Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 9 Jul 2020 15:58:31 -0400 Subject: [PATCH] this whole icon business was a huge mistake --- .../com/rusefi/autoupdate/AutoupdateUtil.java | 4 ++++ .../main/java/com/rusefi/rusEFIVersion.java | 2 +- .../main/java/com/rusefi/StartupFrame.java | 2 +- .../com/rusefi/maintenance/EraseChip.java | 2 +- .../rusefi/maintenance/ProgramSelector.java | 2 +- .../java/com/rusefi/ui/RecentCommands.java | 20 +++++++++---------- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/java_console/autoupdate/src/com/rusefi/autoupdate/AutoupdateUtil.java b/java_console/autoupdate/src/com/rusefi/autoupdate/AutoupdateUtil.java index 8fbd017010..78fc9632c4 100644 --- a/java_console/autoupdate/src/com/rusefi/autoupdate/AutoupdateUtil.java +++ b/java_console/autoupdate/src/com/rusefi/autoupdate/AutoupdateUtil.java @@ -72,6 +72,10 @@ public class AutoupdateUtil { if (imgURL != null) { return new ImageIcon(imgURL); } else { + imgURL = AutoupdateUtil.class.getResource("/com/rusefi/" + strPath); + if (imgURL != null) { + return new ImageIcon(imgURL); + } return null; } } diff --git a/java_console/models/src/main/java/com/rusefi/rusEFIVersion.java b/java_console/models/src/main/java/com/rusefi/rusEFIVersion.java index e3ba183a59..816cb1f962 100644 --- a/java_console/models/src/main/java/com/rusefi/rusEFIVersion.java +++ b/java_console/models/src/main/java/com/rusefi/rusEFIVersion.java @@ -3,6 +3,6 @@ package com.rusefi; import java.util.concurrent.atomic.AtomicReference; public class rusEFIVersion { - public static final int CONSOLE_VERSION = 20200630; + public static final int CONSOLE_VERSION = 20200709; public static AtomicReference firmwareVersion = new AtomicReference<>("N/A"); } diff --git a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java index 1d83389065..3d21eaec91 100644 --- a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java +++ b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java @@ -272,7 +272,7 @@ public class StartupFrame { } private Component createShowDeviceManagerButton() { - JButton showDeviceManager = new JButton(AutoupdateUtil.loadIcon("/com/rusefi/DeviceManager.png")); + JButton showDeviceManager = new JButton(AutoupdateUtil.loadIcon("DeviceManager.png")); showDeviceManager.setMargin(new Insets(0, 0, 0, 0)); showDeviceManager.setToolTipText("Show Device Manager"); showDeviceManager.addActionListener(event -> { diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/EraseChip.java b/java_console/ui/src/main/java/com/rusefi/maintenance/EraseChip.java index 52b8bf5d0d..0a3d42374d 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/EraseChip.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/EraseChip.java @@ -16,7 +16,7 @@ public class EraseChip { private static final String FLASH_SIZE = "0x0100000"; private static final String ERASE_COMMAND_SUFFIX = " -c init -c targets -c \"halt\" -c \"flash erase_address 0x08000000 " + FLASH_SIZE + "\" -c shutdown"; - private final JButton button = new JButton("ST-LINK Erase Chip", AutoupdateUtil.loadIcon("/com/rusefi/erase.png")); + private final JButton button = new JButton("ST-LINK Erase Chip", AutoupdateUtil.loadIcon("erase.png")); private StatusWindow wnd = new StatusWindow(); public EraseChip() { diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java index 623ed3641b..eb8d490d08 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java @@ -37,7 +37,7 @@ public class ProgramSelector { mode.setSelectedItem(persistedMode); JButton updateFirmware = new JButton("Update Firmware", - AutoupdateUtil.loadIcon("/com/rusefi/upload48.jpg")); + AutoupdateUtil.loadIcon("upload48.jpg")); controls.add(updateFirmware); JButton updateHelp = new JButton("?"); updateHelp.addActionListener(e -> URLLabel.open(HELP)); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java b/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java index da30787c6a..f813529de7 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java @@ -55,28 +55,28 @@ public class RecentCommands { private final static Map COMMAND_ICONS = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); static { - COMMAND_ICONS.put(STOPENGINE, AutoupdateUtil.loadIcon("/stop.jpg")); - ImageIcon infoIcon = AutoupdateUtil.loadIcon("/info.png"); + COMMAND_ICONS.put(STOPENGINE, AutoupdateUtil.loadIcon("stop.jpg")); + ImageIcon infoIcon = AutoupdateUtil.loadIcon("info.png"); COMMAND_ICONS.put(SHOWCONFIG, infoIcon); COMMAND_ICONS.put(HELP, AutoupdateUtil.loadIcon("help.jpg")); COMMAND_ICONS.put(ANALOGINFO, infoIcon); - COMMAND_ICONS.put(CMD_TRIGGERINFO, AutoupdateUtil.loadIcon("/trigger.jpg")); + COMMAND_ICONS.put(CMD_TRIGGERINFO, AutoupdateUtil.loadIcon("trigger.jpg")); COMMAND_ICONS.put(IDLEINFO, infoIcon); - COMMAND_ICONS.put(ALTINFO, AutoupdateUtil.loadIcon("/alternator.jpg")); + COMMAND_ICONS.put(ALTINFO, AutoupdateUtil.loadIcon("alternator.jpg")); COMMAND_ICONS.put(ACCELINFO, infoIcon); COMMAND_ICONS.put(TSINFO, infoIcon); COMMAND_ICONS.put(TPSINFO, infoIcon); COMMAND_ICONS.put(MAPINFO, infoIcon); - COMMAND_ICONS.put(joystickINFO, AutoupdateUtil.loadIcon("/joystick.png")); + COMMAND_ICONS.put(joystickINFO, AutoupdateUtil.loadIcon("joystick.png")); COMMAND_ICONS.put(CANINFO, infoIcon); COMMAND_ICONS.put(FUELINFO, infoIcon); COMMAND_ICONS.put(TEMPINFO, infoIcon); - COMMAND_ICONS.put(HIPINFO, AutoupdateUtil.loadIcon("/knock.jpg")); - COMMAND_ICONS.put(SDINFO, AutoupdateUtil.loadIcon("/sdinfo.jpg")); + COMMAND_ICONS.put(HIPINFO, AutoupdateUtil.loadIcon("knock.jpg")); + COMMAND_ICONS.put(SDINFO, AutoupdateUtil.loadIcon("sdinfo.jpg")); COMMAND_ICONS.put(FSIOINFO, infoIcon); COMMAND_ICONS.put(PINS, infoIcon); - COMMAND_ICONS.put(Fields.CMD_WRITECONFIG, AutoupdateUtil.loadIcon("/writeconfig.jpg")); - COMMAND_ICONS.put(SPEEDINFO, AutoupdateUtil.loadIcon("/speedinfo.jpg")); + COMMAND_ICONS.put(Fields.CMD_WRITECONFIG, AutoupdateUtil.loadIcon("writeconfig.jpg")); + COMMAND_ICONS.put(SPEEDINFO, AutoupdateUtil.loadIcon("speedinfo.jpg")); } private final JPanel content = new JPanel(new GridLayout(NUMBER_OF_COMMANDS + 1, 1)); @@ -170,7 +170,7 @@ public class RecentCommands { if (uiContext.getLinkManager().isLogViewer()) content.add(createButton(uiContext)); - JButton reset = new JButton(AutoupdateUtil.loadIcon("/undo.jpg")); + JButton reset = new JButton(AutoupdateUtil.loadIcon("undo.jpg")); reset.setContentAreaFilled(false); reset.setFocusPainted(false); reset.setBorder(BorderFactory.createEmptyBorder());