auto-sync

java_console/build.xml

@@ -38,9 +38,14 @@
         <mkdir dir="build/jar"/>
 	<delete file="${jar_file}"/>
 	<echo message="Building ${jar_file}"/>
+		<copy todir="build/classes">
+		<fileset dir="ui/resources" includes="**/*.gif"/>
+		<fileset dir="ui/resources" includes="**/*.png"/>
+
+</copy>
         <jar destfile="${jar_file}" basedir="build/classes">
             <manifest>
-                <attribute name="Main-Class" value="com.irnems.Launcher"/>
+                <attribute name="Main-Class" value="com.rusefi.Launcher"/>
             </manifest>
 		<zipfileset src="lib/SteelSeries-3.9.30.jar" includes="**/*.class"/>
 		<zipfileset src="lib/trident-6.2.jar" includes="**/*.class"/>
@@ -56,7 +61,6 @@
 		<zipfileset src="lib/batik/batik-awt-util.jar" includes="**/*.class"/>
 		<zipfileset src="lib/batik/batik-util.jar" includes="**/*.class"/>
 
-		<zipfileset dir="build/classes" includes="**/*.class"/>
         </jar>
     </target>
 

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.*;

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;
 

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();

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.*;
 

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

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;
 
 /**