src/main/java/de/mannheim/th/chess/controller/ButtonMovePieceListener.java

@@ -27,22 +27,28 @@ public class ButtonMovePieceListener implements ActionListener {
     else
       this.game.playMove(this.mv);
 
+    this.game.setViewPointer(this.game.getMoveList().size() - 1);
+
     if (this.game.isDraw()) {
       this.game.stopClock();
       this.sf.setBoardMode(BoardMode.finished);
+      this.sf.enableControlPanelButtons();
       this.sf.showDraw();
     } else if (this.game.isMate()) {
       this.game.stopClock();
       this.sf.setBoardMode(BoardMode.finished);
+      this.sf.enableControlPanelButtons();
       this.sf.showWin(game.getActivePlayer());
+    } else {
+      this.sf.setBoardMode(BoardMode.normal);
     }
-    this.sf.setBoardMode(BoardMode.normal);
+
     this.sf.setCursor(null);
     this.sf.erstelleBrett();
-    
+
     if (game.getLastMove() != null) {
-        
-        sf.aktualisiereAusgabe();
+
+      sf.aktualisiereAusgabe();
     }
   }
 }

src/main/java/de/mannheim/th/chess/controller/controlPanel/BaseButtonViewListener.java

@@ -0,0 +1,24 @@
+package de.mannheim.th.chess.controller.controlPanel;
+
+import de.mannheim.th.chess.ui.SpielFrame;
+import de.mannheim.th.chess.domain.Game;
+
+public abstract class BaseButtonViewListener {
+  protected SpielFrame sf;
+  protected Game game;
+
+  public BaseButtonViewListener(Game game, SpielFrame sf) {
+    this.sf = sf;
+    this.game = game;
+  }
+
+  /**
+   * Loads the gamestate and renders the board
+   */
+  protected void updateView() {
+    this.game.loadView();
+    this.sf.setDefaultButtons();
+    this.sf.applyBoardButtons();
+    this.sf.ladeBrett();
+  }
+}

src/main/java/de/mannheim/th/chess/controller/controlPanel/ButtonQuickloadListener.java

@@ -0,0 +1,24 @@
+package de.mannheim.th.chess.controller.controlPanel;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import de.mannheim.th.chess.domain.Game;
+import de.mannheim.th.chess.ui.SpielFrame;
+
+public class ButtonQuickloadListener implements ActionListener {
+  private Game game;
+  private SpielFrame sf;
+
+  public ButtonQuickloadListener(Game game, SpielFrame sf) {
+    this.game = game;
+    this.sf = sf;
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    this.game.quickload();
+    this.sf.erstelleBrett();
+    this.sf.aktualisiereAusgabe();
+  }
+}

src/main/java/de/mannheim/th/chess/controller/controlPanel/ButtonQuicksaveListener.java

@@ -0,0 +1,19 @@
+package de.mannheim.th.chess.controller.controlPanel;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import de.mannheim.th.chess.domain.Game;
+
+public class ButtonQuicksaveListener implements ActionListener {
+  private Game game;
+
+  public ButtonQuicksaveListener(Game game) {
+    this.game = game;
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    this.game.quicksave();
+  }
+}

src/main/java/de/mannheim/th/chess/controller/controlPanel/ButtonViewBackListener.java

@@ -0,0 +1,24 @@
+package de.mannheim.th.chess.controller.controlPanel;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import de.mannheim.th.chess.domain.Game;
+import de.mannheim.th.chess.ui.SpielFrame;
+
+public class ButtonViewBackListener extends BaseButtonViewListener implements ActionListener {
+
+  public ButtonViewBackListener(Game game, SpielFrame sf) {
+    super(game, sf);
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    if (this.game.getViewPointer() > 0) {
+      this.game.setViewPointer(this.game.getViewPointer() - 1);
+      updateView();
+    }
+
+  }
+
+}

src/main/java/de/mannheim/th/chess/controller/controlPanel/ButtonViewFirstListener.java

@@ -0,0 +1,21 @@
+package de.mannheim.th.chess.controller.controlPanel;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import de.mannheim.th.chess.domain.Game;
+import de.mannheim.th.chess.ui.SpielFrame;
+
+public class ButtonViewFirstListener extends BaseButtonViewListener implements ActionListener {
+
+  public ButtonViewFirstListener(Game game, SpielFrame sf) {
+    super(game, sf);
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    this.game.setViewPointer(0);
+    updateView();
+  }
+
+}

src/main/java/de/mannheim/th/chess/controller/controlPanel/ButtonViewForwardListener.java

@@ -0,0 +1,24 @@
+package de.mannheim.th.chess.controller.controlPanel;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import de.mannheim.th.chess.domain.Game;
+import de.mannheim.th.chess.ui.SpielFrame;
+
+public class ButtonViewForwardListener extends BaseButtonViewListener implements ActionListener {
+
+  public ButtonViewForwardListener(Game game, SpielFrame sf) {
+    super(game, sf);
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    if (this.game.getMoveList().size() > this.game.getViewPointer()) {
+      this.game.setViewPointer(this.game.getViewPointer() + 1);
+      updateView();
+    }
+
+  }
+
+}

src/main/java/de/mannheim/th/chess/controller/controlPanel/ButtonViewLastListener.java

@@ -0,0 +1,22 @@
+
+package de.mannheim.th.chess.controller.controlPanel;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import de.mannheim.th.chess.domain.Game;
+import de.mannheim.th.chess.ui.SpielFrame;
+
+public class ButtonViewLastListener extends BaseButtonViewListener implements ActionListener {
+
+  public ButtonViewLastListener(Game game, SpielFrame sf) {
+    super(game, sf);
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent e) {
+    this.game.setViewPointer(this.game.getMoveList().size());
+    updateView();
+  }
+
+}

src/main/java/de/mannheim/th/chess/domain/Game.java

@@ -16,7 +16,6 @@ import com.github.bhlangonijr.chesslib.move.MoveList;
 import com.github.bhlangonijr.chesslib.pgn.PgnHolder;
 
 import de.mannheim.th.chess.App;
-import de.mannheim.th.chess.ui.SpielFrame;
 import de.mannheim.th.chess.utl.Clock;
 
 /**
@@ -29,23 +28,28 @@ public class Game {
 
   private Board board;
   private Clock clock;
-  private SpielFrame sp;
   private String modus;
   private boolean rotieren, zuruecknahme;
 
   private MoveList movelist;
+  private int viewPointer;
 
-  public Game() {
-
-    this.board = new Board();
-    this.movelist = new MoveList();
-    clock = new Clock("blitz");
-    clock.start();
-  }
+  private MoveList savestate;
+  private String startPosFen;
 
   /**
    * Conststructs a new standard GameBoard.
    */
+  public Game() {
+
+    this.board = new Board();
+    this.movelist = new MoveList();
+    this.startPosFen = this.board.getFen();
+
+    clock = new Clock("blitz");
+    clock.start();
+  }
+
   public Game(String modus, boolean rotieren, boolean zuruecknahme, String fen) {
     this.modus = modus;
     this.rotieren = rotieren;
@@ -58,12 +62,10 @@ public class Game {
 
     this.board.loadFromFen(fen);
 
+    this.startPosFen = this.board.getFen();
     this.movelist = new MoveList();
 
     clock = new Clock(modus);
-
-    sp = new SpielFrame(this);
-
   }
 
   /**
@@ -74,14 +76,14 @@ public class Game {
   public Game(MoveList movelist) {
     this.board = new Board();
 
+    this.startPosFen = this.board.getFen();
     this.movelist = movelist;
 
     for (Move move : movelist) {
       this.board.doMove(move);
     }
 
-    // this.clockPlayer1 = new Clock();
-    // this.clockPlayer2 = new Clock();
+    this.clock = new Clock("blitz");
   }
 
   /**
@@ -94,6 +96,7 @@ public class Game {
     this.board.loadFromFen(fen);
 
     this.movelist = new MoveList();
+    this.startPosFen = this.board.getFen();
     // this.sp = new SpielFrame();
 
     // this.clockPlayer1 = new Clock();
@@ -123,6 +126,37 @@ public class Game {
     this.movelist.removeLast();
   }
 
+  /**
+   * Copies the current move list to the savestate
+   */
+  public void quicksave() {
+    // TODO: save the current clocktime
+    this.savestate = new MoveList(this.movelist);
+
+    logger.info("Quicksaved...");
+  }
+
+  /**
+   * Loads the save state
+   *
+   * @brief creates a new board with the startPosFen and then plays all the moves
+   *        from the savestate
+   */
+  public void quickload() {
+    if (this.savestate != null) {
+
+      this.board = new Board();
+      this.movelist.clear();
+      this.board.loadFromFen(startPosFen);
+
+      for (Move move : savestate) {
+        this.playMove(move);
+      }
+
+      logger.info("Quickloaded...");
+    }
+  }
+
   /**
    * Plays the move on the board and adds it to the movelist
    *
@@ -272,11 +306,33 @@ public class Game {
     return board.getFen();
   }
 
-//  public Square getSelectedSquare() {
-//    return this.getSelectedSquare();
-//  }
+  // public Square getSelectedSquare() {
+  // return this.getSelectedSquare();
+  // }
 
   public String getUnicodeFromMove(Move move) {
     return board.getPiece(move.getTo()).getFanSymbol().toUpperCase();
   }
+
+  public void setViewPointer(int i) {
+    this.viewPointer = i;
+  }
+
+  public int getViewPointer() {
+    return this.viewPointer;
+  }
+
+  /**
+   * Loads the current view
+   *
+   * @brief Creates a new gameboard from the start pos and playes moves until it
+   *        reaches the viewPointer
+   */
+  public void loadView() {
+    this.board = new Board();
+    this.board.loadFromFen(this.startPosFen);
+    for (int i = 0; i < this.viewPointer; i++) {
+      this.board.doMove(this.movelist.get(i));
+    }
+  }
 }

src/main/java/de/mannheim/th/chess/ui/MainFrame.java

@@ -8,6 +8,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import de.mannheim.th.chess.App;
+import de.mannheim.th.chess.domain.Game;
 
 import javax.swing.JLabel;
 
@@ -23,86 +24,131 @@ import java.awt.Font;
 import java.awt.Color;
 
 public class MainFrame extends JFrame {
-	
-	private static final Logger logger = LogManager.getLogger(App.class);
 
-	private static final long serialVersionUID = 1L;
-	private JPanel contentPane;
+  private static final Logger logger = LogManager.getLogger(App.class);
 
-	/**
-	 * Create the frame.
-	 */
-	public MainFrame() {
+  private static final long serialVersionUID = 1L;
+  private JPanel contentPane;
+  private Game game;
 
-		setBackground(Color.LIGHT_GRAY);
-		setResizable(true);
-		setAlwaysOnTop(true);
-		setTitle("Schach");
-		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		setBounds(100, 100, 500, 500);
+  /**
+   * Create the frame.
+   */
+  public MainFrame() {
 
-		contentPane = new JPanel();
-		contentPane.setBackground(new Color(90, 90, 90));
-		contentPane.setForeground(Color.BLACK);
-		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
+    setBackground(Color.LIGHT_GRAY);
+    setResizable(true);
+    setAlwaysOnTop(true);
+    setTitle("Schach");
+    setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+    setBounds(100, 100, 500, 500);
 
-		setContentPane(contentPane);
+    contentPane = new JPanel();
+    contentPane.setBackground(new Color(90, 90, 90));
+    contentPane.setForeground(Color.BLACK);
+    contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
 
-		contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
+    setContentPane(contentPane);
 
-		contentPane.add(Box.createVerticalStrut(10));
+    contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
 
-		JLabel lblNewLabel = new JLabel("Schach");
-		lblNewLabel.setForeground(Color.BLACK);
-		lblNewLabel.setFont(new Font("Serif", Font.BOLD, 60));
-		lblNewLabel.setAlignmentX(Component.CENTER_ALIGNMENT);
-		contentPane.add(lblNewLabel);
+    contentPane.add(Box.createVerticalStrut(10));
 
-		contentPane.add(Box.createVerticalStrut(10));
+    JLabel lblNewLabel = new JLabel("Schach");
+    lblNewLabel.setForeground(Color.BLACK);
+    lblNewLabel.setFont(new Font("Serif", Font.BOLD, 60));
+    lblNewLabel.setAlignmentX(Component.CENTER_ALIGNMENT);
+    contentPane.add(lblNewLabel);
 
-		JLabel lblNewLabel_1 = new JLabel("by Dominik, Marius und Matias");
-		lblNewLabel_1.setFont(new Font("Calibri", Font.ITALIC, 24));
-		lblNewLabel_1.setAlignmentX(Component.CENTER_ALIGNMENT);
-		contentPane.add(lblNewLabel_1);
+    contentPane.add(Box.createVerticalStrut(10));
 
-		contentPane.add(Box.createVerticalStrut(75));
+    JLabel lblNewLabel_1 = new JLabel("by Dominik, Marius und Matias");
+    lblNewLabel_1.setFont(new Font("Calibri", Font.ITALIC, 24));
+    lblNewLabel_1.setAlignmentX(Component.CENTER_ALIGNMENT);
+    contentPane.add(lblNewLabel_1);
 
-		JButton btnNewButton = new JButton("Neues Spiel starten");
-		
-		btnNewButton.setBackground(Color.LIGHT_GRAY);
-		btnNewButton.setForeground(Color.BLACK);
-		btnNewButton.setFont(new Font("Tahoma", Font.BOLD, 16));
-		btnNewButton.setAlignmentX(Component.CENTER_ALIGNMENT);
-		btnNewButton.addActionListener(new ActionListener() {
+    contentPane.add(Box.createVerticalStrut(75));
 
-			@Override
-			public void actionPerformed(ActionEvent e) {
+    JButton btnNewButton = new JButton("Neues Spiel starten");
 
-				ModeSelectionFrame ms = new ModeSelectionFrame();
+    btnNewButton.setBackground(Color.LIGHT_GRAY);
+    btnNewButton.setForeground(Color.BLACK);
+    btnNewButton.setFont(new Font("Tahoma", Font.BOLD, 16));
+    btnNewButton.setAlignmentX(Component.CENTER_ALIGNMENT);
+    btnNewButton.addActionListener(new ActionListener() {
 
-			}
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        openSelectModeFrame();
+      }
 
-		});
-		contentPane.add(btnNewButton);
+    });
+    contentPane.add(btnNewButton);
 
-		contentPane.add(Box.createVerticalStrut(15));
+    contentPane.add(Box.createVerticalStrut(15));
 
-		JButton btnNewButton_2 = new JButton("App beenden");
-		
-		btnNewButton_2.setBackground(Color.LIGHT_GRAY);
-		btnNewButton_2.setForeground(Color.BLACK);
-		btnNewButton_2.setFont(new Font("Tahoma", Font.BOLD, 16));
-		btnNewButton_2.setAlignmentX(Component.CENTER_ALIGNMENT);
-		btnNewButton_2.addActionListener(new ActionListener() {
+    JButton pgnLoaderButton = new JButton("Lade aus PGN Datei");
+    pgnLoaderButton.addActionListener(e -> openPgnSelectFrame());
+    contentPane.add(pgnLoaderButton);
 
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				System.exit(0);
-			}
+    contentPane.add(Box.createVerticalStrut(15));
 
-		});
+    JButton btnNewButton_2 = new JButton("App beenden");
 
-		contentPane.add(btnNewButton_2);
-		setVisible(true);
-	}
+    btnNewButton_2.setBackground(Color.LIGHT_GRAY);
+    btnNewButton_2.setForeground(Color.BLACK);
+    btnNewButton_2.setFont(new Font("Tahoma", Font.BOLD, 16));
+    btnNewButton_2.setAlignmentX(Component.CENTER_ALIGNMENT);
+    btnNewButton_2.addActionListener(new ActionListener() {
+
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        System.exit(0);
+      }
+
+    });
+
+    contentPane.add(btnNewButton_2);
+    setVisible(true);
+  }
+
+  /**
+   * Starts the spielframe and game in playmode
+   */
+  public void startGame() {
+    if (this.game != null) {
+      this.game.stopClock();
+      SpielFrame sf = new SpielFrame(this.game);
+    }
+  }
+
+  /**
+   * Starts the spielframe and game in view mode
+   */
+  public void startView() {
+    if (this.game != null) {
+      this.game.stopClock();
+      SpielFrame sf = new SpielFrame(this.game);
+      sf.setMode(SpielFrame.BoardMode.finished);
+      sf.enableControlPanelButtons();
+    }
+  }
+
+  public void setGame(Game game) {
+    this.game = game;
+  }
+
+  /**
+   * opens the selectmodeframe
+   */
+  private void openSelectModeFrame() {
+    new ModeSelectionFrame(this);
+  }
+
+  /**
+   * Opens the pgnselectorframe
+   */
+  private void openPgnSelectFrame() {
+    new PGNLoaderFrame(this);
+  }
 }

src/main/java/de/mannheim/th/chess/ui/ModeSelectionFrame.java

@@ -20,118 +20,120 @@ import de.mannheim.th.chess.controller.ButtonFileLoaderListener;
 import de.mannheim.th.chess.domain.Game;
 
 public class ModeSelectionFrame extends JFrame {
-	
-	private static final Logger logger = LogManager.getLogger(App.class);
 
-    private static final long serialVersionUID = 1L;
-    private final JPanel contentPane;
-    private final ArrayList<Game> spiele = new ArrayList<>();
-    private String fen;
+  private static final Logger logger = LogManager.getLogger(App.class);
 
-    public ModeSelectionFrame() {
-        // Frame-Eigenschaften
-        setTitle("Modusauswahl");
-        setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-        setBounds(100, 100, 500, 500);
-        setResizable(true);
-        setAlwaysOnTop(true);
+  private static final long serialVersionUID = 1L;
+  private final JPanel contentPane;
+  private final ArrayList<Game> spiele = new ArrayList<>();
+  private String fen;
 
-        // Panel konfigurieren
-        contentPane = new JPanel();
-        contentPane.setBackground(new Color(90, 90, 90));
-        contentPane.setBorder(new EmptyBorder(20, 20, 20, 20));
-        contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
-        setContentPane(contentPane);
+  public ModeSelectionFrame(MainFrame mf) {
+    // Frame-Eigenschaften
+    setTitle("Modusauswahl");
+    setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+    setBounds(100, 100, 500, 500);
+    setResizable(true);
+    setAlwaysOnTop(true);
 
-        // Überschrift
-        JLabel jl = new JLabel("Welchen Modus wollen Sie spielen?");
-        jl.setFont(new Font("Calibri", Font.BOLD, 20));
-        jl.setForeground(Color.BLACK);
-        jl.setAlignmentX(Component.CENTER_ALIGNMENT);
-        contentPane.add(jl);
-        contentPane.add(Box.createVerticalStrut(15));
+    // Panel konfigurieren
+    contentPane = new JPanel();
+    contentPane.setBackground(new Color(90, 90, 90));
+    contentPane.setBorder(new EmptyBorder(20, 20, 20, 20));
+    contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
+    setContentPane(contentPane);
 
-        // Modusauswahl
-        String[] modi = {"Blitz", "Schnellschach", "Klassisch"};
-        JComboBox<String> jcb1  = new JComboBox<>(modi);
-        jcb1 .setMaximumSize(new Dimension(150, 30));
-        jcb1 .setAlignmentX(Component.CENTER_ALIGNMENT);
-        contentPane.add(jcb1 );
-        contentPane.add(Box.createVerticalStrut(15));
+    // Überschrift
+    JLabel jl = new JLabel("Welchen Modus wollen Sie spielen?");
+    jl.setFont(new Font("Calibri", Font.BOLD, 20));
+    jl.setForeground(Color.BLACK);
+    jl.setAlignmentX(Component.CENTER_ALIGNMENT);
+    contentPane.add(jl);
+    contentPane.add(Box.createVerticalStrut(15));
 
-        // Spielbrettdrehen
-        JLabel jl2  = new JLabel("Soll das Spielbrett nach jedem Zug gedreht werden?");
-        jl2 .setFont(new Font("Calibri", Font.BOLD, 20));
-        jl2 .setForeground(Color.BLACK);
-        jl2 .setAlignmentX(Component.CENTER_ALIGNMENT);
-        contentPane.add(jl2 );
+    // Modusauswahl
+    String[] modi = { "Blitz", "Schnellschach", "Klassisch" };
+    JComboBox<String> jcb1 = new JComboBox<>(modi);
+    jcb1.setMaximumSize(new Dimension(150, 30));
+    jcb1.setAlignmentX(Component.CENTER_ALIGNMENT);
+    contentPane.add(jcb1);
+    contentPane.add(Box.createVerticalStrut(15));
 
-        JCheckBox jb1  = new JCheckBox();
-        jb1.setOpaque(false);
-        jb1.setFocusPainted(false);
-        jb1.setForeground(Color.BLACK);
-        jb1 .setAlignmentX(Component.CENTER_ALIGNMENT);
-        jb1 .setMaximumSize(new Dimension(30, 30));
-        contentPane.add(jb1 );
-        contentPane.add(Box.createVerticalStrut(15));
+    // Spielbrettdrehen
+    JLabel jl2 = new JLabel("Soll das Spielbrett nach jedem Zug gedreht werden?");
+    jl2.setFont(new Font("Calibri", Font.BOLD, 20));
+    jl2.setForeground(Color.BLACK);
+    jl2.setAlignmentX(Component.CENTER_ALIGNMENT);
+    contentPane.add(jl2);
 
-        // Zurücknahmeoption
-        JLabel jl3 = new JLabel("Sollen Zurücknahmen erlaubt sein?");
-        jl3.setFont(new Font("Calibri", Font.BOLD, 20));
-        jl3.setForeground(Color.BLACK);
-        jl3.setAlignmentX(Component.CENTER_ALIGNMENT);
-        contentPane.add(jl3);
+    JCheckBox jb1 = new JCheckBox();
+    jb1.setOpaque(false);
+    jb1.setFocusPainted(false);
+    jb1.setForeground(Color.BLACK);
+    jb1.setAlignmentX(Component.CENTER_ALIGNMENT);
+    jb1.setMaximumSize(new Dimension(30, 30));
+    contentPane.add(jb1);
+    contentPane.add(Box.createVerticalStrut(15));
 
-        JCheckBox jb2 = new JCheckBox();
-        jb2.setOpaque(false);
-        jb2.setFocusPainted(false);
-        jb2.setForeground(Color.BLACK);
-        jb2.setAlignmentX(Component.CENTER_ALIGNMENT);
-        jb2.setMaximumSize(new Dimension(30, 30));
-        contentPane.add(jb2);
-      
-        contentPane.add(Box.createVerticalStrut(15));
+    // Zurücknahmeoption
+    JLabel jl3 = new JLabel("Sollen Zurücknahmen erlaubt sein?");
+    jl3.setFont(new Font("Calibri", Font.BOLD, 20));
+    jl3.setForeground(Color.BLACK);
+    jl3.setAlignmentX(Component.CENTER_ALIGNMENT);
+    contentPane.add(jl3);
 
-		JButton btnNewButton_1 = new JButton("Vergangenes Spiel laden");
-		
-		btnNewButton_1.setBackground(Color.LIGHT_GRAY);
-		btnNewButton_1.setForeground(Color.BLACK);
-		btnNewButton_1.setFont(new Font("Tahoma", Font.BOLD, 16));
-		btnNewButton_1.setAlignmentX(Component.CENTER_ALIGNMENT);
-		btnNewButton_1.addActionListener(new ButtonFileLoaderListener(this));
+    JCheckBox jb2 = new JCheckBox();
+    jb2.setOpaque(false);
+    jb2.setFocusPainted(false);
+    jb2.setForeground(Color.BLACK);
+    jb2.setAlignmentX(Component.CENTER_ALIGNMENT);
+    jb2.setMaximumSize(new Dimension(30, 30));
+    contentPane.add(jb2);
 
-		contentPane.add(btnNewButton_1);
-        
-        contentPane.add(Box.createVerticalStrut(25));
+    contentPane.add(Box.createVerticalStrut(15));
 
-        // Spiel starten Button
-        JButton btnNewButton  = new JButton("Spiel starten");
-        btnNewButton .setBackground(Color.LIGHT_GRAY);
-        btnNewButton .setForeground(Color.BLACK);
-        btnNewButton .setFont(new Font("Tahoma", Font.BOLD, 16));
-        btnNewButton .setAlignmentX(Component.CENTER_ALIGNMENT);
-        contentPane.add(btnNewButton );
+    JButton btnNewButton_1 = new JButton("Vergangenes Spiel laden");
 
-        // Button-Listener
-        btnNewButton .addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                String modus = (String) jcb1.getSelectedItem();
-                boolean rotieren = jb1.isSelected();
-                boolean zuruecknahme = jb2.isSelected();
+    btnNewButton_1.setBackground(Color.LIGHT_GRAY);
+    btnNewButton_1.setForeground(Color.BLACK);
+    btnNewButton_1.setFont(new Font("Tahoma", Font.BOLD, 16));
+    btnNewButton_1.setAlignmentX(Component.CENTER_ALIGNMENT);
+    btnNewButton_1.addActionListener(new ButtonFileLoaderListener(this));
 
-                Game game = new Game(modus, rotieren, zuruecknahme, fen);
-               
-                spiele.add(game);
+    contentPane.add(btnNewButton_1);
 
-                dispose();
-            }
-        });
+    contentPane.add(Box.createVerticalStrut(25));
 
-        setVisible(true);
-    }
-    
-    public void setFen(String fen) {
-    	this.fen = fen;
-    }
+    // Spiel starten Button
+    JButton btnNewButton = new JButton("Spiel starten");
+    btnNewButton.setBackground(Color.LIGHT_GRAY);
+    btnNewButton.setForeground(Color.BLACK);
+    btnNewButton.setFont(new Font("Tahoma", Font.BOLD, 16));
+    btnNewButton.setAlignmentX(Component.CENTER_ALIGNMENT);
+    contentPane.add(btnNewButton);
+
+    // Button-Listener
+    btnNewButton.addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        String modus = (String) jcb1.getSelectedItem();
+        boolean rotieren = jb1.isSelected();
+        boolean zuruecknahme = jb2.isSelected();
+
+        Game game = new Game(modus, rotieren, zuruecknahme, fen);
+        mf.setGame(game);
+        mf.startGame();
+
+        // spiele.add(game);
+
+        dispose();
+      }
+    });
+
+    setVisible(true);
+  }
+
+  public void setFen(String fen) {
+    this.fen = fen;
+  }
 }

src/main/java/de/mannheim/th/chess/ui/PGNLoaderFrame.java

@@ -0,0 +1,156 @@
+package de.mannheim.th.chess.ui;
+
+import java.util.List;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+
+import javax.swing.BoxLayout;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingWorker;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import com.github.bhlangonijr.chesslib.game.Game;
+import com.github.bhlangonijr.chesslib.pgn.PgnHolder;
+import com.github.bhlangonijr.chesslib.pgn.PgnLoadListener;
+
+public class PGNLoaderFrame extends JFrame {
+
+  private static final Logger logger = LogManager.getLogger(PGNLoaderFrame.class);
+
+  private PgnHolder pgn;
+  private File selectedFile;
+  private List<Game> games;
+  private DefaultListModel<String> gameListModel;
+  private JPanel contentPane;
+  private JList<String> gameList;
+  private JProgressBar progressBar;
+
+  /**
+   * Opens the PNGLoaderFrame
+   */
+  public PGNLoaderFrame(MainFrame mf) {
+
+    // ----- Style -----
+    setResizable(true);
+    setAlwaysOnTop(true);
+    setTitle("PGNLoader");
+    setBounds(100, 100, 500, 500);
+
+    // ----- contentPane -----
+    contentPane = new JPanel();
+    contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
+
+    setContentPane(contentPane);
+
+    // ----- FileSelector -----
+    JButton fileSelectButton = new JButton("Select File");
+    fileSelectButton.addActionListener(e -> {
+      JFileChooser fileChooser = new JFileChooser();
+      int returnValue = fileChooser.showOpenDialog(null);
+      if (returnValue == JFileChooser.APPROVE_OPTION) {
+        selectedFile = fileChooser.getSelectedFile();
+      }
+    });
+    contentPane.add(fileSelectButton);
+
+    // ----- LoadButton -----
+    JButton loadPgnButton = new JButton("Load file");
+    loadPgnButton.addActionListener(e -> loadFile());
+    contentPane.add(loadPgnButton);
+
+    // ----- SelectionList -----
+    gameListModel = new DefaultListModel<>();
+    gameList = new JList<>(gameListModel);
+    gameList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+    gameList.setVisibleRowCount(5);
+    JScrollPane scrollPane = new JScrollPane(gameList);
+    contentPane.add(scrollPane);
+
+    // ----- ProgressBar -----
+    progressBar = new JProgressBar(0, 100);
+    progressBar.setValue(0);
+    progressBar.setStringPainted(true);
+    contentPane.add(progressBar);
+
+    // ----- StartButton -----
+    JButton startGameButton = new JButton("Starte Spiel");
+    startGameButton.addActionListener(e -> {
+      int index = gameList.getSelectedIndex();
+      de.mannheim.th.chess.domain.Game game = new de.mannheim.th.chess.domain.Game(games.get(index).getHalfMoves());
+
+      mf.setGame(game);
+      mf.startView();
+    });
+    contentPane.add(startGameButton);
+
+    this.setVisible(true);
+
+  }
+
+  private void loadFile() {
+    if (this.selectedFile != null) {
+      pgn = new PgnHolder(this.selectedFile.getAbsolutePath());
+
+      LoadPGNWorker loadPGNWorker = new LoadPGNWorker();
+      loadPGNWorker.addPropertyChangeListener(e -> {
+        progressBar.setIndeterminate(true);
+      });
+
+      pgn.getListener().add(loadPGNWorker);
+      loadPGNWorker.execute();
+
+      gameList.revalidate();
+    }
+  }
+
+  private class LoadPGNWorker extends SwingWorker<Integer, Integer> implements PgnLoadListener {
+
+    @Override
+    protected Integer doInBackground() throws Exception {
+      try {
+        pgn.loadPgn();
+        games = pgn.getGames();
+        int totalGames = games.size();
+        for (int i = 0; i < totalGames; i++) {
+          publish(i);
+        }
+      } catch (Exception e) {
+        logger.info("Could not load pgn file!");
+      }
+      return pgn.getSize();
+    }
+
+    @Override
+    protected void process(List<Integer> chunks) {
+      for (Integer index : chunks) {
+        gameListModel.addElement("Game: " + index);
+        setProgress(Math.min(90, index * 100 / games.size()));
+      }
+    }
+
+    @Override
+    protected void done() {
+      setProgress(100);
+      progressBar.setValue(100);
+      progressBar.setIndeterminate(false);
+    }
+
+    @Override
+    public void notifyProgress(int games) {
+      setProgress(Math.min(90, games));
+      progressBar.setValue(Math.min(90, games));
+    }
+  }
+
+}