From 58ddfea3df33a8dd8539d816a2f4cfd721126b5e Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 20 Dec 2020 16:27:04 -0500 Subject: [PATCH] bundle name into frame title --- .../models/src/main/java/com/rusefi/rusEFIVersion.java | 2 +- java_console/ui/src/main/java/com/rusefi/StartupFrame.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 4f4fadc13a..c8dbe09ead 100644 --- a/java_console/models/src/main/java/com/rusefi/rusEFIVersion.java +++ b/java_console/models/src/main/java/com/rusefi/rusEFIVersion.java @@ -6,7 +6,7 @@ import java.net.URL; import java.util.concurrent.atomic.AtomicReference; public class rusEFIVersion { - public static final int CONSOLE_VERSION = 20201205; + public static final int CONSOLE_VERSION = 20201220; public static AtomicReference firmwareVersion = new AtomicReference<>("N/A"); public static long classBuildTimeMillis() { 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 44599c3801..5164f3cacd 100644 --- a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java +++ b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java @@ -1,6 +1,7 @@ package com.rusefi; import com.rusefi.autodetect.PortDetector; +import com.rusefi.autoupdate.Autoupdate; import com.rusefi.autoupdate.AutoupdateUtil; import com.rusefi.io.LinkManager; import com.rusefi.io.serial.BaudRateHolder; @@ -24,6 +25,7 @@ import java.util.List; import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; import static com.rusefi.ui.util.UiUtils.getAllComponents; import static com.rusefi.ui.util.UiUtils.setToolTip; +import static java.awt.image.ImageObserver.ABORT; import static javax.swing.JOptionPane.YES_NO_OPTION; /** @@ -68,7 +70,9 @@ public class StartupFrame { public StartupFrame() { // AudioPlayback.start(); - frame = new JFrame("rusEFI console version " + Launcher.CONSOLE_VERSION); + String title = "rusEFI console version " + Launcher.CONSOLE_VERSION; + String bundleName = Autoupdate.readBundleFullName(); + frame = new JFrame(title + " " + (bundleName != null ? bundleName : "Unknown bundle")); frame.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); frame.addWindowListener(new WindowAdapter() { @Override