From f193ad746a4dcee4857db426b5db8b2b045e6e3e Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Fri, 18 Apr 2014 18:06:22 +0200 Subject: [PATCH] Added Parabot icon for mac users --- parabotv2/src/org/parabot/core/ui/BotUI.java | 2 ++ .../src/org/parabot/core/ui/LoginUI.java | 27 +++++++------------ .../org/parabot/core/ui/ServerSelector.java | 16 +++++------ 3 files changed, 19 insertions(+), 26 deletions(-) diff --git a/parabotv2/src/org/parabot/core/ui/BotUI.java b/parabotv2/src/org/parabot/core/ui/BotUI.java index 30e9413..c6a94a8 100644 --- a/parabotv2/src/org/parabot/core/ui/BotUI.java +++ b/parabotv2/src/org/parabot/core/ui/BotUI.java @@ -1,5 +1,6 @@ package org.parabot.core.ui; +import com.apple.eawt.Application; import org.parabot.core.Context; import org.parabot.core.ui.components.GamePanel; import org.parabot.core.ui.images.Images; @@ -46,6 +47,7 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener, this.setLayout(new BorderLayout()); this.addComponentListener(this); this.addWindowListener(this); + Application.getApplication().setDockIconImage(Images.getResource("/org/parabot/core/ui/images/icon.png")); JMenuBar menuBar = new JMenuBar(); diff --git a/parabotv2/src/org/parabot/core/ui/LoginUI.java b/parabotv2/src/org/parabot/core/ui/LoginUI.java index b4b2e34..c4bcf9b 100644 --- a/parabotv2/src/org/parabot/core/ui/LoginUI.java +++ b/parabotv2/src/org/parabot/core/ui/LoginUI.java @@ -1,28 +1,20 @@ package org.parabot.core.ui; -import java.awt.BorderLayout; -import java.awt.Desktop; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.RenderingHints; +import com.apple.eawt.Application; +import org.parabot.core.Core; +import org.parabot.core.forum.AccountManager; +import org.parabot.core.forum.AccountManagerAccess; +import org.parabot.core.ui.images.Images; +import org.parabot.core.ui.utils.SwingUtil; + +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.io.IOException; import java.net.URI; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JPasswordField; -import javax.swing.JTextField; - -import org.parabot.core.Core; -import org.parabot.core.forum.AccountManager; -import org.parabot.core.forum.AccountManagerAccess; -import org.parabot.core.ui.images.Images; -import org.parabot.core.ui.utils.SwingUtil; /** * @@ -90,6 +82,7 @@ public class LoginUI extends JFrame { this.setResizable(false); this.setIconImage(Images .getResource("/org/parabot/core/ui/images/icon.png")); + Application.getApplication().setDockIconImage(Images.getResource("/org/parabot/core/ui/images/icon.png")); int w = 250; int x = 8; diff --git a/parabotv2/src/org/parabot/core/ui/ServerSelector.java b/parabotv2/src/org/parabot/core/ui/ServerSelector.java index 245eae7..0a69961 100644 --- a/parabotv2/src/org/parabot/core/ui/ServerSelector.java +++ b/parabotv2/src/org/parabot/core/ui/ServerSelector.java @@ -1,14 +1,6 @@ package org.parabot.core.ui; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.util.LinkedList; -import java.util.Queue; - -import javax.swing.JFrame; -import javax.swing.JPanel; -import javax.swing.JScrollPane; - +import com.apple.eawt.Application; import org.parabot.core.desc.ServerDescription; import org.parabot.core.parsers.servers.ServerParser; import org.parabot.core.ui.images.Images; @@ -16,6 +8,11 @@ import org.parabot.core.ui.utils.SwingUtil; import org.parabot.core.ui.widgets.ServerWidget; import org.parabot.environment.Environment; +import javax.swing.*; +import java.awt.*; +import java.util.LinkedList; +import java.util.Queue; + /** * * Shows a list of every supported server which can be started @@ -52,6 +49,7 @@ public class ServerSelector extends JFrame { this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); this.setResizable(false); this.setIconImage(Images.getResource("/org/parabot/core/ui/images/icon.png")); + Application.getApplication().setDockIconImage(Images.getResource("/org/parabot/core/ui/images/icon.png")); this.panel = new JPanel(new BorderLayout()); this.panel.setPreferredSize(new Dimension(600, 400));