mirror of https://github.com/rusefi/rusefi.git
better place for frame util code
This commit is contained in:
parent
83ddbcdc24
commit
29b2b2680e
|
@ -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() {
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue