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

only: updater wl

This commit is contained in:
rusefillc 2024-08-09 00:24:22 -04:00
parent 7cffc0af6c
commit c797697a8a
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java_console/shared_io/src/main/java/com/rusefi/core/net/ConnectionAndMeta.java
View File

@ -108,6 +108,10 @@ public class ConnectionAndMeta {
new File(localTargetFileName).setLastModified(connectionAndMeta.getLastModified());
}
public static boolean isDefaultWhitelabel(String whiteLabel) {
return DEFAULT_WHITE_LABEL.equals(whiteLabel);
}
public HttpURLConnection getHttpConnection() {
return httpConnection;
}

3
java_console/ui/src/main/java/com/rusefi/StartupFrame.java
View File

@ -2,6 +2,7 @@ package com.rusefi;
import com.devexperts.logging.Logging;
import com.rusefi.core.io.BundleUtil;
import com.rusefi.core.net.ConnectionAndMeta;
import com.rusefi.core.preferences.storage.PersistentConfiguration;
import com.rusefi.core.ui.FrameHelper;
import com.rusefi.io.LinkManager;
@ -214,7 +215,7 @@ public class StartupFrame {
JLabel logo = LogoHelper.createLogoLabel();
if (logo != null)
rightPanel.add(logo);
if (UiProperties.isDefaultWhitelabel())
if (ConnectionAndMeta.isDefaultWhitelabel(UiProperties.getWhiteLabel()))
rightPanel.add(LogoHelper.createUrlLabel());
rightPanel.add(new JLabel("Console " + Launcher.CONSOLE_VERSION));

4
java_console/ui/src/main/java/com/rusefi/UiProperties.java
View File

@ -31,10 +31,6 @@ public class UiProperties {
return ConnectionAndMeta.getWhiteLabel(getProperties());
}
public static boolean isDefaultWhitelabel() {
return ConnectionAndMeta.DEFAULT_WHITE_LABEL.equals(getWhiteLabel());
}
public static String getUpdateHelpUrl() {
return properties.getProperty("UPDATE_FW_HELP_URL");
}

7
java_console/ui/src/main/java/com/rusefi/ui/basic/BasicStartupFrame.java
View File

@ -5,6 +5,7 @@ import com.rusefi.SerialPortScanner;
import com.rusefi.StartupFrame;
import com.rusefi.autodetect.PortDetector;
import com.rusefi.core.FindFileHelper;
import com.rusefi.core.net.ConnectionAndMeta;
import com.rusefi.core.ui.FrameHelper;
import com.rusefi.maintenance.DfuFlasher;
import com.rusefi.maintenance.ProgramSelector;
@ -42,7 +43,8 @@ public class BasicStartupFrame {
}
public BasicStartupFrame() {
String title = "rusEFI basic console " + Launcher.CONSOLE_VERSION;
String whiteLabel = ConnectionAndMeta.getWhiteLabel(ConnectionAndMeta.getProperties());
String title = whiteLabel + " basic console " + Launcher.CONSOLE_VERSION;
frame = FrameHelper.createFrame(title);
JPanel panel = new JPanel(new VerticalFlowLayout());
if (isWindows()) {
@ -95,7 +97,8 @@ public class BasicStartupFrame {
JLabel logoLabel = LogoHelper.createLogoLabel();
if (logoLabel != null)
panel.add(logoLabel);
panel.add(LogoHelper.createUrlLabel());
if (ConnectionAndMeta.isDefaultWhitelabel(whiteLabel))
panel.add(LogoHelper.createUrlLabel());
frame.showFrame(panel, false);
UiUtils.centerWindow(frame.getFrame());