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

better place for frame util code

This commit is contained in:
rusefillc 2023-09-26 22:50:09 -04:00
parent 83ddbcdc24
commit 29b2b2680e
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
java_console/core_ui/src/main/java/com/rusefi/core/ui/FrameHelper.java
View File

@ -1,5 +1,8 @@
package com.rusefi.core.ui;
import com.rusefi.core.io.BundleUtil;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
import java.awt.event.WindowAdapter;
@ -19,6 +22,19 @@ public class FrameHelper {
public FrameHelper(int operation) {
frame.setDefaultCloseOperation(operation);
AutoupdateUtil.setAppIcon(frame);
}
@NotNull
public static String appendBundleName(String title) {
String bundleName = BundleUtil.readBundleFullNameNotNull();
return title + " " + bundleName;
}
public static FrameHelper createFrame(String title) {
FrameHelper frame = new FrameHelper();
frame.frame.setTitle(appendBundleName(title));
return frame;
}
public JFrame getFrame() {

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

@ -6,6 +6,7 @@ import com.rusefi.autodetect.SerialAutoChecker;
import com.rusefi.core.io.BundleUtil;
import com.rusefi.core.preferences.storage.PersistentConfiguration;
import com.rusefi.core.ui.AutoupdateUtil;
import com.rusefi.core.ui.FrameHelper;
import com.rusefi.io.LinkManager;
import com.rusefi.io.serial.BaudRateHolder;
import com.rusefi.maintenance.DriverInstall;
@ -75,8 +76,7 @@ public class StartupFrame {
public StartupFrame() {
// AudioPlayback.start();
String title = "rusEFI console version " + Launcher.CONSOLE_VERSION;
frame = new JFrame(appendBundleName(title));
frame.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
frame = FrameHelper.createFrame(title).getFrame();
frame.addWindowListener(new WindowAdapter() {
@Override
public void windowClosed(WindowEvent ev) {
@ -86,13 +86,6 @@ public class StartupFrame {
}
}
});
AutoupdateUtil.setAppIcon(frame);
}
@NotNull
public static String appendBundleName(String title) {
String bundleName = BundleUtil.readBundleFullNameNotNull();
return title + " " + bundleName;
}
public void chooseSerialPort() {

2
java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java
View File

@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import static com.rusefi.StartupFrame.appendBundleName;
import static com.rusefi.core.ui.FrameHelper.appendBundleName;
/**
* @see FirmwareFlasher

2
java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java
View File

@ -17,7 +17,7 @@ import java.io.File;
import java.util.Arrays;
import java.util.Objects;
import static com.rusefi.StartupFrame.appendBundleName;
import static com.rusefi.core.ui.FrameHelper.appendBundleName;
import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
import static com.rusefi.ui.util.UiUtils.trueLayout;