From 0699bc3644ffa96a03c9930115392afa6ab2580d Mon Sep 17 00:00:00 2001 From: Downforce Agent Date: Fri, 12 Jul 2024 13:50:00 -0500 Subject: [PATCH] rowlf cleanup --- firestar/src/main/java/MissPiggy.java | 2 +- firestar/src/main/java/Rowlf.form | 21 ++++++++++++++++++--- firestar/src/main/java/Rowlf.java | 13 ++++++++++--- firestar/src/main/resources/logo_about.png | Bin 13640 -> 0 bytes 4 files changed, 29 insertions(+), 7 deletions(-) delete mode 100644 firestar/src/main/resources/logo_about.png diff --git a/firestar/src/main/java/MissPiggy.java b/firestar/src/main/java/MissPiggy.java index 759be61..0a7d007 100644 --- a/firestar/src/main/java/MissPiggy.java +++ b/firestar/src/main/java/MissPiggy.java @@ -366,7 +366,7 @@ public class MissPiggy implements ActionListener { } } else if (actionEvent.getSource() == helpMenu.getItem(5)) {StartErnie();} else - if (actionEvent.getSource() == helpMenu.getItem(6)) {new Rowlf().displayAboutScreen();} + if (actionEvent.getSource() == helpMenu.getItem(6)) {new Rowlf();} } // Will likely split the below functions into separate classes to work with intellij GUI designer. diff --git a/firestar/src/main/java/Rowlf.form b/firestar/src/main/java/Rowlf.form index 20e14cf..85cdfdd 100644 --- a/firestar/src/main/java/Rowlf.form +++ b/firestar/src/main/java/Rowlf.form @@ -5,16 +5,22 @@ - + + + + + - - + + + + @@ -26,6 +32,11 @@ + + + + + @@ -38,6 +49,8 @@ + + @@ -49,6 +62,8 @@ + + diff --git a/firestar/src/main/java/Rowlf.java b/firestar/src/main/java/Rowlf.java index 5a79b1e..81394d1 100644 --- a/firestar/src/main/java/Rowlf.java +++ b/firestar/src/main/java/Rowlf.java @@ -26,21 +26,28 @@ import java.io.IOException; import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE; public class Rowlf { + private BufferedImage windowIcon; JFrame frame = new JFrame(); JPanel frameContainer; - BufferedImage logo; + Image logo; JLabel picLabel; private JTextField informationText; private JLabel versionLabel; private JLabel environmentLabel; - public void displayAboutScreen() { + public Rowlf() { try { - logo = ImageIO.read(Main.class.getResourceAsStream("/logo_about.png")); + logo = ImageIO.read(Main.class.getResourceAsStream("/logo.png")).getScaledInstance(333, 100, Image.SCALE_SMOOTH); } catch (IOException e) { System.out.println("ERROR: Failed to open About screen because we couldn't find an image needed to display the page."); throw new RuntimeException(e); } + try { + windowIcon = ImageIO.read(Main.class.getResourceAsStream("/titleIcon.png")); + frame.setIconImage(windowIcon); + } catch (IOException e) { + System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon."); + } //frame.add(picLabel); frame.add(frameContainer); // initialize window contents -- will be handled by IntelliJ IDEA diff --git a/firestar/src/main/resources/logo_about.png b/firestar/src/main/resources/logo_about.png deleted file mode 100644 index 204325648d5c7d8ecb96d5ca7448abaad996a8fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13640 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 G`2Pb(dLy*}