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 2043256..0000000
Binary files a/firestar/src/main/resources/logo_about.png and /dev/null differ