diff --git a/java_console/build.xml b/java_console/build.xml
index fbc39c94ad..9ac029d0a7 100644
--- a/java_console/build.xml
+++ b/java_console/build.xml
@@ -38,9 +38,14 @@
+
+
+
+
+
-
+
@@ -56,7 +61,6 @@
-
diff --git a/java_console/ui/resources/appicon.png b/java_console/ui/resources/com/rusefi/appicon.png
similarity index 100%
rename from java_console/ui/resources/appicon.png
rename to java_console/ui/resources/com/rusefi/appicon.png
diff --git a/java_console/ui/resources/com/rusefi/logo.gif b/java_console/ui/resources/com/rusefi/logo.gif
new file mode 100644
index 0000000000..6314214d14
Binary files /dev/null and b/java_console/ui/resources/com/rusefi/logo.gif differ
diff --git a/java_console/ui/src/com/irnems/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java
similarity index 98%
rename from java_console/ui/src/com/irnems/Launcher.java
rename to java_console/ui/src/com/rusefi/Launcher.java
index e7ca7b9419..2879ef68fb 100644
--- a/java_console/ui/src/com/irnems/Launcher.java
+++ b/java_console/ui/src/com/rusefi/Launcher.java
@@ -1,5 +1,6 @@
-package com.irnems;
+package com.rusefi;
+import com.irnems.FileLog;
import com.irnems.core.EngineState;
import com.irnems.core.MessagesCentral;
import com.rusefi.*;
diff --git a/java_console/ui/src/com/rusefi/SimulatorHelper.java b/java_console/ui/src/com/rusefi/SimulatorHelper.java
index 3b3b646e04..9fe773f1e8 100644
--- a/java_console/ui/src/com/rusefi/SimulatorHelper.java
+++ b/java_console/ui/src/com/rusefi/SimulatorHelper.java
@@ -1,6 +1,5 @@
package com.rusefi;
-import com.irnems.Launcher;
import com.rusefi.io.LinkManager;
import com.rusefi.io.tcp.TcpConnector;
diff --git a/java_console/ui/src/com/rusefi/StartupFrame.java b/java_console/ui/src/com/rusefi/StartupFrame.java
index 718b3afd04..67fb8f386e 100644
--- a/java_console/ui/src/com/rusefi/StartupFrame.java
+++ b/java_console/ui/src/com/rusefi/StartupFrame.java
@@ -1,6 +1,5 @@
package com.rusefi;
-import com.irnems.Launcher;
import com.rusefi.io.LinkManager;
import com.rusefi.io.tcp.TcpConnector;
import com.rusefi.ui.UiUtils;
@@ -28,7 +27,8 @@ import java.util.List;
*/
public class StartupFrame {
// todo: figure out a better way to work with absolute path
- public static final String APPICON_PNG = "../../appicon.png";
+ private static final String APPICON = "appicon.png";
+ private static final String LOGO = "logo.gif";
private static final String LINK_TEXT = "rusEfi (c) 2012-2015";
private static final String URI = "http://rusefi.com/?java_console";
@@ -49,7 +49,7 @@ public class StartupFrame {
}
public static void setAppIcon(JFrame frame) {
- ImageIcon icon = loadIcon(APPICON_PNG);
+ ImageIcon icon = loadIcon(APPICON);
if (icon != null)
frame.setIconImage(icon.getImage());
}
@@ -92,7 +92,13 @@ public class StartupFrame {
JPanel content = new JPanel(new BorderLayout());
content.add(startupOptions, BorderLayout.WEST);
- content.add(new JLabel("Logo"), BorderLayout.EAST);
+
+ ImageIcon logoIcon = loadIcon(LOGO);
+ if (logoIcon != null) {
+ JLabel logo = new JLabel(logoIcon);
+ logo.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
+ content.add(logo, BorderLayout.EAST);
+ }
frame.add(content);
frame.pack();
diff --git a/java_console/ui/src/com/rusefi/StimulationInputs.java b/java_console/ui/src/com/rusefi/StimulationInputs.java
index 66a83cfa0f..fd771b00c1 100644
--- a/java_console/ui/src/com/rusefi/StimulationInputs.java
+++ b/java_console/ui/src/com/rusefi/StimulationInputs.java
@@ -1,7 +1,5 @@
package com.rusefi;
-import com.irnems.Launcher;
-
import javax.swing.*;
import java.awt.*;
diff --git a/java_console/ui/src/com/rusefi/VersionChecker.java b/java_console/ui/src/com/rusefi/VersionChecker.java
index 090022f337..2d3caf84ae 100644
--- a/java_console/ui/src/com/rusefi/VersionChecker.java
+++ b/java_console/ui/src/com/rusefi/VersionChecker.java
@@ -13,7 +13,7 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import static com.irnems.Launcher.*;
+import static com.rusefi.Launcher.*;
/**
* This class checks the recommended versions numbers and compares them with current versions
diff --git a/java_console/ui/src/com/rusefi/ui/DefaultExceptionHandler.java b/java_console/ui/src/com/rusefi/ui/DefaultExceptionHandler.java
index dda9624cc2..7a1e59cd95 100644
--- a/java_console/ui/src/com/rusefi/ui/DefaultExceptionHandler.java
+++ b/java_console/ui/src/com/rusefi/ui/DefaultExceptionHandler.java
@@ -7,7 +7,7 @@ import java.awt.*;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
-import static com.irnems.Launcher.*;
+import static com.rusefi.Launcher.*;
import static javax.swing.JOptionPane.OK_OPTION;
/**