[client] Mostly finished Wizard implementation

1 files changed, 8 insertions, 5 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index f1a6755d..8987f673 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -2,7 +2,6 @@ package org.openslx.dozmod.gui;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.awt.Frame;
 import java.awt.KeyEventDispatcher;
 import java.awt.KeyboardFocusManager;
 import java.awt.Window;
@@ -46,6 +45,8 @@ public abstract class MainWindow {
 
 	private static CompositePage currentPage;
 
+	private static boolean isQuitQuestionOpen = false;
+
 	private static final Map<Class<? extends CompositePage>, CompositePage> pages = new ConcurrentHashMap<>();
 
 	private static final String THRIFT_CONNECTION_ERROR = "Lost connection to the masterserver. Do you want to retry?";
@@ -147,7 +148,10 @@ public abstract class MainWindow {
 			@Override
 			public boolean dispatchKeyEvent(KeyEvent event) {
 				if (event.getKeyChar() == 17) { // Ctrl-Q = Quit
-					askApplicationQuit();
+					if (!isQuitQuestionOpen) {
+						isQuitQuestionOpen = true;
+						askApplicationQuit();
+					}
 					event.consume();
 				}
 				return event.isConsumed();
@@ -169,9 +173,6 @@ public abstract class MainWindow {
 		mainWindow.getContentPane().add(mainContainer, BorderLayout.CENTER);
 		mainWindow.setVisible(true);
 
-		Gui.centerShell(mainWindow);
-		Gui.limitShellSize(mainWindow);
-
 		// here we can check for Session information
 		if (Session.getSatelliteToken() != null) {
 			// Wait for proxy server init
@@ -199,6 +200,7 @@ public abstract class MainWindow {
 				null, null)) {
 			Gui.exit(0);
 		}
+		isQuitQuestionOpen = false;
 	}
 
 	/**
@@ -256,6 +258,7 @@ public abstract class MainWindow {
 			}
 		});
 	}
+
 	// hack TODO what to giev to a popup when we aren't in this class?
 	public static JFrame getMainWin() {
 		return mainWindow;