Merge branch 'JohnDev'

Author: jmpollak

Mini Project/src/CardLayoutFrame.java

@@ -149,6 +149,10 @@ private void createGamePanel()
     // Fourth Unique Panel Results/Score Screen
     private void createResultsPanel()
     {
+        ResultLabelFrame framyLabel = new ResultLabelFrame(); // create LabelFrame
+        framyLabel.setDefaultCloseOperation( JFrame.EXIT_ON_CLOSE );
+        framyLabel.setSize( 500, 500 ); // set frame size
+        framyLabel.setVisible( true ); // display frame
         JPanel resultsPanel = new JPanel();
         resultsPanel.add(new JLabel("Results Screen: " + username + " scored: " + score));
         cardPanel.add(resultsPanel, "R");

Mini Project/src/LabelFrame.java

@@ -0,0 +1,27 @@
+import javax.swing.*;
+import java.awt.*;
+
+public class LabelFrame extends JFrame {
+    public JLabel label3; // JLabel with added text and icon
+
+    // LabelFrame constructor adds JLabels to JFrame
+    public LabelFrame() {
+        super("Custom Image");
+        setLayout(new BorderLayout()); // set frame layout
+
+        // JLabel constructor with string, Icon and alignment arguments
+        Icon WelcomingImage = new ImageIcon(getClass().getResource("openImage.jpg"));
+
+        label3 = new JLabel(); // JLabel constructor no arguments
+        label3.setText("Label with icon and text at bottom");
+        label3.setIcon(WelcomingImage); // add icon to JLabel
+        label3.setHorizontalTextPosition(SwingConstants.CENTER);
+        label3.setVerticalTextPosition(SwingConstants.BOTTOM);
+        label3.setToolTipText("This is label3");
+        add(label3); // add label3 to JFrame
+
+
+//        add( label2 ); // add label3 to JFrame
+
+    }// end LabelFrame constructor
+}

Mini Project/src/Main.java

@@ -6,7 +6,11 @@ public static void main(String[] args)
     {
         CardLayoutFrame frame = new CardLayoutFrame();
         frame.setSize(800,600);
-        frame.setTitle("Trivia Game by John");
+        frame.setTitle("Trivia Game by John and Ella");
+        LabelFrame labelFrame = new LabelFrame(); // create LabelFrame
+        labelFrame.setDefaultCloseOperation( JFrame.EXIT_ON_CLOSE );
+        labelFrame.setSize( 500, 500 ); // set frame size
+        labelFrame.setVisible( true ); // display frame
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setLocationRelativeTo(null); // Set the location of this frame by some component. null means center
         frame.setVisible(true);

Mini Project/src/ResultLabelFrame.java

@@ -0,0 +1,27 @@
+import javax.swing.*;
+import java.awt.BorderLayout;
+
+public class ResultLabelFrame  extends JFrame {
+
+    public JLabel label2; // JLabel with added text and icon
+
+    public ResultLabelFrame() {
+        super( "Custom Image" );
+        setLayout( new BorderLayout() ); // set frame layout
+
+        // JLabel constructor with string, Icon and alignment arguments
+        Icon ResultsPercentages = new ImageIcon( getClass().getResource( "resultsImage.jpg" ) );
+
+        label2 = new JLabel(); // JLabel constructor no arguments
+        label2.setText("Label with icon and text at bottom");
+        label2.setIcon(ResultsPercentages ); // add icon to JLabel
+        label2.setHorizontalTextPosition(SwingConstants.CENTER );
+        label2.setVerticalTextPosition(SwingConstants.BOTTOM );
+        label2.setToolTipText("This is label2");
+
+        label2.setSize(500,500); // set frame size
+        label2.setVisible(true); // display frame
+
+        add(label2);
+    }
+}