diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6bc01a8..c3dfb30 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/src/data/control1.gif b/src/data/control1.gif
new file mode 100644
index 0000000..65d5c08
Binary files /dev/null and b/src/data/control1.gif differ
diff --git a/src/data/control2.png b/src/data/control2.png
new file mode 100644
index 0000000..15c5779
Binary files /dev/null and b/src/data/control2.png differ
diff --git a/src/data/controller.png b/src/data/controller.png
new file mode 100644
index 0000000..0d18b15
Binary files /dev/null and b/src/data/controller.png differ
diff --git a/src/data/controller.svg b/src/data/controller.svg
new file mode 100644
index 0000000..6eeced9
--- /dev/null
+++ b/src/data/controller.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/gui/GameGUI.java b/src/gui/GameGUI.java
new file mode 100644
index 0000000..3975227
--- /dev/null
+++ b/src/gui/GameGUI.java
@@ -0,0 +1,41 @@
+package gui;
+
+import javax.swing.*;
+
+public class GameGUI {
+
+ private JFrame jf;
+
+ public GameGUI(){
+
+ jf = new JFrame();
+
+ jf.setTitle("CT-Conway's Game of Life");
+
+ ImageIcon imageIcon = new ImageIcon("src/data/icon.png");
+ jf.setIconImage(imageIcon.getImage());
+
+ //getContentPane().setBackground(Color.decode("#121212"));
+
+ jf.setUndecorated(false);
+
+ jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ jf.setAutoRequestFocus(false);
+ jf.setLayout(null);
+ jf.setSize(752, 424);
+ //jf.getContentPane().setPreferredSize(new Dimension(752, 423));
+
+ jf.setResizable(false);
+
+
+ //initComponents();
+ //addComponents();
+
+
+ jf.setLocationRelativeTo(null);
+ jf.setVisible(true);
+
+
+ }
+
+}
diff --git a/src/gui/StartGUI.java b/src/gui/StartGUI.java
index c8488cd..64c5677 100644
--- a/src/gui/StartGUI.java
+++ b/src/gui/StartGUI.java
@@ -38,7 +38,7 @@ public class StartGUI{
jf.setTitle("CT-Conway's Game of Life");
- ImageIcon imageIcon = new ImageIcon("src/data/icon.png");
+ ImageIcon imageIcon = new ImageIcon("src/data/cotroller.png");
jf.setIconImage(imageIcon.getImage());
//getContentPane().setBackground(Color.decode("#121212"));
@@ -68,7 +68,7 @@ public class StartGUI{
Font head = new Font("Segoe UI Light", Font.PLAIN, 24);
Font text = new Font("Segoe UI Light", Font.PLAIN, 16);
- heading = new JLabel("Conway's Game of Life Control");
+ heading = new JLabel("Control Panel");
heading.setFont(head);
heading.setForeground(Color.decode("#121212"));
heading.setBounds(50, 25, 400, 50);
@@ -210,7 +210,7 @@ public class StartGUI{
manuelStart.setBounds(225, 280, 150, 50);
- Icon gif = new ImageIcon("src/data/control.gif");
+ Icon gif = new ImageIcon("src/data/control2.png");
JLabel gifLabel = new JLabel(gif);
gifLabel.setBounds(391, 25, 336, 336);
jf.getContentPane().add(gifLabel);
diff --git a/src/main/Main.java b/src/main/Main.java
index ddb510f..b462156 100644
--- a/src/main/Main.java
+++ b/src/main/Main.java
@@ -1,15 +1,13 @@
package main;
+import gui.GameGUI;
import gui.StartGUI;
public class Main {
public static void main(String[] args) {
- StartGUI startGUI = new StartGUI();
- float x = 0;
-
-
-
+ GameGUI gameGUI = new GameGUI();
+// StartGUI startGUI = new StartGUI();
}