Skip to content

Commit

Permalink
new icon
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam- committed Jan 27, 2024
1 parent 4ca62a9 commit b389702
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ private void storeIcon()
{
if (OSType.getOSType() == OSType.Linux && !Files.exists(notifyIconPath))
{
try (InputStream stream = Notifier.class.getResourceAsStream("/runelite.png"))
try (InputStream stream = Notifier.class.getResourceAsStream("/net/runelite/client/ui/runelite_128.png"))
{
Files.copy(stream, notifyIconPath);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.Arrays;
import javax.swing.JFrame;
import lombok.AccessLevel;
import lombok.Setter;
Expand All @@ -38,7 +39,7 @@ public class DevToolsFrame extends JFrame

public DevToolsFrame()
{
setIconImage(ClientUI.ICON);
setIconImages(Arrays.asList(ClientUI.ICON_256, ClientUI.ICON_16));

setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class InventoryInspector extends DevToolsFrame

setLayout(new BorderLayout());
setTitle("RuneLite Inventory Inspector");
setIconImage(ClientUI.ICON);
setIconImages(Arrays.asList(ClientUI.ICON_256, ClientUI.ICON_16));

tree.setBorder(new EmptyBorder(2, 2, 2, 2));
tree.setRootVisible(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import java.awt.image.BufferedImage;
import java.time.Duration;
import java.util.ArrayDeque;
import java.util.Arrays;
import java.util.Deque;
import java.util.TreeSet;
import java.util.function.Function;
Expand Down Expand Up @@ -130,7 +131,8 @@ public class ClientUI
private static final String CONFIG_CLIENT_BOUNDS = "clientBounds";
private static final String CONFIG_CLIENT_MAXIMIZED = "clientMaximized";
private static final String CONFIG_CLIENT_SIDEBAR_CLOSED = "clientSidebarClosed";
public static final BufferedImage ICON = ImageUtil.loadImageResource(ClientUI.class, "/runelite.png");
public static final BufferedImage ICON_256 = ImageUtil.loadImageResource(ClientUI.class, "runelite_128.png");
public static final BufferedImage ICON_16 = ImageUtil.loadImageResource(ClientUI.class, "runelite_16.png");

@Getter
private TrayIcon trayIcon;
Expand Down Expand Up @@ -321,7 +323,7 @@ public void init() throws Exception
OSXUtil.tryEnableFullscreen(frame);

frame.setTitle(title);
frame.setIconImage(ICON);
frame.setIconImages(Arrays.asList(ICON_256, ICON_16));
frame.setLocationRelativeTo(frame.getOwner());
frame.setResizable(true);

Expand Down Expand Up @@ -585,7 +587,7 @@ public void show()
// Create tray icon (needs to be created after frame is packed)
if (config.enableTrayIcon())
{
trayIcon = createTrayIcon(ICON, title, frame);
trayIcon = createTrayIcon(ICON_16, title, frame);
}

// Move frame around (needs to be done after frame is packed)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.net.ConnectException;
import java.net.UnknownHostException;
import java.security.GeneralSecurityException;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
Expand Down Expand Up @@ -70,9 +71,9 @@ public FatalErrorDialog(String message)

try
{
BufferedImage logo = ImageUtil.loadImageResource(FatalErrorDialog.class, "runelite_transparent.png");
setIconImage(logo);
setIconImages(Arrays.asList(ClientUI.ICON_256, ClientUI.ICON_16));

BufferedImage logo = ImageUtil.loadImageResource(FatalErrorDialog.class, "runelite_splash.png");
JLabel runelite = new JLabel();
runelite.setIcon(new ImageIcon(logo));
runelite.setAlignmentX(Component.CENTER_ALIGNMENT);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import javax.annotation.Nullable;
import javax.swing.ImageIcon;
import javax.swing.JFrame;
Expand Down Expand Up @@ -66,19 +67,18 @@ public class SplashScreen extends JFrame implements ActionListener

private SplashScreen()
{
BufferedImage logo = ImageUtil.loadImageResource(SplashScreen.class, "runelite_transparent.png");

setTitle("RuneLite Launcher");

setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setUndecorated(true);
setIconImage(logo);
setIconImages(Arrays.asList(ClientUI.ICON_256, ClientUI.ICON_16));
setLayout(null);
Container pane = getContentPane();
pane.setBackground(ColorScheme.DARKER_GRAY_COLOR);

Font font = new Font(Font.DIALOG, Font.PLAIN, 12);

BufferedImage logo = ImageUtil.loadImageResource(SplashScreen.class, "runelite_splash.png");
JLabel logoLabel = new JLabel(new ImageIcon(logo));
pane.add(logoLabel);
logoLabel.setBounds(0, 0, WIDTH, WIDTH);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.Arrays;
import java.util.Objects;
import java.util.function.Consumer;
import javax.swing.JDialog;
Expand Down Expand Up @@ -113,7 +114,7 @@ public class RuneliteColorPicker extends JDialog
setSize(FRAME_WIDTH, FRAME_HEIGHT);
setBackground(ColorScheme.PROGRESS_COMPLETE_COLOR);
setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setIconImage(ClientUI.ICON);
setIconImages(Arrays.asList(ClientUI.ICON_256, ClientUI.ICON_16));

JPanel content = new JPanel(new BorderLayout());
content.setBorder(new EmptyBorder(15, 15, 15, 15));
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed runelite-client/src/main/resources/runelite.png
Binary file not shown.

0 comments on commit b389702

Please sign in to comment.