From 4aeeef4f46210e5ad7e44482705d0d812f8ee315 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Tue, 30 Jun 2020 20:20:00 -0400
Subject: [PATCH] more on icons

---
 java_console/models/src/com/rusefi/rusEFIVersion.java      | 2 +-
 java_console/ui/src/main/java/com/rusefi/ConsoleUI.java    | 2 ++
 java_console/ui/src/main/java/com/rusefi/StartupFrame.java | 7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/java_console/models/src/com/rusefi/rusEFIVersion.java b/java_console/models/src/com/rusefi/rusEFIVersion.java
index 690f9a3c58..e3ba183a59 100644
--- a/java_console/models/src/com/rusefi/rusEFIVersion.java
+++ b/java_console/models/src/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 = 20200627;
+    public static final int CONSOLE_VERSION = 20200630;
     public static AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
 }
diff --git a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
index 45047f76b5..d08e6a678b 100644
--- a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
+++ b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
@@ -28,6 +28,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.rusefi.StartupFrame.setFrameIcon;
 import static com.rusefi.rusEFIVersion.CONSOLE_VERSION;
 import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
 
@@ -63,6 +64,7 @@ public class ConsoleUI {
         this.port = port;
         mainFrame = new MainFrame(this, tabbedPane);
         ConsoleUI.staticFrame = mainFrame.getFrame().getFrame();
+        setFrameIcon(ConsoleUI.staticFrame);
         FileLog.MAIN.logLine("Console " + CONSOLE_VERSION);
 
         FileLog.MAIN.logLine("Hardware: " + FirmwareFlasher.getHardwareKind());
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 6e1a956be0..1d83389065 100644
--- a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
+++ b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java
@@ -199,6 +199,7 @@ public class StartupFrame {
         content.add(rightPanel, BorderLayout.EAST);
         frame.add(content);
         frame.pack();
+        setFrameIcon(frame);
         frame.setVisible(true);
         UiUtils.centerWindow(frame);
 
@@ -209,6 +210,12 @@ public class StartupFrame {
         }
     }
 
+    public static void setFrameIcon(Frame frame) {
+        ImageIcon icon = AutoupdateUtil.loadIcon(LOGO);
+        if (icon != null)
+            frame.setIconImage(icon.getImage());
+    }
+
     public static JLabel createLogoLabel() {
         ImageIcon logoIcon = AutoupdateUtil.loadIcon(LOGO);
         if (logoIcon == null)