Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,22 @@
import com.faforever.iceadapter.debug.Debug;
import com.faforever.iceadapter.debug.DebugWindow;
import com.faforever.iceadapter.debug.InfoWindow;
import java.awt.*;
import java.awt.AWTException;
import java.awt.Image;
import java.awt.SystemTray;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.io.IOException;
import java.net.URL;
import java.io.InputStream;
import java.util.concurrent.CompletableFuture;
import javax.imageio.ImageIO;
import javax.swing.*;
import javax.swing.SwingUtilities;
import lombok.extern.slf4j.Slf4j;

@Slf4j
public class TrayIcon {

public static final String FAF_LOGO_URL = "https://faforever.com/images/faf-logo.png";
public static final String FAF_LOGO_FILE = "faf-logo.png";
private static volatile java.awt.TrayIcon trayIcon;

public static void create() {
Expand All @@ -27,10 +29,14 @@ public static void create() {
}

Image fafLogo = null;
try {
fafLogo = ImageIO.read(new URL(FAF_LOGO_URL));
try (final InputStream imageStream = TrayIcon.class.getClassLoader().getResourceAsStream(FAF_LOGO_FILE)) {
if (imageStream == null) {
log.error("Couldn't find '{}' in resource folder", FAF_LOGO_FILE);
return;
}
fafLogo = ImageIO.read(imageStream);
} catch (IOException e) {
log.error("Couldn't load FAF tray icon logo from URL");
log.error("Couldn't load FAF tray icon logo from resource folder", e);
return;
}

Expand Down
Binary file added ice-adapter/src/main/resources/faf-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.