X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FMain.java;h=81636d1a6bfc885a9c59b5d102b4c6a15edea8c0;hb=b966753ed8cca05ab0104a574d73b0ac1ac87648;hp=205f55acd1371641e1b44e942993ac187095e8d0;hpb=21eb9e153f17fb0820ef1815a72f57d2068b145b;p=jSite.git

diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java
index 205f55a..81636d1 100644
--- a/src/de/todesbaum/jsite/main/Main.java
+++ b/src/de/todesbaum/jsite/main/Main.java
@@ -1,6 +1,5 @@
 /*
- * jSite - a tool for uploading websites into Freenet
- * Copyright © 2006–2011 David Roden
+ * jSite - Main.java - Copyright © 2006–2011 David Roden
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -593,12 +592,18 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		if (((ProjectPage) pages.get(PageType.PAGE_PROJECTS)).wasUriCopied() || ((ProjectInsertPage) pages.get(PageType.PAGE_INSERT_PROJECT)).wasUriCopied()) {
 			JOptionPane.showMessageDialog(wizard, I18n.getMessage("jsite.project.warning.use-clipboard-now"));
 		}
-		if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.quit.question"), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION) {
+		if (JOptionPane.showConfirmDialog(wizard, I18n.getMessage("jsite.quit.question"), I18n.getMessage("jsite.quit.question.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION) {
 			if (isOverwritingConfiguration()) {
-				if (JOptionPane.showConfirmDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.quite.overwrite-configuration"), configuration.getConfigurationLocator().getFile(configuration.getConfigurationDirectory())), null, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION) {
+				int overwriteConfigurationAnswer = JOptionPane.showConfirmDialog(wizard, MessageFormat.format(I18n.getMessage("jsite.quite.overwrite-configuration"), configuration.getConfigurationLocator().getFile(configuration.getConfigurationDirectory())), I18n.getMessage("jsite.quit.overwrite-configuration.title"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
+				if (overwriteConfigurationAnswer == JOptionPane.YES_OPTION) {
 					if (saveConfiguration()) {
 						System.exit(0);
 					}
+				} else if (overwriteConfigurationAnswer == JOptionPane.CANCEL_OPTION) {
+					return;
+				}
+				if (overwriteConfigurationAnswer == JOptionPane.NO_OPTION) {
+					System.exit(0);
 				}
 			} else {
 				if (saveConfiguration()) {