diff --git a/build.xml b/build.xml index add94f8db..1d03b9809 100644 --- a/build.xml +++ b/build.xml @@ -82,7 +82,7 @@ - + diff --git a/manifest.mf b/manifest.mf index 83f290abb..155ec901d 100644 --- a/manifest.mf +++ b/manifest.mf @@ -1,4 +1,4 @@ Manifest-Version: 1.0 -SplashScreen-Image: megabasterd/dot_com.jpg +SplashScreen-Image: megabasterd/dot_com.png X-COMMENT: Main-Class will be added automatically by build diff --git a/nbproject/project.properties b/nbproject/project.properties index ec5c2b965..21a6e4e26 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -92,7 +92,7 @@ run.classpath=\ # Space-separated list of JVM arguments used when running the project. # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value. # To set system properties for unit tests define test-sys-prop.name=value: -run.jvmargs=-splash:src/megabasterd/dot_com.jpg +run.jvmargs=-splash:src/megabasterd/dot_com.png run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} diff --git a/src/megabasterd/MainPanel.java b/src/megabasterd/MainPanel.java index 8151723d0..e692a326a 100644 --- a/src/megabasterd/MainPanel.java +++ b/src/megabasterd/MainPanel.java @@ -63,7 +63,7 @@ public final class MainPanel { public static final int THROTTLE_SLICE_SIZE=16*1024; public static final int STREAMER_PORT = 1337; public static final int WATCHDOG_PORT = 1338; - public static final String ICON_FILE = "pica_roja.png"; + public static final String ICON_FILE = "mbasterd_mini.png"; public static final ExecutorService THREAD_POOL = newCachedThreadPool(); public static final Font FONT_DEFAULT = createAndRegisterFont("Gochi.ttf"); diff --git a/src/megabasterd/MainPanelView.form b/src/megabasterd/MainPanelView.form index 6b71f032d..e4f685f67 100644 --- a/src/megabasterd/MainPanelView.form +++ b/src/megabasterd/MainPanelView.form @@ -207,7 +207,7 @@ - + diff --git a/src/megabasterd/MainPanelView.java b/src/megabasterd/MainPanelView.java index 125d12109..7e5481be5 100644 --- a/src/megabasterd/MainPanelView.java +++ b/src/megabasterd/MainPanelView.java @@ -214,7 +214,7 @@ public final class MainPanelView extends javax.swing.JFrame { setTitle("MegaBasterd"); - logo_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/mbasterd.png"))); // NOI18N + logo_label.setIcon(new javax.swing.ImageIcon(getClass().getResource("/megabasterd/mbasterd_logo_nuevo.png"))); // NOI18N logo_label.setDoubleBuffered(true); kiss_server_status.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N diff --git a/src/megabasterd/dot_com.jpg b/src/megabasterd/dot_com.jpg deleted file mode 100644 index b816b874d..000000000 Binary files a/src/megabasterd/dot_com.jpg and /dev/null differ diff --git a/src/megabasterd/dot_com.png b/src/megabasterd/dot_com.png new file mode 100644 index 000000000..583ba7bd2 Binary files /dev/null and b/src/megabasterd/dot_com.png differ diff --git a/src/megabasterd/mbasterd.png b/src/megabasterd/mbasterd.png deleted file mode 100644 index 7b2a99c87..000000000 Binary files a/src/megabasterd/mbasterd.png and /dev/null differ diff --git a/src/megabasterd/mbasterd_logo_nuevo.png b/src/megabasterd/mbasterd_logo_nuevo.png new file mode 100644 index 000000000..363810264 Binary files /dev/null and b/src/megabasterd/mbasterd_logo_nuevo.png differ diff --git a/src/megabasterd/mbasterd_mini.png b/src/megabasterd/mbasterd_mini.png new file mode 100644 index 000000000..88557498b Binary files /dev/null and b/src/megabasterd/mbasterd_mini.png differ diff --git a/src/megabasterd/pica_roja.png b/src/megabasterd/pica_roja.png deleted file mode 100644 index 2af053051..000000000 Binary files a/src/megabasterd/pica_roja.png and /dev/null differ